From a2bb97fe22c9266e519b057da81ee785a5050a21 Mon Sep 17 00:00:00 2001
From: ralf <ralf.palmiste@hotmail.com>
Date: Tue, 13 Aug 2024 10:41:00 +0300
Subject: [PATCH] Model and fitter no longer print every iteration. Now need to
 fix the fitting and current

---
 Model.py                          |  37 +++++++-----------------------
 __pycache__/Model.cpython-311.pyc | Bin 15855 -> 15857 bytes
 fitter.py                         |   2 +-
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/Model.py b/Model.py
index 50486a4..96abee5 100644
--- a/Model.py
+++ b/Model.py
@@ -391,7 +391,9 @@ class Model:
                 break
 
         V = np.array([self.mem_potential(t) for t in times])
+        return states, V
 
+    def plot_results(self, times, states, V):
         # plt.plot(times, V)
         fig = plt.figure()
         ax1 = fig.add_subplot(141)
@@ -431,7 +433,7 @@ class Model:
         ax4.set_xlabel("time [ms]")
         ax4.set_ylabel(r"$\mu mol/3l$")
 
-        return states, V
+        plt.show()
 
 
 if __name__ == "__main__":
@@ -439,32 +441,9 @@ if __name__ == "__main__":
     # Cass, Os, C2, C3, C4, I1, I2, I3, LTRPNCa, HTRPNCa, Cai, FCa= states
     model = Model()
 
-    Cai_0 = 0.11712  # Cai
-    FCa_0 = (model.k_on * model.F_tot * Cai_0) / (model.k_on * Cai_0 + model.k_off)
-    # print(FCa_0)
+    initial_values = model.get_initial_values()
+    times = np.arange(0, 1000, 1.0)
 
