fmdtools 2.1.2__tar.gz → 2.2.0__tar.gz

{fmdtools-2.1.2 → fmdtools-2.2.0}/LICENSE

@@ -1,4 +1,4 @@
-fmdtools version 2.1.2
+fmdtools version 2.2.0
 ---------------------------
                                  Apache License
                            Version 2.0, January 2004

{fmdtools-2.1.2/fmdtools.egg-info → fmdtools-2.2.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: fmdtools
-Version: 2.1.2
+Version: 2.2.0
 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.1.2
+License: fmdtools version 2.2.0
         ---------------------------
                                          Apache License
                                    Version 2.0, January 2004
@@ -236,24 +236,24 @@ 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: Programming Language :: Python :: 3.13
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: scipy
 Requires-Dist: tqdm
 Requires-Dist: networkx
-Requires-Dist: numpy<=1.26.4,>1.10
+Requires-Dist: numpy>=2.0
 Requires-Dist: matplotlib>=3.7.0
 Requires-Dist: pandas
 Requires-Dist: ordered-set
 Requires-Dist: dill
-Requires-Dist: recordclass==0.22.1
+Requires-Dist: recordclass==0.23.1
 Requires-Dist: pytest
 Requires-Dist: graphviz
 Requires-Dist: shapely>=2.0
@@ -263,15 +263,15 @@ Dynamic: license-file
 
 # Overview
 
-![Python Version](https://img.shields.io/badge/Python-3.11-blue)
+![Python Version](https://img.shields.io/badge/Python-3.13-blue)
 [![PyPI](https://img.shields.io/pypi/v/fmdtools)](https://pypi.org/project/fmdtools/)
 [![Total Downloads](https://static.pepy.tech/badge/fmdtools)](https://pepy.tech/project/fmdtools)
 [![Downloads/Month](https://static.pepy.tech/badge/fmdtools/month)](https://pepy.tech/project/fmdtools)
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/nasa/fmdtools?label=GitHub%20Release)](https://github.com/nasa/fmdtools/releases)
 [![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_html/index.html)
+[![Tests Status](./reports/full-py313/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/full-py313/junit/report.html)
+[![Tests Coverage](./reports/full-py313/coverage-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/full-py313/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)
 
@@ -306,23 +306,23 @@ The fmdtools documentation repository is also home to the Functional Reasoning D
 
 ### Python version compatibility
 
-The fmdtools library is developed in Python 3.11 but tested to maintain compatibility over three versions of Python. See current doctest reports below:
+The fmdtools library is developed in Python 3.13 but is tested to maintain compatibility over three versions of Python. See current doctest reports below:
 
 | Python Version    | Doctests |
 | -------- | ------- |
-| 3.10  | [![Python 3.10 Tests](./reports/doctests-py310/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/doctests-py310/junit/report.html)   |
-| 3.11 | [![Python 3.11 Tests](./reports/doctests-py311/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/doctests-py311/junit/report.html)    |
-| 3.12    | [![Python 3.12 Tests](./reports/doctests-py312/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/doctests-py312/junit/report.html)   |
+| 3.11  | [![Python 3.11 Tests](./reports/doctests-py311/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/doctests-py311/junit/report.html)   |
+| 3.12 | [![Python 3.12 Tests](./reports/doctests-py312/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/doctests-py312/junit/report.html)    |
+| 3.13    | [![Python 3.13 Tests](./reports/doctests-py313/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/doctests-py313/junit/report.html)   |
 
-Further (functional and integration) tests are performed in the Python 3.11 to ensure that examples run as desired. Thus, it is generally reccommended to use Python 3.11 to keep pace with development, especially when running examples.
+Further (functional and integration) tests are performed in the Python 3.13 to ensure that examples run as desired. Thus, it is generally reccommended to use Python 3.13 with this version to keep pace with development, especially when running examples.
 
 ### Set up python tooling environment
 
 The fmdtools library was developed to run in a python development environments.
 
-If you do not have an existing python environment, first [download and install anaconda](https://docs.anaconda.com/free/anaconda/install/index.html) or [uv]().
+If you do not have an existing python environment, first [download and install anaconda](https://docs.anaconda.com/free/anaconda/install/index.html) or [uv](https://docs.astral.sh/uv/).
 
-After the base installation, set up a new `Python 3.11` environment for fmdtools and install these external external packages in it:
+After the base installation, set up a new `Python 3.13` environment for fmdtools and install these external external packages in it:
 
 ```
 spyder-kernels
@@ -367,13 +367,13 @@ 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.1.2
+   git checkout v2.2.0
 ```
 
 
 #### Dependencies
 
-fmdtools requires `Python 3.11` and depends directly on the packages below (see requirements.txt). Note that the use of these depencencies is governed by their respective licences, which may be obtained at the provided links.
+fmdtools requires `Python 3.13` and depends directly on the packages below (see requirements.txt). Note that the use of these depencencies is governed by their respective licences, which may be obtained at the provided links.
 
 ```
 scipy
@@ -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.1.2},
-  date = {2025-5-19},
+  version = {2.2.0},
+  date = {2025-6-6},
 }
 ```
 

{fmdtools-2.1.2 → fmdtools-2.2.0}/README.md

@@ -2,15 +2,15 @@
 
 # Overview
 
-![Python Version](https://img.shields.io/badge/Python-3.11-blue)
+![Python Version](https://img.shields.io/badge/Python-3.13-blue)
 [![PyPI](https://img.shields.io/pypi/v/fmdtools)](https://pypi.org/project/fmdtools/)
 [![Total Downloads](https://static.pepy.tech/badge/fmdtools)](https://pepy.tech/project/fmdtools)
 [![Downloads/Month](https://static.pepy.tech/badge/fmdtools/month)](https://pepy.tech/project/fmdtools)
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/nasa/fmdtools?label=GitHub%20Release)](https://github.com/nasa/fmdtools/releases)
 [![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_html/index.html)
+[![Tests Status](./reports/full-py313/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/full-py313/junit/report.html)
+[![Tests Coverage](./reports/full-py313/coverage-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/full-py313/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)
 
@@ -45,23 +45,23 @@ The fmdtools documentation repository is also home to the Functional Reasoning D
 
 ### Python version compatibility
 
-The fmdtools library is developed in Python 3.11 but tested to maintain compatibility over three versions of Python. See current doctest reports below:
+The fmdtools library is developed in Python 3.13 but is tested to maintain compatibility over three versions of Python. See current doctest reports below:
 
 | Python Version    | Doctests |
 | -------- | ------- |
-| 3.10  | [![Python 3.10 Tests](./reports/doctests-py310/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/doctests-py310/junit/report.html)   |
-| 3.11 | [![Python 3.11 Tests](./reports/doctests-py311/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/doctests-py311/junit/report.html)    |
-| 3.12    | [![Python 3.12 Tests](./reports/doctests-py312/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/doctests-py312/junit/report.html)   |
+| 3.11  | [![Python 3.11 Tests](./reports/doctests-py311/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/doctests-py311/junit/report.html)   |
+| 3.12 | [![Python 3.12 Tests](./reports/doctests-py312/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/doctests-py312/junit/report.html)    |
+| 3.13    | [![Python 3.13 Tests](./reports/doctests-py313/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/reports/doctests-py313/junit/report.html)   |
 
-Further (functional and integration) tests are performed in the Python 3.11 to ensure that examples run as desired. Thus, it is generally reccommended to use Python 3.11 to keep pace with development, especially when running examples.
+Further (functional and integration) tests are performed in the Python 3.13 to ensure that examples run as desired. Thus, it is generally reccommended to use Python 3.13 with this version to keep pace with development, especially when running examples.
 
 ### Set up python tooling environment
 
 The fmdtools library was developed to run in a python development environments.
 
-If you do not have an existing python environment, first [download and install anaconda](https://docs.anaconda.com/free/anaconda/install/index.html) or [uv]().
+If you do not have an existing python environment, first [download and install anaconda](https://docs.anaconda.com/free/anaconda/install/index.html) or [uv](https://docs.astral.sh/uv/).
 
-After the base installation, set up a new `Python 3.11` environment for fmdtools and install these external external packages in it:
+After the base installation, set up a new `Python 3.13` environment for fmdtools and install these external external packages in it:
 
 ```
 spyder-kernels
@@ -106,13 +106,13 @@ 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.1.2
+   git checkout v2.2.0
 ```
 
 
 #### Dependencies
 
-fmdtools requires `Python 3.11` and depends directly on the packages below (see requirements.txt). Note that the use of these depencencies is governed by their respective licences, which may be obtained at the provided links.
+fmdtools requires `Python 3.13` and depends directly on the packages below (see requirements.txt). Note that the use of these depencencies is governed by their respective licences, which may be obtained at the provided links.
 
 ```
 scipy
@@ -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.1.2},
-  date = {2025-5-19},
+  version = {2.2.0},
+  date = {2025-6-6},
 }
 ```
 

{fmdtools-2.1.2 → fmdtools-2.2.0}/examples/asg_demo/demo_model.py

@@ -33,7 +33,6 @@ class OutcomeStates(State):
 
 class Outcome(Flow):
 
-    __slots__ = ()
     container_s = OutcomeStates
 
 
@@ -47,7 +46,6 @@ class HazardState(State):
 
 class Hazard(Flow):
 
-    __slots__ = ()
     container_s = HazardState
 
 
@@ -61,12 +59,11 @@ class ActionMode(Mode):
 class Perceive(Action):
     """A user's perception abilities/behaviors for percieving the hazard."""
 
-    __slots__ = ('hazard', 'outcome')
     container_m = ActionMode
     flow_hazard = Hazard
     flow_outcome = Outcome
 
-    def behavior(self, time):
+    def dynamic_behavior(self):
         if not self.m.in_mode('failed', 'unable'):
             self.hazard.s.percieved = self.hazard.s.present
             self.outcome.s.num_perceptions += self.hazard.s.percieved
@@ -81,12 +78,11 @@ class Perceive(Action):
 class Act(Action):
     """User actions to mitigate the hazard."""
 
-    __slots__ = ('hazard', 'outcome')
     container_m = ActionMode
     flow_hazard = Hazard
     flow_outcome = Outcome
 
-    def behavior(self, time):
+    def dynamic_behavior(self):
         if not self.m.in_mode('failed', 'unable'):
             self.outcome.s.num_actions += 1
             self.hazard.s.mitigated = True
@@ -103,10 +99,9 @@ class Act(Action):
 class Done(Action):
     """User state after performing the action."""
 
-    __slots__ = ('hazard')
     flow_hazard = Hazard
 
-    def behavior(self, time):
+    def dynamic_behavior(self):
         if not self.hazard.s.present:
             self.hazard.s.mitigated = False
 
@@ -136,7 +131,6 @@ class Human(ActionArchitecture):
 class DetectHazard(Function):
     """Function containing the human."""
 
-    __slots__ = ('hazard')
     container_m = Mode
     arch_aa = Human
     flow_hazard = Hazard
@@ -145,11 +139,10 @@ class DetectHazard(Function):
 class ProduceHazard(Function):
     """Function producing Hazards."""
 
-    __slots__ = ('hazard',)
     flow_hazard = Hazard
 
-    def dynamic_behavior(self, time):
-        if not time % 4:
+    def dynamic_behavior(self):
+        if not self.t.time % 4:
             self.hazard.s.present = True
         else:
             self.hazard.s.present = False
@@ -165,11 +158,10 @@ class PassStates(State):
 class PassHazard(Function):
     """Accumulates total hazards/mitigations."""
 
-    __slots__ = ('hazard',)
     container_s = PassStates
     flow_hazard = Hazard
 
-    def dynamic_behavior(self, time):
+    def dynamic_behavior(self):
         if self.hazard.s.present and self.hazard.s.mitigated:
             self.s.hazards_mitigated += 1
         elif self.hazard.s.present and not self.hazard.s.mitigated:
@@ -179,7 +171,6 @@ class PassHazard(Function):
 class HazardModel(FunctionArchitecture):
     """Overall model of the human in context."""
 
-    __slots__ = ()
     default_sp = dict(end_time=60, dt=1.0)
 
     def init_architecture(self, **kwargs):
@@ -194,9 +185,9 @@ if __name__ == '__main__':
     mdl = HazardModel()
     result_fault, mdlhist_fault = prop.one_fault(mdl, 'detect_hazard.aa.acts.act',
                                                  'unable', time=4,
-                                                 desired_result='graph')
+                                                 to_return='graph')
 
-    result_fault.graph.draw()
+    result_fault.get_faulty().tend.graph.draw()
     ex_fxn = DetectHazard('detect_hazard')
     result_indiv, hist_indiv = prop.nominal(ex_fxn,
                                             disturbances={5:{'aa.flows.hazard.s.present':True}})
@@ -206,5 +197,5 @@ if __name__ == '__main__':
 
     result_fault, mdlhist_fault = prop.one_fault(mdl, 'detect_hazard.aa.acts.perceive',
                                                  'failed', time=4,
-                                                 desired_result='graph.fxns.detect_hazard.aa')
-    result_fault.graph.fxns.detect_hazard.aa.draw_graphviz(layout='dot')
+                                                 to_return='graph.fxns.detect_hazard.aa')
+    result_fault.get_faulty().tend.graph.fxns.detect_hazard.aa.draw_graphviz(layout='dot')

{fmdtools-2.1.2 → fmdtools-2.2.0}/examples/eps/eps.py

@@ -44,7 +44,6 @@ class GenericState(State):
 
 class GenericFlow(Flow):
 
-    __slots__ = ()
     container_s = GenericState
 
 
@@ -53,7 +52,6 @@ class SigState(State):
 
 
 class Signal(Flow):
-    __slots__ = ()
     container_s = SigState
 
 
@@ -65,7 +63,6 @@ class ImportEEModes(Mode):
 
 class ImportEE(Function):
 
-    __slots__ = ("ee_out",)
     container_m = ImportEEModes
     flow_ee_out = GenericFlow
     flownames = {"ee_1": "ee_out"}
@@ -84,7 +81,7 @@ class ImportEE(Function):
     Both representations can be used--this just shows this representation.
     """
 
-    def static_behavior(self, time):
+    def static_behavior(self):
         if self.m.has_fault("no_v"):
             self.ee_out.s.effort = 0.0
         elif self.m.has_fault("high_v"):
@@ -102,12 +99,11 @@ class ImportSigModes(Mode):
 
 class ImportSig(Function):
 
-    __slots__ = ("sig_out",)
     container_m = ImportSigModes
     flow_sig_out = Signal
     flownames = {"sig_in": "sig_out"}
 
-    def static_behavior(self, time):
+    def static_behavior(self):
         if self.m.has_fault("partial_signal"):
             self.sig_out.s.value = 0.5
         elif self.m.has_fault("no_signal"):
@@ -123,7 +119,6 @@ class StoreEEModes(Mode):
 
 class StoreEE(Function):
 
-    __slots__ = ("ee_in", "ee_out")
     container_m = StoreEEModes
     flow_ee_in = GenericFlow
     flow_ee_out = GenericFlow
@@ -135,7 +130,7 @@ class StoreEE(Function):
         elif self.ee_out.s.effort * self.ee_out.s.rate >= 2.0:
             self.m.add_fault("low_storage")
 
-    def static_behavior(self, time):
+    def static_behavior(self):
         self.set_faults()
         if self.m.has_fault("no_storage"):
             self.ee_out.s.effort = 0.0
@@ -158,7 +153,6 @@ class SupplyEEModes(Mode):
 
 class SupplyEE(Function):
 
-    __slots__ = ("ee_in", "ee_out", "heat_out")
     container_m = SupplyEEModes
     flow_ee_in = GenericFlow
     flow_ee_out = GenericFlow
@@ -171,7 +165,7 @@ class SupplyEE(Function):
         elif self.ee_out.s.rate > 1.0:
             self.m.add_fault("open_circuit")
 
-    def static_behavior(self, time):
+    def static_behavior(self):
         self.set_faults()
         if self.m.has_fault("open_circuit"):
             self.ee_out.s.effort = 0.0
@@ -201,7 +195,6 @@ class DistEEModes(Mode):
 
 class DistEE(Function):
 
-    __slots__ = ("sig_in", "ee_in", "ee_m", "ee_h", "ee_o")
     container_m = DistEEModes
     flow_sig_in = Signal
     flow_ee_in = GenericFlow
@@ -214,7 +207,7 @@ class DistEE(Function):
         if max(self.ee_m.s.rate, self.ee_h.s.rate, self.ee_o.s.rate) > 2.0:
             self.m.add_fault("short")
 
-    def static_behavior(self, time):
+    def static_behavior(self):
         self.set_faults()
         if self.m.has_fault("short"):
             self.ee_in.s.rate = self.ee_in.s.effort * 4.0
@@ -253,12 +246,11 @@ class ExportHEModes(Mode):
 
 class ExportHE(Function):
 
-    __slots__ = ("he",)
     container_m = ExportHEModes
     flow_he = GenericFlow
     flownames = {"waste_he_1": "he", "waste_he_o": "he", "waste_he_m": "he"}
 
-    def static_behavior(self, time):
+    def static_behavior(self):
         if self.m.has_fault("ineffective_sink"):
             self.he.s.rate = 4.0
         elif self.m.has_fault("hot_sink"):
@@ -269,19 +261,17 @@ class ExportHE(Function):
 
 class ExportME(Function):
 
-    __slots__ = ("me",)
     flow_me = GenericFlow
 
-    def static_behavior(self, time):
+    def static_behavior(self):
         self.me.s.rate = self.me.s.effort
 
 
 class ExportOE(Function):
 
-    __slots__ = ("oe",)
     flow_oe = GenericFlow
 
-    def static_behavior(self, time):
+    def static_behavior(self):
         self.oe.s.rate = self.oe.s.effort
 
 
@@ -295,14 +285,13 @@ class EEtoMEModes(Mode):
 
 class EEtoME(Function):
 
-    __slots__ = ("ee_in", "me", "he_out")
     container_m = EEtoMEModes
     flow_ee_in = GenericFlow
     flow_me = GenericFlow
     flow_he_out = GenericFlow
     flownames = {"ee_m": "ee_in", "waste_he_m": "he_out"}
 
-    def static_behavior(self, time):
+    def static_behavior(self):
         if self.m.has_fault("high_torque"):
             self.he_out.s.effort = self.ee_in.s.effort + 1.0
             self.me.s.effort = self.ee_in.s.effort + 1.0
@@ -341,7 +330,6 @@ class EEtoHEModes(Mode):
 
 class EEtoHE(Function):
 
-    __slots__ = ("ee_in", "he")
     container_m = EEtoHEModes
     flow_ee_in = GenericFlow
     flow_he = GenericFlow
@@ -353,7 +341,7 @@ class EEtoHE(Function):
         elif self.ee_in.s.effort > 1.0:
             self.m.add_fault("low_heat")
 
-    def static_behavior(self, time):
+    def static_behavior(self):
         if self.m.has_fault("open_circuit"):
             self.he.s.effort = 0.0
             self.ee_in.s.rate = 0.0
@@ -378,7 +366,6 @@ class EEtoOEModes(Mode):
 
 class EEtoOE(Function):
 
-    __slots__ = ("ee_in", "oe", "he_out")
     container_m = EEtoOEModes
     flow_ee_in = GenericFlow
     flow_oe = GenericFlow
@@ -389,7 +376,7 @@ class EEtoOE(Function):
         if self.ee_in.s.effort >= 2.0:
             self.m.add_fault("burnt_out")
 
-    def static_behavior(self, time):
+    def static_behavior(self):
         if self.m.has_fault("burnt_out"):
             self.ee_in.s.rate = 0.0
             self.he_out.s.effort = 0.0
@@ -406,7 +393,6 @@ class EEtoOE(Function):
 
 class EPS(FunctionArchitecture):
 
-    __slots__ = ()
     default_track = {"flows": ["he", "me", "oe"]}
     default_sp = {'end_time': 0}
 
@@ -444,7 +430,7 @@ class EPS(FunctionArchitecture):
         self.add_fxn("export_waste_ho", ExportHE, "waste_he_o")
         self.add_fxn("export_waste_hm", ExportHE, "waste_he_m")
 
-    def find_classification(self, scen, mdlhists):
+    def classify(self, scen={}, mdlhists={}, **kwargs):
         outflows = ["he", "me", "oe"]
 
         qualfunc = [
@@ -493,12 +479,12 @@ if __name__ == "__main__":
     result, mdlhists = propagate.one_fault(mdl, "distribute_ee", "short")
 
     result, mdlhists = propagate.one_fault(mdl, "distribute_ee", "short",
-                                           desired_result="graph")
+                                           to_return="graph")
 
-    result.graph.draw()
+    result.get_faulty().tend.graph.draw()
     # endclasses, mdlhists = propagate.single_faults(mdl)
 
-    # resgraph, mdlhists = propagate.one_fault(mdl, 'ee_to_me', 'toohigh_torque', desired_result="fxnflowgraph")
+    # resgraph, mdlhists = propagate.one_fault(mdl, 'ee_to_me', 'toohigh_torque', to_return="fxnflowgraph")
     # result.graph.draw()
     ks = [*mdl.get_roles_as_dict("fxn", "flow", flex_prefixes=True)]
 

{fmdtools-2.1.2 → fmdtools-2.2.0}/examples/eps/test_eps.py

@@ -39,16 +39,18 @@ class epsTests(unittest.TestCase, CommonTests):
         backwards through the graph as expected - distributor short leads to empty battery
         """
         res, hist = prop.one_fault(self.mdl, "distribute_ee", "short",
-                                   desired_result="endfaults")
-        self.assertEqual(res["endfaults"], ['store_ee.no_storage', 'distribute_ee.short'])
+                                   to_return="faults")
+        self.assertEqual(res.get_faulty().tend.faults,
+                         ['store_ee.no_storage', 'distribute_ee.short'])
 
     def test_backward_fault_prop_2(self):
         """Tests that defined fault cases that require reverse propagation propagate
         backwards through the graph as expected - motor short leads to distributor short
         """
         res, hist = prop.one_fault(self.mdl, "ee_to_me", "short",
-                                   desired_result="endfaults")
-        self.assertEqual(res["endfaults"], ['store_ee.no_storage', 'distribute_ee.short', 'ee_to_me.short'])
+                                   to_return="faults")
+        self.assertEqual(res.get_faulty().tend.faults,
+                         ['store_ee.no_storage', 'distribute_ee.short', 'ee_to_me.short'])
 
     def test_all_faults(self):
         """Some basic tests for propagating lists of faults in the model--
@@ -82,7 +84,6 @@ class epsTests(unittest.TestCase, CommonTests):
             fs.add_fault_phases(n_joint=n_joint)
             # tests the length
             self.assertEqual(len(fs.scenarios()), math.comb(actual_num_faults, n_joint))
-            ec, hists = prop.fault_sample(self.mdl, fs, showprogress=False)
 
     def test_pickleability(self):
         unpickleable = check_pickleability(self.mdl, verbose=False)
@@ -117,9 +118,17 @@ class epsTests(unittest.TestCase, CommonTests):
 
 
 if __name__ == "__main__":
+    import sys
+    sys.path.append("../..")
+
+    # suite = unittest.TestSuite()
+    # suite.addTest(epsTests("test_fault_app"))
+    # runner = unittest.TextTestRunner()
+    # runner.run(suite)
+
     unittest.main()
 
-    mdl = EPS()
+    # mdl = EPS()
 
 
     # endresults, resgraph, mdlhist = propagate.one_fault(mdl, 'Distribute_EE', 'short')