fmdtools 2.0.4__tar.gz → 2.0.5__tar.gz

{fmdtools-2.0.4 → fmdtools-2.0.5}/LICENSE

@@ -1,4 +1,4 @@
-fmdtools version 2.0.4
+fmdtools version 2.0.5
 ---------------------------
                                  Apache License
                            Version 2.0, January 2004

{fmdtools-2.0.4 → fmdtools-2.0.5}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: fmdtools
-Version: 2.0.4
+Version: 2.0.5
 Summary: System resilience modelling, simulation, and assessment in Python
 Author: fmdtools Developers
 Maintainer-email: Daniel Hulse <daniel.e.hulse@nasa.gov>
-License: fmdtools version 2.0.4
+License: fmdtools version 2.0.5
         ---------------------------
                                          Apache License
                                    Version 2.0, January 2004
@@ -236,7 +236,9 @@ Project-URL: Documentation, https://nasa.github.io/fmdtools/
 Project-URL: source-code, https://github.com/nasa/fmdtools
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Science/Research
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Scientific/Engineering
@@ -268,7 +270,7 @@ Requires-Dist: shapely>=2.0
 [![GitHub Tag](https://img.shields.io/github/v/tag/nasa/fmdtools)](https://github.com/nasa/fmdtools/tags)
 [![CodeFactor](https://www.codefactor.io/repository/github/nasa/fmdtools/badge)](https://www.codefactor.io/repository/github/nasa/fmdtools)
 [![Tests Status](./reports/full-py311/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/full-py311/junit/report.html)
-[![Tests Coverage](./reports/full-py311/coverage-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/full-py311/coverage/index.html)
+[![Tests Coverage](./reports/full-py311/coverage-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/full-py311/coverage_html/index.html)
 [![GitHub License](https://img.shields.io/badge/License-Apache%202.0-green)](https://github.com/nasa/fmdtools/blob/main/LICENSE)
 [![NASA Software Classification](https://img.shields.io/badge/Software_Class-E-blue)](https://nodis3.gsfc.nasa.gov/displayDir.cfm?Internal_ID=N_PR_7150_002D_&page_name=AppendixD)
 
@@ -355,7 +357,7 @@ This may then be installed using:
 Note that this version reflects the latest version on the ``main`` git branch along with any local changes. To use a particular version of ``fmdtools`` you can checkout the tag corresponding to the version you want, e.g.:
 
 ```
-   git checkout v2.0.4
+   git checkout v2.0.5
 ```
 
 
@@ -493,8 +495,8 @@ To cite a particular version of the fmdtools, you may use:
   author = {{NASA}},
   title = {fmdtools},
   url = {https://github.com/nasa/fmdtools},
-  version = {2.0.4}, # <- replace with your version number
-  date = {2024-10-25},
+  version = {2.0.5}, # <- replace with your version number
+  date = {2024-11-13},
 }
 ```
 

{fmdtools-2.0.4 → fmdtools-2.0.5}/README.md

@@ -10,7 +10,7 @@
 [![GitHub Tag](https://img.shields.io/github/v/tag/nasa/fmdtools)](https://github.com/nasa/fmdtools/tags)
 [![CodeFactor](https://www.codefactor.io/repository/github/nasa/fmdtools/badge)](https://www.codefactor.io/repository/github/nasa/fmdtools)
 [![Tests Status](./reports/full-py311/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/full-py311/junit/report.html)
-[![Tests Coverage](./reports/full-py311/coverage-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/full-py311/coverage/index.html)
+[![Tests Coverage](./reports/full-py311/coverage-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/full-py311/coverage_html/index.html)
 [![GitHub License](https://img.shields.io/badge/License-Apache%202.0-green)](https://github.com/nasa/fmdtools/blob/main/LICENSE)
 [![NASA Software Classification](https://img.shields.io/badge/Software_Class-E-blue)](https://nodis3.gsfc.nasa.gov/displayDir.cfm?Internal_ID=N_PR_7150_002D_&page_name=AppendixD)
 
@@ -97,7 +97,7 @@ This may then be installed using:
 Note that this version reflects the latest version on the ``main`` git branch along with any local changes. To use a particular version of ``fmdtools`` you can checkout the tag corresponding to the version you want, e.g.:
 
 ```
-   git checkout v2.0.4
+   git checkout v2.0.5
 ```
 
 
@@ -235,8 +235,8 @@ To cite a particular version of the fmdtools, you may use:
   author = {{NASA}},
   title = {fmdtools},
   url = {https://github.com/nasa/fmdtools},
-  version = {2.0.4}, # <- replace with your version number
-  date = {2024-10-25},
+  version = {2.0.5}, # <- replace with your version number
+  date = {2024-11-13},
 }
 ```
 

{fmdtools-2.0.4 → fmdtools-2.0.5}/fmdtools/__init__.py

@@ -22,6 +22,6 @@ import fmdtools.sim as sim
 import fmdtools.analyze as analyze
 
 __all__ = ['analyze', 'sim', 'define']
-__version__ = '2.0.4'
+__version__ = '2.0.5'
 __copyright__ = "Copyright 2024 United States Government"
 __license__ = "Apache-2.0"

{fmdtools-2.0.4 → fmdtools-2.0.5}/fmdtools/define/architecture/base.py

@@ -156,6 +156,9 @@ class Architecture(Simulable):
             as_copy = self.as_copy
 
         track = get_sub_include(name, get_sub_include(flex_role, self.track))
+        # sync rands, if present
+        if hasattr(self, 'r') and hasattr(objclass, "container_r"):
+            kwargs = {**{'r': {"seed": self.r.seed}}, **kwargs}
         obj = init_obj(name=name, objclass=objclass, track=track,
                        as_copy=as_copy, root=self.get_full_name()+"."+flex_role,
                        **kwargs)
@@ -231,8 +234,6 @@ class Architecture(Simulable):
         """
         flows = self.get_flows(*flownames, all_if_empty=False)
         fkwargs = {**{'sp': self.sp.asdict()}, **kwargs}
-        if hasattr(self, 'r'):
-            fkwargs = {**{'r': {"seed": self.r.seed}}, **fkwargs}
         if not self.sp.use_local:
             fkwargs = {**{'t': {'dt': self.sp.dt}}, **fkwargs}
 

{fmdtools-2.0.4 → fmdtools-2.0.5}/fmdtools/define/block/function.py

@@ -120,7 +120,7 @@ class Function(Block):
 
     def update_seed(self, seed=[]):
         """
-        Update seed and propogates update to contained actions/components.
+        Update seed and propagates update to contained actions/components.
 
         (keeps seeds in sync)
 

{fmdtools-2.0.4 → fmdtools-2.0.5}/fmdtools/define/environment.py

@@ -66,15 +66,18 @@ class Environment(CommsFlow):
 
     def __init__(self, name='', root='', glob=[], p={}, s={}, r={}, c={}, ga={},
                  track='default'):
+        super().__init__(name=name, root=root, glob=glob, p=p, s=s, track=track)
+        # NOTE: p and s also init here because if not, they are overritten
+        # may need to change in the future
+        self.init_roletypes('container', "coords", "arch", r=r, p=p, s=s)
         if 'p' not in c and getattr(self.coords_c, 'container_p', None) == getattr(self, 'container_p', None):
             c = {**c, 'p': p}
         if 'p' not in ga and getattr(self.arch_ga, 'container_p', None) == getattr(self, 'container_p', None):
             ga = {**ga, 'p': p}
-        super().__init__(name=name, root=root, glob=glob, p=p, s=s, track=track)
-        # NOTE: p and s also init here because if not, they are overritten
-        # may need to change in the future
-        self.init_roletypes('container', "coords", "arch", r=r, p=p, s=s, c=c, ga=ga)
-        self.update_seed()
+        r_kwargs = {'run_stochastic': self.r.run_stochastic, 'seed': self.r.seed}
+        c = {**{'r': r_kwargs}, **c}
+        ga = {**{'r': r_kwargs}, **ga}
+        self.init_roletypes('coords', 'arch', c=c, ga=ga)
 
     def base_type(self):
         """Return fmdtools type of the model class."""
@@ -123,11 +126,6 @@ class Environment(CommsFlow):
         self.c = self.coords_c(**self._args_c)
         self.ga.reset()
 
-    def update_seed(self, seed=[]):
-        if not seed:
-            seed = self.r.seed
-        self.c.r.update_seed(seed)
-
     def return_probdens(self):
         return self.r.return_probdens() * self.c.r.return_probdens()
 

{fmdtools-2.0.4 → fmdtools-2.0.5}/fmdtools/define/object/coords.py

@@ -787,7 +787,7 @@ class Coords(BaseObject):
 
     def set_rand_pts(self, prop, value, number, pts=None, replace=False):
         """
-        Ses a given number of points for a property to random value.
+        Set a given number of points for a property to random value.
 
         Parameters
         ----------
@@ -840,7 +840,7 @@ class Coords(BaseObject):
 
     def return_mutables(self):
         """Check if grid properties have changed (used in propagation)."""
-        return tuple([*(tuple(map(tuple, getattr(self, state)))
+        return tuple([*(tuple(map(tuple, replace_array_nan(getattr(self, state))))
                         for state in self.states)])
 
     def copy(self):
@@ -1321,6 +1321,14 @@ class Coords(BaseObject):
         return fig, ax
 
 
+def replace_array_nan(array):
+    """Turn arrays with nans into arrays with infs."""
+    if np.isnan(array).any():
+        return np.nan_to_num(array, nan=np.inf)
+    else:
+        return array
+
+
 class ExampleCoordsParam(CoordsParam):
     """Example of a Coords param for use in documentation/testing."""
 

{fmdtools-2.0.4 → fmdtools-2.0.5}/fmdtools/sim/propagate.py

@@ -359,9 +359,12 @@ def exec_nom_par(arg):
     return endclass, mdlhist
 
 
-def exec_nom_helper(mdl, scen, name, **kwargs):
+def exec_nom_helper(mdl, scen, name, mdl_kwargs={}, **kwargs):
     """Execute a nominal scenario (helper function)."""
-    mdl_run = mdl.new(p=scen.p, sp=scen.sp, r=scen.r)
+    mdl_kwargs = {'p': {**mdl_kwargs.get('p', {}), **scen.p},
+                  'sp': {**mdl_kwargs.get('sp', {}), **scen.sp},
+                  'r': {**mdl_kwargs.get('r', {}), **scen.r}}
+    mdl_run = mdl.new(**mdl_kwargs)
     result, mdlhist, _, t_end = prop_one_scen(mdl_run, scen, **kwargs)
     check_hist_memory(mdlhist, kwargs['num_scens'], max_mem=kwargs['max_mem'])
     save_helper(kwargs['save_args'], result, mdlhist, name, name)

{fmdtools-2.0.4 → fmdtools-2.0.5}/fmdtools.egg-info/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: fmdtools
-Version: 2.0.4
+Version: 2.0.5
 Summary: System resilience modelling, simulation, and assessment in Python
 Author: fmdtools Developers
 Maintainer-email: Daniel Hulse <daniel.e.hulse@nasa.gov>
-License: fmdtools version 2.0.4
+License: fmdtools version 2.0.5
         ---------------------------
                                          Apache License
                                    Version 2.0, January 2004
@@ -236,7 +236,9 @@ Project-URL: Documentation, https://nasa.github.io/fmdtools/
 Project-URL: source-code, https://github.com/nasa/fmdtools
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Science/Research
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Scientific/Engineering
@@ -268,7 +270,7 @@ Requires-Dist: shapely>=2.0
 [![GitHub Tag](https://img.shields.io/github/v/tag/nasa/fmdtools)](https://github.com/nasa/fmdtools/tags)
 [![CodeFactor](https://www.codefactor.io/repository/github/nasa/fmdtools/badge)](https://www.codefactor.io/repository/github/nasa/fmdtools)
 [![Tests Status](./reports/full-py311/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/full-py311/junit/report.html)
-[![Tests Coverage](./reports/full-py311/coverage-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/full-py311/coverage/index.html)
+[![Tests Coverage](./reports/full-py311/coverage-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/full-py311/coverage_html/index.html)
 [![GitHub License](https://img.shields.io/badge/License-Apache%202.0-green)](https://github.com/nasa/fmdtools/blob/main/LICENSE)
 [![NASA Software Classification](https://img.shields.io/badge/Software_Class-E-blue)](https://nodis3.gsfc.nasa.gov/displayDir.cfm?Internal_ID=N_PR_7150_002D_&page_name=AppendixD)
 
@@ -355,7 +357,7 @@ This may then be installed using:
 Note that this version reflects the latest version on the ``main`` git branch along with any local changes. To use a particular version of ``fmdtools`` you can checkout the tag corresponding to the version you want, e.g.:
 
 ```
-   git checkout v2.0.4
+   git checkout v2.0.5
 ```
 
 
@@ -493,8 +495,8 @@ To cite a particular version of the fmdtools, you may use:
   author = {{NASA}},
   title = {fmdtools},
   url = {https://github.com/nasa/fmdtools},
-  version = {2.0.4}, # <- replace with your version number
-  date = {2024-10-25},
+  version = {2.0.5}, # <- replace with your version number
+  date = {2024-11-13},
 }
 ```
 

{fmdtools-2.0.4 → fmdtools-2.0.5}/pyproject.toml

@@ -8,7 +8,9 @@ maintainers = [
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Intended Audience :: Science/Research",
+  "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "License :: OSI Approved :: Apache Software License",
   "Operating System :: OS Independent",
   "Topic :: Scientific/Engineering",
@@ -16,7 +18,7 @@ classifiers = [
 description = "System resilience modelling, simulation, and assessment in Python"
 license = {file="LICENSE"}
 name = "fmdtools"
-version="2.0.4"
+version="2.0.5"
 readme = "README.md"
 requires-python = ">=3.10"