fmdtools 2.2.2__tar.gz → 2.2.3__tar.gz

{fmdtools-2.2.2 → fmdtools-2.2.3}/LICENSE

@@ -1,4 +1,4 @@
-fmdtools version 2.2.2
+fmdtools version 2.2.3
 ---------------------------
                                  Apache License
                            Version 2.0, January 2004

{fmdtools-2.2.2 → fmdtools-2.2.3}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: fmdtools
-Version: 2.2.2
+Version: 2.2.3
 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.2.2
+License: fmdtools version 2.2.3
         ---------------------------
                                          Apache License
                                    Version 2.0, January 2004
@@ -367,7 +367,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.2.1
+   git checkout v2.2.3
 ```
 
 
@@ -505,8 +505,8 @@ To cite a particular version of the fmdtools, you may use:
   author = {{NASA}},
   title = {fmdtools},
   url = {https://github.com/nasa/fmdtools},
-  version = {2.2.1},
-  date = {2025-11-24},
+  version = {2.2.3},
+  date = {2025-12-4},
 }
 ```
 

{fmdtools-2.2.2 → fmdtools-2.2.3}/README.md

@@ -106,7 +106,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.2.1
+   git checkout v2.2.3
 ```
 
 
@@ -244,8 +244,8 @@ To cite a particular version of the fmdtools, you may use:
   author = {{NASA}},
   title = {fmdtools},
   url = {https://github.com/nasa/fmdtools},
-  version = {2.2.1},
-  date = {2025-11-24},
+  version = {2.2.3},
+  date = {2025-12-4},
 }
 ```
 

{fmdtools-2.2.2 → fmdtools-2.2.3}/examples/multirotor/drone_mdl_dynamic.py

@@ -451,7 +451,8 @@ class Drone(FunctionArchitecture):
         totcost = repcost + crashcost + lostcost
         rate = scen.rate
         expcost = totcost*rate*1e5
-        return {'rate': rate, 'cost': totcost, 'expected_cost': expcost}
+        return {'rate': rate, 'cost': totcost, 'expected_cost': expcost,
+                'lost_cost': lostcost, 'crashcost': crashcost}
 
 
 def finddist(p1, p2):

{fmdtools-2.2.2 → fmdtools-2.2.3}/examples/multirotor/drone_mdl_hierarchical.py

@@ -348,7 +348,7 @@ if __name__ == "__main__":
     import multiprocessing as mp
     from fmdtools.sim.sample import FaultDomain, FaultSample
     from fmdtools.analyze.phases import PhaseMap
-    """
+
     # check rf_mechbreack fault propagation in quad architecture:
     hierarchical_model = Drone(p=DroneParam(arch='quad'))
     result, mdlhist = fs.propagate.one_fault(hierarchical_model,
@@ -379,4 +379,3 @@ if __name__ == "__main__":
     fig, ax = hist.plot_trajectories("dofs.s.x", "dofs.s.y", "dofs.s.z",
                                      time_groups=['nominal'],
                                      indiv_kwargs={'faulty': fault_kwargs})
-    """

{fmdtools-2.2.2 → fmdtools-2.2.3}/examples/multirotor/drone_mdl_static.py

@@ -795,4 +795,8 @@ if __name__ == "__main__":
     doctest.testmod(verbose=True)
 
     static_mdl = Drone()
+    fig, ax = static_mdl.as_modelgraph().draw()
+
+    result, history = propagate.one_fault(static_mdl, "store_ee", "nocharge")
+
     results, mdlhists = propagate.single_faults(static_mdl)

{fmdtools-2.2.2 → fmdtools-2.2.3}/fmdtools/__init__.py

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

{fmdtools-2.2.2 → fmdtools-2.2.3}/fmdtools/analyze/common.py

@@ -718,7 +718,7 @@ def consolidate_legend(ax, loc='upper left', bbox_to_anchor=(1.05, 1),
 
     # generate legend with consolidated labels/handles
     ax.legend(by_label.values(), by_label.keys(),
-              bbox_to_anchor=bbox_to_anchor, loc=loc, **kwargs)
+              bbox_to_anchor=bbox_to_anchor, loc=loc, **filter_kwargs(ax.legend, **kwargs))
 
 
 def mark_times(ax, tick, time, *plot_values, fontsize=8, rounddec=1, pretext="t="):

{fmdtools-2.2.2 → fmdtools-2.2.3}/fmdtools/define/architecture/base.py

@@ -23,6 +23,7 @@ specific language governing permissions and limitations under the License.
 
 from fmdtools.define.object.base import check_pickleability, BaseObject, get_dict_repr
 from fmdtools.define.flow.base import Flow
+from fmdtools.define.flow.multiflow import MultiFlow
 from fmdtools.define.block.base import Simulable
 from fmdtools.define.object.base import init_obj, get_obj_name
 from fmdtools.analyze.common import get_sub_include
@@ -295,8 +296,8 @@ class Architecture(Simulable):
             Name of the object
         objclass : class, optional
             Class to instantiate in the dict. The default is BaseObject.
