pharmapy-org 0.3.0__tar.gz → 0.3.2__tar.gz

{pharmapy_org-0.3.0 → pharmapy_org-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pharmapy-org
-Version: 0.3.0
+Version: 0.3.2
 Summary: A Pythonic framework for the digital analysis of pharmaceutical manufacturing processes.
 Author-email: Daniel Casas-Orozco <dcasasor@purdue.edu>, Zachary Hillman <zachary.hillman18@gmail.com>
 Maintainer-email: Zachary Hillman <zachary.hillman18@gmail.com>
@@ -22,6 +22,11 @@ Requires-Dist: matplotlib
 Requires-Dist: pandas
 Provides-Extra: julia
 Requires-Dist: diffeqpy>=2.6; python_version >= "3.10" and extra == "julia"
+Provides-Extra: jax
+Requires-Dist: jax; extra == "jax"
+Provides-Extra: casadi
+Requires-Dist: jax; extra == "casadi"
+Requires-Dist: casadi; extra == "casadi"
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Dynamic: license-file

{pharmapy_org-0.3.0 → pharmapy_org-0.3.2}/PharmaPy/CheckModule.py

@@ -16,11 +16,23 @@ root = pathlib.Path(__file__).parent / 'data'
 
 
 def check_modeling_objects(uo, instance_name=None):
+    class_name = uo.__class__.__name__
+
+    # A ConcurrentVessel holds no modeling objects of its own: every unit it
+    # integrates does, so each of those is checked under a qualified name.
+    members = getattr(uo, 'concurrent_members', None)
+
+    if members:
+        prefix = class_name if instance_name is None else instance_name
+
+        for member_name, member in members.items():
+            check_modeling_objects(member, '%s.%s' % (prefix, member_name))
+
+        return
+
     with open(root / 'minimum_modeling_objects.json') as fi:
         checks = json.load(fi)
 
-    class_name = uo.__class__.__name__
-
     if instance_name is None:
         instance_name = '<InstanceName>'
         instance_descr = "a " + class_name + ' instance'

{pharmapy_org-0.3.0 → pharmapy_org-0.3.2}/PharmaPy/Commons.py

@@ -8,7 +8,7 @@ Created on Mon Apr 27 14:22:20 2020
 import matplotlib.pyplot as plt
 from matplotlib.ticker import AutoMinorLocator
 # from autograd import numpy as np
-import numpy as np
+from PharmaPy import xp as np
 from scipy.integrate import simpson
 from itertools import cycle