pypharm 1.6.0__tar.gz → 1.6.2__tar.gz

{pypharm-1.6.0 → pypharm-1.6.2}/PKG-INFO

@@ -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.2/PyPharm/__init__.py

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

pypharm-1.6.2/PyPharm/models/__init__.py

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

{pypharm-1.6.0 → pypharm-1.6.2}/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 → pypharm-1.6.2}/pypharm.egg-info/PKG-INFO

@@ -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 → pypharm-1.6.2}/setup.py

@@ -6,7 +6,7 @@ def readme():
 
 setup(
   name='pypharm',
-  version='1.6.0',
+  version='1.6.2',
   author='Krash13',
   author_email='krasheninnikov.r.s@muctr.ru',
   description='Module for solving pharmacokinetic problems',

pypharm-1.6.0/PyPharm/__init__.py

@@ -1,3 +0,0 @@
-from .models import BaseCompartmentModel, MagicCompartmentModel, ReleaseCompartmentModel, PBPKmod
-
-

pypharm-1.6.0/PyPharm/models/__init__.py

@@ -1,2 +0,0 @@
-from .compartment_models import BaseCompartmentModel, MagicCompartmentModel, ReleaseCompartmentModel
-from .pbpk import PBPKmod