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