From 6633e99003599f963cfcc5a8fc7c04ce77fae0fd Mon Sep 17 00:00:00 2001
From: ralf <ralf.palmiste@hotmail.com>
Date: Thu, 8 Aug 2024 13:45:53 +0300
Subject: [PATCH] model clarity improvement

---
 Model.py                          |  28 +++++++++++++++-------------
 __pycache__/Model.cpython-311.pyc | Bin 15350 -> 15798 bytes
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Model.py b/Model.py
index 40b34bd..dbc93af 100644
--- a/Model.py
+++ b/Model.py
@@ -2,10 +2,10 @@ import numpy as np
 import matplotlib.pyplot as plt
 from scipy.integrate import ode
 
-R = 8.314  # ideal gas constant (J/(mol*K))
-F = 96.485  # coulomb_per_millimole, Faraday constant
-T = 298  # room temperature (K)
-RT = R * T
+R: float = 8.314  # ideal gas constant (J/(mol*K))
+F: float = 96.485  # coulomb_per_millimole, Faraday constant
+T: float = 298  # room temperature (K)
+RT: float = R * T  # J/mol
 
 
 class Model:
@@ -22,13 +22,13 @@ class Model:
         self.Nai: float = 11000  # uM, Myoplasmic Na+ concentration
         self.Nao: float = 150000  # uM, Extracellular Na+ concentration
 
-        self.eta: float = 0.35  # Controls voltage dependance of Na/Ca2+ exchange
+        self.eta: float = 0.35  # Controls voltage dependance of Na/Ca2+ excng
 
         self.km_Na: float = (
             87500  # uM, Na+ half-saturation constant for Na+/Ca2+ exchange
         )
         self.k_sat: float = (
-            0.1  # Na+/Ca2+ exchange saturation factor at very negative potentials
+            0.1  # Na+/Ca2+ exchange saturation factor at very neg potentials
         )
         self.km_Ca: float = (
             1380  # uM, Ca2+ half-saturation constant for Na+/Ca2+ exchange
@@ -132,7 +132,7 @@ class Model:
         )
         self.V_JSR: float = 0.12e-6  # ul, Junctional SR volume
 
-    def ode_system(self, t, states):
+    def ode_system(self, t, states: list[float]) -> list[float]:
 
         (
             Cass,
@@ -331,7 +331,7 @@ class Model:
             dFCadt,
         ]
 
-    def mem_potential(self, t):
+    def mem_potential(self, t: np.ndarray) -> np.ndarray:
         t = np.asarray(t)
         v1 = 0
         t0 = 100
