pypharm 1.6.0__py3-none-any.whl → 1.6.2__py3-none-any.whl

PyPharm/__init__.py

@@ -1,3 +1,4 @@
-from .models import BaseCompartmentModel, MagicCompartmentModel, ReleaseCompartmentModel, PBPKmod
+from .models import (BaseCompartmentModel, MagicCompartmentModel,
+                     ReleaseCompartmentModel, TwoSubstancesCompartmentModel, PBPKmod)
 
 

PyPharm/models/__init__.py

@@ -1,2 +1,3 @@
-from .compartment_models import BaseCompartmentModel, MagicCompartmentModel, ReleaseCompartmentModel
+from .compartment_models import (BaseCompartmentModel, MagicCompartmentModel,
+                                 ReleaseCompartmentModel, TwoSubstancesCompartmentModel)
 from .pbpk import PBPKmod

PyPharm/models/compartment_models.py

@@ -316,7 +316,6 @@ class BaseCompartmentModel:
                 plt.cla()
 
 
-
 class MagicCompartmentModel(BaseCompartmentModel):
 
     need_magic_optimization = False
@@ -340,7 +339,7 @@ class MagicCompartmentModel(BaseCompartmentModel):
             raise Exception("Magic_coefficient parameter not specified")
         res = super().__call__(t_max, c0, d, compartment_number, max_step, t_eval)
         magic_arr = np.ones(self.configuration_matrix.shape[0]) * self.magic_coefficient
-        if self.exclude_compartments:
+        if self.exclude_compartments.size:
             magic_arr[self.exclude_compartments] = 1
         magic_arr = np.repeat(magic_arr, res.y.shape[1])
         magic_arr = np.reshape(magic_arr, res.y.shape)
@@ -745,7 +744,7 @@ class TwoSubstancesCompartmentModel(MagicCompartmentModel):
             c0 = np.array(c0)
         c0 = c0.reshape((1, c0.size))[0]
         ts = [0, t_max]
-        self.last_result = solve_ivp(
+        res = solve_ivp(
             fun=self._compartment_model if
             not self.numba_option
             else lambda t, c: self._numba_compartment_model(t, c,
@@ -766,6 +765,13 @@ class TwoSubstancesCompartmentModel(MagicCompartmentModel):
             method=self.TwoSubstancesRK45,
             release_function=self.get_release_function()
         )
+        magic_arr = np.ones(self.configuration_matrix.shape[0] + self.released_configuration_matrix.shape[0]) * self.magic_coefficient
+        if self.exclude_compartments.size:
+            magic_arr[self.exclude_compartments] = 1
+        magic_arr = np.repeat(magic_arr, res.y.shape[1])
+        magic_arr = np.reshape(magic_arr, res.y.shape)
+        res.y = magic_arr * res.y
+        self.last_result = res
         return self.last_result
 
     def _default_release_function(self, current_c, t):

{pypharm-1.6.0.dist-info → pypharm-1.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypharm
-Version: 1.6.0
+Version: 1.6.2
 Summary: Module for solving pharmacokinetic problems
 Home-page: https://github.com/Krash13/PyPharm
 Author: Krash13

{pypharm-1.6.0.dist-info → pypharm-1.6.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-PyPharm/__init__.py,sha256=W3NIi--fjBbpS9ODzq8lZ4L0trgqvXda7GO2dxpscXg,103
+PyPharm/__init__.py,sha256=2HYYSesc-mjv-S9Q1Jm8yiLCZNmUGvlYCOWC8znJKok,158
 PyPharm/constants.py,sha256=KovwTSSkiGh9o0Hf-yoqw3H7GxC_YmawunlWMHtSK98,3869
 PyPharm/country_optimization.py,sha256=3fnnAJfdLgD0RP8qyJzHBuPDHcPljcLPQM9oqNip1r8,19664
 PyPharm/country_optimization_v2.py,sha256=3d2mt15DXdr1V3soIJS51xuCv6uzH8pirah1RnI5--8,13156
@@ -12,10 +12,10 @@ PyPharm/algorithms/country_optimization_v2.py,sha256=3d2mt15DXdr1V3soIJS51xuCv6u
 PyPharm/algorithms/country_optimization_v3.py,sha256=btPF1_aNfk9TNWf9oi-POGTU_2vfOJSp4EsyisGvDzc,17127
 PyPharm/algorithms/genetic_optimization.py,sha256=EC_pEWwL-ufCQd71zBhCeAB6-Sh1fijv7F3L0bWCz3I,5036
 PyPharm/algorithms/gold_digger_optimization.py,sha256=mln67sAYxkwzFqZ9Ylild1F25VuaruXRPaUMOGT5gIM,4449
-PyPharm/models/__init__.py,sha256=NMJcXMq0gCXgGLyB62j3qIzz3tbxqe6AOLPsJnfcjM0,129
-PyPharm/models/compartment_models.py,sha256=xVryRj5hnTtzWR3ErMa8ktk_ZqR_EqCXrnu5PIMmUtI,50906
+PyPharm/models/__init__.py,sha256=uCPwMYWOLdxiMZJ4eeVzee6Nrafot5gbCVsHXnHWuM0,196
+PyPharm/models/compartment_models.py,sha256=PX2yy11FWkH-_wjwOiJ1P-u4wVX7Vf0p_UJ6k0isYvw,51311
 PyPharm/models/pbpk.py,sha256=10vzsK6NhiIUQMCXPvSy-_M568PSRTZOSmIguq9mgg8,30639
-pypharm-1.6.0.dist-info/METADATA,sha256=HPEdTOAq6vxLWcUeb2dQ78908auIsTb6fkqSmbEIl3Y,22976
-pypharm-1.6.0.dist-info/WHEEL,sha256=OqRkF0eY5GHssMorFjlbTIq072vpHpF60fIQA6lS9xA,92
-pypharm-1.6.0.dist-info/top_level.txt,sha256=yybfSkKw8q1G3aEcnlfVL7_L9ufGFSAYZnpc7q6oYJk,8
-pypharm-1.6.0.dist-info/RECORD,,
+pypharm-1.6.2.dist-info/METADATA,sha256=GdIVV4Cu-2sYSI7StVRkomH5BnASIHXzld4G70NNHqQ,22976
+pypharm-1.6.2.dist-info/WHEEL,sha256=OqRkF0eY5GHssMorFjlbTIq072vpHpF60fIQA6lS9xA,92
+pypharm-1.6.2.dist-info/top_level.txt,sha256=yybfSkKw8q1G3aEcnlfVL7_L9ufGFSAYZnpc7q6oYJk,8
+pypharm-1.6.2.dist-info/RECORD,,