-        as_copy : bool
-            Whether to instantiate obj as a copy. The default is fault.
+        use_copy : bool
+            Whether to use existing copy in self.flows. The default is False.
         **kwargs : kwargs
             Non-default kwargs to send to the object class.
         """
@@ -579,7 +580,8 @@ class Architecture(Simulable):
         copy : Architecture
             Copy of the curent architecture.
         """
-        cargs = dict(p=getattr(self, 'p', {}),
+        cargs = dict(root=self.root,
+                     p=getattr(self, 'p', {}),
                      sp=getattr(self, 'sp', {}),
                      track=getattr(self, 'track', {}),
                      h=self.h.copy(),
@@ -590,8 +592,7 @@ class Architecture(Simulable):
             cargs[flex_role+'s'] = getattr(self, flex_role+'s')
         # if flows provided from above, use those flows. Otherwise copy own.
         if hasattr(self, 'flows'):
-            cargs['flows'] = {f: flows[f] if f in flows else obj.copy()
-                              for f, obj in self.flows.items()}
+            cargs['flows'] = self.copy_flows(flows=flows)
 
         if hasattr(self, 'r'):
             cargs['r'] = self.r.copy()
@@ -599,6 +600,21 @@ class Architecture(Simulable):
         cop.assign_roles('container', self)
         return cop
 
+    def copy_flows(self, flows={}):
+        """Copy flows, along with MultiFlow structures if present."""
+        globs = {}
+        cflows = {}
+        for fn, flow in self.flows.items():
+            if fn in flows:
+                cflows[fn] = flows[fn]
+            elif not isinstance(flow, MultiFlow) or flow.glob.name == flow.name:
+                cflows[fn] = flow.copy()
+            else:
+                if flow.glob.name not in globs:
+                    globs[flow.glob.name] = flow.glob.copy()
+                cflows[fn] = globs[flow.glob.name].get_view(fn)
+        return cflows
+
     def get_all_possible_track(self):
         return super().get_all_possible_track() + self.flexible_roles
 

{fmdtools-2.2.2 → fmdtools-2.2.3}/fmdtools/define/block/base.py

@@ -28,6 +28,7 @@ from fmdtools.define.container.parameter import Parameter
 from fmdtools.define.container.time import Time
 from fmdtools.define.container.mode import Fault
 from fmdtools.analyze.result import Result
+from fmdtools.analyze.history import History
 from fmdtools.analyze.graph.base import Graph
 
 import itertools
@@ -224,7 +225,7 @@ class Simulable(BaseObject):
 
     def init_hist(self, h={}):
         """Initialize the history of the sim using SimParam parameters and track."""
-        if not h:
+        if not isinstance(h, History):
             timerange = self.sp.get_histrange()
             self.h = self.create_hist(timerange)
         else:
@@ -1001,7 +1002,7 @@ class Block(Simulable):
             if 'arch' in self.roletypes:
                 arch_dict = {role: getattr(self, role)
                              for role in self.get_roles('arch')}
-                paramdict = {**paramdict, 'sp': self.sp, **arch_dict}
+                paramdict = {**paramdict, 'sp': self.sp, 'root': self.root, **arch_dict}
             cop = self.__class__(self.name, *args, flows=flows, **paramdict)
             cop.assign_roles('container', self)
         except TypeError as e:

{fmdtools-2.2.2 → fmdtools-2.2.3}/fmdtools/define/container/base.py

@@ -317,6 +317,8 @@ class BaseContainer(dataobject, mapping=True, iterable=True, copy_default=True):
             try:
                 true_type = self.__annotations__[fieldname]
                 super().__setattr__(fieldname, true_type(value))
+            except AttributeError:
+                super().__setattr__(fieldname, value)
             except TypeError as e:
                 raise Exception("Poorly Specified field " + fieldname +
                                 " in class " + self.__class__.__name__) from e

{fmdtools-2.2.2 → fmdtools-2.2.3}/fmdtools/define/environment.py

@@ -81,13 +81,16 @@ class Environment(CommsFlow):
         # 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, sp=sp)
-        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}
         r_kwargs = {'run_stochastic': self.r.run_stochastic, 'seed': self.r.seed}
-        c = {**{'r': r_kwargs}, **c}
-        ga = {**{'r': r_kwargs, 'sp': self.sp.get_sub_kwargs()}, **ga}
+        if isinstance(c, dict):
+            if 'p' not in c and getattr(self.coords_c, 'container_p', None) == getattr(self, 'container_p', None):
+                c = {**c, 'p': p}
+            c = {**{'r': r_kwargs}, **c}
+        if isinstance(ga, dict):
+            if 'p' not in ga and getattr(self.arch_ga, 'container_p', None) == getattr(self, 'container_p', None):
+                ga = {**ga, 'p': p}
+            ga = {**{'r': r_kwargs, 'sp': self.sp.get_sub_kwargs()}, **ga}
+
         self.init_roletypes('coords', 'arch', c=c, ga=ga)
 
     def base_type(self):
@@ -129,6 +132,15 @@ class Environment(CommsFlow):
         >>> d.ga.lines['ex_line'].s.occupied = True
         >>> e.ga.lines['ex_line'].s.occupied
         False
+
+        This should also be the case for contained local versions:
+
+        >>> e = ExampleEnvironment("env")
+        >>> hi = e.create_local("hi")
+        >>> e.hi.ga.points['ex_point'].s.occupied=True
+        >>> d = e.copy()
+        >>> d.hi.ga.points['ex_point'].s.occupied
+        True
         """
         cop = super().copy(glob=glob, p=p, s=s)
         cop.r.assign(self.r)
@@ -158,6 +170,14 @@ class ExampleEnvironment(Environment):
 
 if __name__ == "__main__":
     e = ExampleEnvironment("env")
+    e.create_local("hi")
+    e.hi.ga.points['ex_point'].s.occupied=True
     d = e.copy()
+    d.hi.ga.points['ex_point'].s.occupied
+
+
+    c = ExampleEnvironment(track=None)
+    b = c.copy()
+    b.ga.h
     import doctest
     doctest.testmod(verbose=True)

{fmdtools-2.2.2 → fmdtools-2.2.3}/fmdtools/define/flow/commsflow.py

@@ -147,7 +147,9 @@ class CommsFlow(MultiFlow):
 
     def send(self, fxn_to, *states, fxn_from="local"):
         """
-        Sends a function's (fxn_from) view for the CommsFlow to another function fxn_to
+        Send a function's view to another function.
+
+        Sends function's (fxn_from) view for the CommsFlow to another function fxn_to
         by updating the function's out property and fxn_to's inbox list. Note that the
         other function must call recieve on the other end for the message to be fully
         received (update its internal view).

{fmdtools-2.2.2 → fmdtools-2.2.3}/fmdtools/define/flow/multiflow.py

@@ -284,10 +284,17 @@ class MultiFlow(Flow):
         """Copy the flow and create new sub-flow copies for it."""
         if not s and hasattr(self, 's'):
             s = self.s.asdict()
+        if not glob and self.glob.name != self.name:
+            raise Exception("Unable to copy "+self.name+" without "+self.glob.name+".")
         cop = self.__class__(self.name, glob=glob, p=p, s=s, track=track, root=self.root)
+        if hasattr(self, 'h'):
+            cop.h = self.h.copy()
         for loc in self.locals:
             local = getattr(self, loc)
-            cop.create_local(local.name, **local.copy_mut_containers(), as_copy=True)
+            mutes = local.copy_mutes(exclude=['local'])
+            cl = cop.create_local(local.name, **mutes, as_copy=True)
+            if hasattr(cl, 'h'):
+                cop.h[loc] = cl.h
         return cop
 
     def create_hist(self, timerange, track=None):

{fmdtools-2.2.2 → fmdtools-2.2.3}/fmdtools/define/object/base.py

@@ -620,11 +620,11 @@ class BaseObject(metaclass=BaseType):
         return self.get_roles_as_dict(*flexible_roles, with_flex=True,
                                       with_prefixes=flex_prefixes)
 
-    def copy_mut_containers(self):
+    def copy_mutes(self, *mute_types, **kwargs):
         """Return copies of the mutable containers."""
         return {k: v.copy()
-                for k, v in self.get_roles_as_dict('container',
-                                                   with_immutable=False).items()}
+                for k, v in self.get_roles_as_dict(*mute_types, with_immutable=False,
+                                                   **kwargs).items()}
 
     def get_roles_as_dict(self, *roletypes, with_immutable=True, with_prefix=False,
                           with_flex=True, exclude=[], **kwargs):