@@ -339,7 +339,7 @@ class Model:
         n = (t // self.period) * self.period
         return np.where((t0 + n <= t) & (t < t1 + n), v1, self.V_mem_rest)
 
-    def get_initial_values(self):
+    def get_initial_values(self) -> list[float]:
         Cai_0: float = 0.11712  # Cai
         FCa_0: float = (self.k_on * self.F_tot * Cai_0) / (
             self.k_on * Cai_0 + self.k_off
@@ -365,11 +365,13 @@ class Model:
             FCa_0,  # FCa
         ]
 
-    def calculated_current(self, states, V):
-        ICaL = self.gCaL * states[1, :] * (V - self.ECaL)
-        return ICaL
+    def calculated_current(self, states: list[float], V: np.ndarray) -> np.ndarray:
+        Os = states[1]
 
-    def solve(self, initial_values, tspan, dt, times):
+        I_CaL = self.gCaL * Os * (V - self.ECaL)
+        return I_CaL
+
+    def solve(self, initial_values: list[float], tspan, dt, times):
         times = np.arange(*tspan, dt)
 
         r = ode(self.ode_system)
diff --git a/__pycache__/Model.cpython-311.pyc b/__pycache__/Model.cpython-311.pyc
index b83e4405540e9b8d55edcbc3cc6ddf2dc2f28e25..284df043c237d293043263ac08219255778985ca 100644
GIT binary patch
delta 2250
zcmZ{kTWpj?6vt=2+qQe__Ohkh(u-h$t!*i7K`0lCZ2_rm1d76jxcOkF%ffcs%x<~V
z%B~3}ka&T72{qA}CJHtI6j@?;fcQcp4?Yx)vH6VfV4{+!S%UcB19;AC3$)<0^ZU;E
z&zbw#`RCwQZ+JiRc$@^vPp2;Rr`MhImN{Obgp85xC!ecL@jRZ-v^CJo^pI0}hV&dE
zm-O<`;|}f`(FqB;rIwGHLN*fSJW81Bj6%p+sJRmIa4&Q3m%iAo5bikx4QFSXNvME%
zLOx!wuMng`DT7lq(~i?{pJXm17crw0Ka2xo#05(#;XdYN1<c0^SrIE{CCtxC**y3w
zV*ysqD!7lAM2bRwUNBy2-DxaN5$<P%&5tOolF@TjXEazI)Lfy2(QUE@t8b&!8>F^6
z$atjhm(w3!8?R}%>DI`PpA4;aR__3NL$nS~)24m4vbAr|^dRzMOgne4fiXrn2~kEu
z3QN(WB&0HhYg`XJ?7-C7e!s@Fqgu#dI(O{Ln+b!c$2^EJASVBbz6x`I?tEg7JnW5^
zC(E3{43-a_T+BIVAqsPW?q=?7B<RUpqkn3;fJ-8oOU7o+XB&y6ndAxE5Ii|7;+gx-
zFFn+4T`23MKI>jtwSiYAO04og1NB;)0t-{v*;e91w#p9;iDlT_jA%gw5p{?r#A3uk
z#1cd;;#tHZL<6D`u@+H}n1{eUikA@U5HBFA5c3I15mAHYazr(v65&8pAf7=iKrBV9
zKs=AwglI=>K&(f+h}ekeKy)Iy5GxU72+S>k*<h=&!HB4DMZXQP3b7jDN0b7B?P4>0
zY?>6k@Xc7|w<zt-B<6?njUEizVSQga)v^`L=<ASqL0xRec!!xVg)k2bOetGGxR(nq
z%E1mAazN;Jb5WJi4T|Wql*LDAPv)(~3uwdag#^{y^m>OG4L8~Ph7L2_lu)5pO-+sH
zwkDUH?~u#b57HjgXA0U_@3sTR$S7s>QFgznj*@+#=gO#ReI2Z5*G4r+DWz9z0Xe8V
zI%wDvo`F07ffI=k;y56I$pcG~i}Ba3D8M{OlPOQ}iS_U7Jf>LH3rowV3QCT-1uoO}
zM&r?B)Qp7>n6Y7=$Q-GQI3NvwUABU5u_~K)RrNtsP_>oDCb0udIq~#<)3D#M<|caF
zy58K>io@N07x5nAeZ&cX*a?6)LXVlddF=N62M-?D`sPFZTnLX<-(nWa>oH7W#v@$d
z35iqIc+1;<nct6+OQy<7tF5)ZL2f<+k+z;p44H9TVM#Ef1MoAWLLQ4vqq+6&w?1yI
zq*3ciYaoD^YwL-@*a1G`>VY>a)+n6=nZH`Est(*iZ_s01Tv_|t%NVM~q6rwdKQ?G4
z#VJsxQz_1Jsf1@EE+8%<enVVE;7CHIQa)M;7u3XEt9aF-)OhEF|I_X)=~8v)h0e?V
zOVf5vnZ;hi(7Wje;-ir)L2F|7xqUh7DfE@;&Y7{n%#zt?)pY+v$pq);DzXIZ%SBhp
zrEy*P7J@;U3-?+*Ff$;SS@J)~?H6}x=Y_)qW;7lSTNA4`E<KOC_aJclK~3PLiJuWS
z5w}pCXY29dfuX}<yA^1wPW=FyU69xl9Xi|?jVF0T!1I~Q3;9s|A=|@YGaes=mo+*V
zPlUtr!If`F?wyjy{yRqM19;EkbFk;WDPN!_SM=D;1yRJS`!{b5bRCZIb>bel@RX3m
zE?`!rlunVNN$Z=orj*N<rs?IA#0UR3h;PbOnDYxKN#PArIOX!9pZ2D`Z+WNOo)h$V
uS6WGTL2E7`YwR^Bob1ziN9un+-ukMCXzpVp->HE~HITJ>R-e`|+x`Qe#_V+f

delta 1771
zcmZvc?@t^>7{_OJZ})z{-2n%Mg91k>;L<{`<%i{0OQq$<iIf7?=3;tondN$TTrYEn
z?I8*#ZAwyoQP&2O8be~lnzkA_^;M0&@DH$wNpYh#MicFeCXlKxOcbAIk85et+3aVY
z`OY&tGtWG;U%vYHS=UESr-MMLO?^J`OV?#riBwAoS-jj(Gsi4J8<T=|&8pdFBtn7?
zf%Fk3pC`<^ED&-X-b@MRXt~Vxvf1XR1fu0EL&x=OHwikKJ?PS$lkThpc3#%TZ)+}-
zTRr-+QvO3nFlKUKAqAR?Iam(MWlrW|ZkEULSpoCFQ^<<gHdd^;w1RL!(4#q*3iU(O
zGe<NJBdjDWFfXGwN|!CLJa{vO5=KYOS1G%P(vU(8@eI?#W50fQ_1h(1clgc+@h(T@
ziS9@}L}z?+oLNEJED!cUwMaA)q>KawM$eO=$ONE;iQA!)m<1>^324PALUgU8M6spc
z67E|>gZ8H9tN}~<hn&xx)TUqZ9;Uhaciu`FgU0jpzq}39p;wny&lQ4T2(h>!YUkp-
z5xe&w{D@ja9ijoT6X8SDAa)?C5Y>o!#4bcTLP2;CZHQh(2ci>EhVT+HM|e4!xM98>
zQ3^1GkuhF^tqMdXVmG1*(Tq5P=tA@$4j>L94kNk|hY-&oS`bA5gN_(<%n+kz!hA1^
z^-m*P5&IFCAG`pdbn`x_44O3LL{d#^iFCZ|E~WkH;qs832J|m#SDT&#kH|?lHAUjX
z=xtRKD(7m7Z^M>!_O!+|UJSM(o1f#y^>6Ab<bF{2QT?~N*J&U<{?rcI@c1$mF*CW;
zqeeo0L+b5OL;i#aqkKLe@7Gt9oBjZ_#!<=^$b5qB2N;1xGD{}2J!F<Lst@fcJ|=*g
zO)@eAmlbcyYvQa3xg!kmK^UP3kD{ztGOK<8bdH}hECW62U;?upR)S0Ux4yNh9-8xH
z)$MsR^=|7@)zUHZ+4)}QZFk+Zz1NaAQXhBScDF59z-1wa2f#hecZIExg2uj9I;iJ2
zy;yM+R7Es|Mn69eraAHEmgixfOHF=yQNINY==YmS%1)p=HKeF|N{in6Z)0P_kOJo>
zG|uh1uUYk&$04g+jfFLiVc}QwcbYF0nTh-;jW8*Ai{99>d%t<yu1GABjHuDjD{6FF
zOBhlz5m#e|z>;7_ra+;bV>k>N$*glyzt~b<b{eEa9^fU6%a#I5|GK4^CewFXz7nmt
z^&!QsUu~=D8~~eNLEzT;r-&8A?}%FnbmwNW;Nfxv{IW<Qr5Cr?9$X_wM9HzqAz7B5
zrE6ph^GdMyA({oLaE&~KO<!*>_GYHQ4;!{nXiAO5LLvS>H1(>EzIr<t+zNn1_z~@&
z5I-aCqFQ7~vFWLJiVy3H9hGz6gJ!rB<B@o(F%nB^VGj2u6Z}yegZ~;nh8RJZd-?+`
zLz;pgWR%}T_3@j)KS9l$`w3zB$JPlWr=!{dzD`IU!PHLpfomeAbX7mu=^wDz=jp1&
lfv^H3c_IIe=jVkrc|xY%HS%PxoBE$ydq>{xTCw1P{11VPe(eAN