From 13033f6936d2a3fbd21379436dcb9b45e7605012 Mon Sep 17 00:00:00 2001
From: ralf <ralf.palmiste@hotmail.com>
Date: Tue, 6 Aug 2024 10:39:34 +0300
Subject: [PATCH] Progress free coding

---
 Model.py                          |   6 +++++-
 __pycache__/Model.cpython-311.pyc | Bin 15371 -> 15368 bytes
 fitter.py                         |   7 ++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Model.py b/Model.py
index ca82f02..4eb6ced 100644
--- a/Model.py
+++ b/Model.py
@@ -362,7 +362,10 @@ class Model:
         )
         r.set_initial_value(initial_values, times[0])
 
-        states = np.array([[0.0] * times.size] * len(initial_values))
+        #states = np.array([[0.0] * times.size] * len(initial_values))
+        #states[:, 0] = initial_values
+
+        states = np.zeros((len(initial_values), times.size))
         states[:, 0] = initial_values
 
         for i, t in enumerate(times[1:]):
@@ -414,6 +417,7 @@ class Model:
         ax4.set_ylabel(r"$\mu mol/3l$")
 
         plt.show()
+        return states, V
 
 
 if __name__ == "__main__":
diff --git a/__pycache__/Model.cpython-311.pyc b/__pycache__/Model.cpython-311.pyc
index 6b87e5c96ab9d7d863a8cc1f514701be8e46aece..51c2fda148916176e7ea5cadc4ec0247c6b3ec02 100644
GIT binary patch
delta 1000
zcmZuvO=uHQ5PmPohGdh?Zhkh+CjC)Ll{CNGM6la{J&7WS;z>M6VG}Wwib;{UY~o2s
zv4`k*D2N&m>LCFwinpG6wb)7pEn0t06$Go*yKi^9A(9Nd4`$}g_syGmcPjM?^ORv|
zMC{w!mBP*nQya%wSRDUgnP;II3wu;s(V?X^D_Gz`OvDaYkKHABIUZpdBZE*K6|n4t
zh4>gVWX2FGvhYj{+N-omH#xuwo~M^FLM?I(tGdh#{D^au`@kE6a|s*PD_}aoQ6AOR
z^upJ)085EL%F||-t%QXf!!T0qGAAP$-L@1gf*D3twyVw`R#}BSbpaK9<_*P#knC-<
za5(A5UJ%nkA4&Vov`gc4z@zBE2`7mM%(zCQP&yUgi5Y&d<7?DDUBGV$!0%+x8ff$2
zOhx(N|8pQOa5V)uFCMkJ$xBHiTz4a88zX(&kVED`;7w{&m)P$s;U*H=5`-RcMi&*F
z;SSTSw88Ww-LF~ZfGN_$<S`aCFxa~ed58?cEBZTwxFYuB_88nFJ>2u%KPyarR)|*Z
zs<U9ZfTF{&E}n%$6D_R3>xnfSfkr0BDf!a1^0sw0KeufwUsdw(F>{2XW=f@*d)c4(
z73^hi4F9E(FK|EfFtb$Kj3l=r$>-EddLulw>CJ6<b1xQ;MXdCDmTz3I-`sG7pmqG@
z=q_1uX;p(W8l2XEtlt2#cT}!HU@|{AjVWOd^+#w-&T^l$q8$xBYw!i!QUbpNNy^~w
lFek<A`h{J1EDhm(Sd}iNFWNDo?2o_n_@C}<1x`(^{R7zY*&hG^

delta 959
zcmeCE=&s;h&dbZi00gOPH>5>x<gL?Uw3*zabyFgRBb~8^C5s&-2Le^B3=HXvC4!T^
zjigvWoXP##hK!t(4{A^3<*WiKNMo`Al06QSeYGXnIvCOzQ@AGA>ZtNcgLFec7T@Ic
zI?{~%lLhrfCv)ivO#Yz50_B<L3b69ja4mqy#Q}M|FrFyiGDZf5)j$jZwR|<)3j`)R
z8i`Ks(3Q~VUn8)L87L3L5WvV#!<HhL!jQty%9O?=2@__h<ww#dKKZvUr>Y=KvWlC5
zAw>v_NidrN^jY|YV5+%6HgHZ3)RXoXhKW@HLlG1#oeWtba4`s96wU|PA`G@m1gl+Q
zppfAdT_XnZ@#M97%9GXfg(g4IlMt0a4F#Ytd7z;HbQ>?+Z7`RKVz?|ta*e>`iTc8f
z=(bGP2iYPr`GUR}qts+U17SvR=(4la@TW)v^*91Wz<QX0E(6I=4lxh|yQ|JXf>CDj
zL6{DG7NG62m?57chsC#i3lL@kO_(fU2r<*iP(oe?-LECcsYnu-io`e=fe{?cpeaB3
zsG%R@s>%FD>lw=@?>9OO^g^?-jX+{iQDWsSmg3B+)LYCssd<yn8>>zJWBitJ$K+Qg
zWol0ag{Mf&aGqhhz;ub#MQPm&QhHm3H^f~ubh%>aa#70VqM+*)LD$W7rqawT9b6q;
zlNVdKF+QLC%0iK`ax#x)s<;iS@COD=Vsfu#j=&vYgcscf5%)mE{mGnGx{OyQn_C$(
szL=bCrOgIb@O<(dD_O=*lXqD~8-%hk0*%8?egunuL6$9;>}q`&02)}<MgRZ+

diff --git a/fitter.py b/fitter.py
index f1634e6..7fd5a0b 100644
--- a/fitter.py
+++ b/fitter.py
@@ -149,7 +149,12 @@ class Fitter:
         model.K_pc_half = K_pc_half
         model.tau_xfer = tau_xfer
 
-        model.solve(times=self.time_points)
+        states, V = model.solve(
+            initial_values=self.initial_values,
+            tspan=self.tspan,
+            dt=self.dt,
+            times=self.time_points
+        )
 
         _calc_curr = model.calculated_current()
         calculated_current = self.convolve_current(_calc_curr, tau=tau_RC) + offset