From bd545f6df486fa4ac3364309ef5b06c0d09d5797 Mon Sep 17 00:00:00 2001
From: Olusanmi-A <95719093+Olusanmi-A@users.noreply.github.com>
Date: Fri, 16 Sep 2022 15:37:01 -0400
Subject: [PATCH] HR MAP switched

---
 humanc/bangbang.py   |  4 ++--
 humanc/cardiac_pm.py |  6 ++++--
 humanc/plotym.py     | 42 ++++++++++++++++++++++--------------------
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/humanc/bangbang.py b/humanc/bangbang.py
index 9fcc811..eed72b8 100644
--- a/humanc/bangbang.py
+++ b/humanc/bangbang.py
@@ -4,9 +4,9 @@
 
 def bangbang_controller(ym):
     amp = 0
-    if ym[0]>70:
+    if ym[1]>70:
         amp = 3
-    elif ym[0]<65:
+    elif ym[1]<65:
         amp = 1
 	    
      
diff --git a/humanc/cardiac_pm.py b/humanc/cardiac_pm.py
index 49ec96f..d3edb30 100644
--- a/humanc/cardiac_pm.py
+++ b/humanc/cardiac_pm.py
@@ -27,8 +27,10 @@ def cardiac_pm(x0,u):
 
     hr,mapp,x0 = cardiac_pm(x0,u)
     
-    dummy = np.array([hr,mapp])
+    #dummy = np.array([hr,mapp])
+    dummy = np.array([mapp,hr])
     print(str(concore.simtime) + " u="+str(u) + "ym=" + str(dummy))
-    concore.write(1,"ym",list(np.array([hr,mapp])),delta=1)
+    #concore.write(1,"ym",list(np.array([hr,mapp])),delta=1)
+    concore.write(1,"ym",list(np.array([mapp,hr])),delta=1)
 
 
diff --git a/humanc/plotym.py b/humanc/plotym.py
index 648e401..815f96c 100644
--- a/humanc/plotym.py
+++ b/humanc/plotym.py
@@ -2,37 +2,39 @@
 import numpy as np
 import matplotlib.pyplot as plt
 import time
-print("plotym")
+print("plot ym")
 
-concore.delay = 0.02
+concore.delay = 0.005
 concore.default_maxtime(150)
-init_simtime_u = "[0.0, 0.0, 0.0]"
-init_simtime_ym = "[0, 103, 0]"
+init_simtime_u = "[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]"
+init_simtime_ym = "[0.0, 0.0, 0.0]"
+ut = []
 ymt = []
-
 ym = concore.initval(init_simtime_ym)
 while(concore.simtime<concore.maxtime):
     while concore.unchanged():
         ym = concore.read(1,"ym",init_simtime_ym)
     concore.write(1,"ym",ym)
-    print("ym="+str(ym))
-    ymt.append(ym)
+    print(" ym="+str(ym))
+    ymt.append(np.array(ym).T)
 print("retry="+str(concore.retrycount))
 
 #################
-ylabelstring = ['Heart rate (bpm)', 'MAP (mmHg)']
-# plot inputs and outputs
 
-for k in range(2):
-    vv = []
-    for x in ymt:
-        vv.append(x[k])
+# plot inputs and outputs
+ym1 = [x[0].item() for x in ymt]
+ym2 = [x[1].item() for x in ymt]
+Nsim = len(ym1)
 
-    Nsim = len(vv)
-    plt.figure(k)
-    plt.plot(range(Nsim), vv)
-    plt.ylabel(ylabelstring[k])
-   
-    plt.xlabel('Heart cycles')
-    plt.savefig("ym" + str(k) +".pdf")
+plt.figure()
+plt.subplot(211)
+plt.plot(range(Nsim), ym1)
+plt.ylabel('MAP (mmHg)')
+plt.legend(['MAP'], loc=0)
+plt.subplot(212)
+plt.plot(range(Nsim), ym2)
+plt.xlabel('Cycles')
+plt.ylabel('HR (bpm)')
+plt.legend(['HR'], loc=0)
+plt.savefig("hrmap.pdf")
 plt.show()