-    # Cass, Os, C2, C3, C4, I1, I2, I3, LTRPNCa, HTRPNCa, Ca_NSR, Ca_JSR, P_RyR, P_O1, P_O2, P_C2, Cai, FCa = states
-    initial_values = [
-        Cai_0,  # Cass
-        0.930308e-18,  # Os,
-        0.124216e-3,  # C2,
-        0.578679e-8,  # C3,
-        0.119816e-12,  # C4,
-        0.497923e-18,  # I1,
-        0.345847e-13,  # I2,
-        0.185106e-13,  # I3,
-        11.2684,  # LTRPNCa,
-        125.290,  # HTRPNCa
-        1299.50,  # Ca_NSR
-        1299.50,  # Ca_JSR
-        0.0,  # P_RyR
-        0.149102e-4,  # P_O1
-        0.951726e-10,  # P_02
-        0.167740e-3,  # P_C2
-        Cai_0,  # Cai
-        FCa_0,  # FCa
-    ]
-    model.solve(initial_values=initial_values, tspan=[0, 1000], dt=1.0, times=None)
-    plt.show()
-    plt.close('all')
-    
\ No newline at end of file
+    states, V = model.solve(initial_values=initial_values, tspan=[0, 1000], dt=1.0, times=times)
+    
+    model.plot_results(times, states, V)
diff --git a/__pycache__/Model.cpython-311.pyc b/__pycache__/Model.cpython-311.pyc
index 9071fefa81f59ce64992deca89ca62d6eefd4f5b..9ac3eb2c988c51354f73848d1d87c092bc168cab 100644
GIT binary patch
delta 2045
zcmb7EZA@EL7(Vy*-rL)c+Yjh1v{{smWo_r^bOO#%7@KT37pk}!wIP;f_j2VMZ%Z7k
z42&}ttq#2;5`R@CxI{EDjb?sKS&YVLG=L;5)x;&Z#Qg#?HD><M_uO*%Y9aBo=gm3i
zea?BF_dWN#i|3ZldEVtXBZ8JOf7VhNKxhF^w8pFqZiQa+yyTKdBytn5^q%HNA**Oj
z*_4Rcp#;h-dqZ}B5N!pTUqAvUSSEC^1$wrH3So-_Z}EzD43J2{A{I_sCn$hH&$cEK
zp%5Q(0=Ni+OT<Ev7o8i=B9K6wQoGNld`i?4-zg;dwebQ9aRPS=`7G)0$*w(v5?k`o
zu=3B9!_w`>3r$CS_XMQp{U1N_Z+*#ODbVod=y>K}jkLS($jd+dQd=##{YA@PKD8?#
zC2Q|J=s#OpE&WwhP~JH2sFu9vlb^H?@2Qo(`qSHV@zHRtq>2rWt_)x%(Z<UUX6hDe
zr0IpLyUTo;YAJo$XCY}f1oWa}^|;c%-SszNj5BdV3ke#H>C6E?LHaDpSov9l&nQ0x
zr^w@qT(Osl;;U&^zNzq#cN6Kw3NPWgX5~koN%T###c~5U&#Wd4CM<NE=UXMTV)3{g
z8}Dj>ic={P=h7(<69gn1dbSPFYc6t=i&=B&Ho5d`E^3pDjngR|a5<01Nr8rIMlX;p
zq)Q`20yC-Ke3yV^bCClE?Wnr^N5u{Okfu0lTTMm32_eCdhhRn1Q2^7L6cd7Djk&!2
zfQah=sXYROY1CEJrdI~-#k*7<lWNU**$g<_#R4~J*_a*zK}^Q%Rao=5Oj(yL$Hiom
zdU|~T|5v_X&!d$|ZKIXhS}T)U(OQtBRiD-BjvIu+JdFD781-8->NQ434kMdo^g~AY
z+zS<)c~r35sbIHO!Ddyk!ioxIXkSsKS^K6oK0K&W2p)P-@a8K3xcMqJ7qJ-uBa@1&
z{0^!ShDv35gy0lg#gmQ<6@9w<S*;j+fpI})w8HZME(j&7O+E?JjJc<yI~JD3Xm3X>
z+F#JnEr=cd^=nCZ=+Ok!pCNR^Vo&e5FGd#KU`<JO*qAgX)Sp^Rf>4CszW-tVEzI{0
zHdnF9VDo`O9NIyWgmUMh9|s+@D^+)iA3wQ-V7S@r^U{S&DA%YQvH?!Zu;FlLq_ry?
zmN|SlyjSF-<Z(Ry9GffH;IMtg8M>>tv!_pf3}zX7XC&6sp}b$k@B9JJt<f{BJ$?Sx
zu9zsvk(ems@+ad$Apfc?RQVqN8KdY<oDx|LOXc_w1Jtal0S5839h+>Zc!Z0qn%>)N
z0Jisbh&A%>utq?S9#Gl?=LcIE0^-bXm(}$@)_b4e5M@sE&+1&$I@c0|xPrv7;re9#
z(6Q^hd!8?w<;!OH{d4^Oq2M($pE#O4F%lVbj74Y6rE}&|K-u^=Os|_R)lBW2Iz8q3
zwmLc;3Xhm(Y|V4F=I2ff9Zwv&P8sGY=PczM=^blHMP?}P9Oa$X{!2Wf+`z5I_8&Tz
BxEBBb

delta 2117
zcmb7_ZA@EL7{|{ow_Ry_drR9}S{N^xz*-hc1_maSw@AYT$6h)=j4XD<bHQOZVv)E(
zp`D_G$zIIahiNocMaCRDV&`NZ7Ex#7r`hU^O*75R60eJiD`8VJKj=BPy$#UzgQw^G
z?sLxnobx>A+$XooqxVKPpJx~qz~!m?SNq;*2H+0qNJXDCR!+UX`Go(N4Die>9=a&$
zpofJ_kB(;t@}wbbORK<$8~|P?a`g;p#2~F1!N!OhfF2{SgIdT!9n6DzXn;n@K@-f!
zKQpxWVF4`Ub-b}(-^1~2&?GHi{p2|a;KqI#EP~X0@hpvl#Vt`NfDb?q<V*dvM@gz?
zNrfe|6kd&6qEKo8DVNx6rRY_vgSw7xP+!w7U}HjW%MMrg1!d`{Q|O;-EyBay6Z_k2
zTOGp7_A9&o?I>*#96R1TI}_X1ER-E>d+qyMtxZCKJ%9Q0r#Cr->DJn9_9Krp34b=~
zAKm?<u}QFwPhWj*s-ji+>Vb9t={@dNK@6e$Y|_9zL9SZd9&5kXEQIfTQC4M(H3^{;
zHmyvq-2lLG^h<>$bY;umROJgr$?)-GfR*gECm&P!R6!kT*~)RMwPzkvrxf)%MUzrA
z>l8**s%uTgb%NHX4(6dtwVa&xDc}Y~)flR^^XzO6zGmDKg#uX9;g<+rk@d+e(l8if
zrPWSxb@~h+JAyNL3arXMoKr9_gNI}sej3kCWucmQR;KSu^4FJ(XBwqoh#xYF$GFs3
zqMu4ilFv{t(vUF%oQ7yGr8h(4Jh%3u@D-?oX7PQPGAI^N$xl->iOY4ZIn@6>5;SKB
zR)cm?rp$qAvIeRNCIYpj1<E7>wa`8m7G!Y8WOv78b;l&#6{fk<u1dO%B<Z-K3{JJ#
zoocf>)h3)4raM*ma{FZX(@-2*tg=&icTeIxxqFJ>G{G74WL+^DtUEvzpx^9AP`GYi
zu1)9d#F{sR4pvtpXMKrWhr0*R&LR%YRhwlOazbBLTPgJe1z`2l15=)95Bj#g3@z1f
z3a!*zW%}DJcjo!YqhY1ly92N6wlS!tVW)k8Z2AeouLRc!i0<to$d!Qe6%4Habh+V%
z-yydI+vm8Mt~kJERwT9|JH(W3_o3c{huv=PJ7mKk!Mg<S5xh?@L+}9s`TTg#6U-4@
zAo!5rBEdYcV}3+ThJXZSqrD+w-y-;l;Af0jPOryfv!Fj3t<(=F-%&#Sj_MsYH~Cz~
z<c9_!@9}<2CN~f~M$kxbi9p<s+(?WbdUo)|nEV;f;1Iv=dLAkrc$;Al-|YPhPbGf_
zLq7DGW8B}bpzy_H=CU|`f3>=o0kmdv<hvY8IL8uK07gIQoa&hF2sm$R3;}19(NFiB
zD}QTCgejksN0_RG^2?Qr!;zZyrQz$Nk(xabjVs`ct3a+csx(HG20w11g*%DLMwO|m
zmQ*~4!8KlPFew7vaVwCkj(5G(b#8p2chR`8Z>jbh80d=7uA8(gOuM4ACh+*g_G6tB
goq^6M&EU=xlYE3W-lUCTsm9wVKo=<SF~ryZA7|Rjl>h($

diff --git a/fitter.py b/fitter.py
index 4d5a9f9..0484c9a 100644
--- a/fitter.py
+++ b/fitter.py
@@ -226,4 +226,4 @@ if __name__ == "__main__":
     # fig.savefig(f"{plot_filename}.png")
     # fig.savefig(f"{plot_filename}.pdf")
     fig.savefig("naidis_fit.pdf")
-    # plt.show()
+    plt.show()