{fmdtools-2.2.2 → fmdtools-2.2.3}/fmdtools/define/object/coords.py

@@ -1689,6 +1689,7 @@ class MetricCoords(BaseCoords):
     array([[0, 1],
            [0, 4]])
     """
+
     __slots__ = ('__dict__', )
     roletypes = ['container', 'value']
 

{fmdtools-2.2.2 → fmdtools-2.2.3}/fmdtools.egg-info/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: fmdtools
-Version: 2.2.2
+Version: 2.2.3
 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.2.2
+License: fmdtools version 2.2.3
         ---------------------------
                                          Apache License
                                    Version 2.0, January 2004
@@ -367,7 +367,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.2.1
+   git checkout v2.2.3
 ```
 
 
@@ -505,8 +505,8 @@ To cite a particular version of the fmdtools, you may use:
   author = {{NASA}},
   title = {fmdtools},
   url = {https://github.com/nasa/fmdtools},
-  version = {2.2.1},
-  date = {2025-11-24},
+  version = {2.2.3},
+  date = {2025-12-4},
 }
 ```
 

{fmdtools-2.2.2 → fmdtools-2.2.3}/pyproject.toml

@@ -18,7 +18,7 @@ classifiers = [
 description = "System resilience modelling, simulation, and assessment in Python"
 license = {file="LICENSE"}
 name = "fmdtools"
-version="2.2.2"
+version="2.2.3"
 readme = "README.md"
 requires-python = ">=3.11"