fmdtools 2.0.7__tar.gz → 2.1.1__tar.gz

{fmdtools-2.0.7 → fmdtools-2.1.1}/LICENSE

@@ -1,4 +1,4 @@
-fmdtools version 2.0.7
+fmdtools version 2.1.1
 ---------------------------
                                  Apache License
                            Version 2.0, January 2004

{fmdtools-2.0.7/fmdtools.egg-info → fmdtools-2.1.1}/PKG-INFO

@@ -1,10 +1,10 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: fmdtools
-Version: 2.0.7
+Version: 2.1.1
 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.7
+License: fmdtools version 2.1.1
         ---------------------------
                                          Apache License
                                    Version 2.0, January 2004
@@ -257,6 +257,7 @@ Requires-Dist: recordclass==0.22.1
 Requires-Dist: pytest
 Requires-Dist: graphviz
 Requires-Dist: shapely>=2.0
+Dynamic: license-file
 
 [![fmdtools logo - titanic](/docs-source/figures/logo/logo-titanic.png)](https://github.com/nasa/fmdtools)
 
@@ -296,7 +297,7 @@ Simulation techniques in fmdtools represent the state-of-the-art in dynamical sy
 <img align="left" width="100" height="100" src="/docs-source/figures/powerpoint/efficient.svg"> 
 
 ### Efficient Analysis Process
-Readily-deployable analysis methods are built in to fmdtools to enable the rapid and iterative statistical analysis of simulation results. With fmdtools, you can write 2-3 lines of code to visualize model behavior instead of spending hours writing it yourself.
+Readily-deployable analysis methods are built in to fmdtools to enable the rapid and iterative statistical analysis of simulation results. With fmdtools, you can easily leverage our existing methods to understand simulation results instead of spending hours implementing your own.
 
 
 
@@ -314,23 +315,31 @@ The fmdtools library is developed in Python 3.11 but tested to maintain compatib
 
 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.
 
-### Set up python environment
+### Set up python tooling environment
 
-The fmdtools library was developed to run in an anaconda python environment. If you do not have an existing python environment, first [download and install anaconda.](https://docs.anaconda.com/free/anaconda/install/index.html).
+The fmdtools library was developed to run in a python development environments.
 
-After the base installation, set up a new `Python 3.11` environment for fmdtools and install these external external (non-python) packages in it:
+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]().
+
+After the base installation, set up a new `Python 3.11` environment for fmdtools and install these external external packages in it:
 
 ```
+spyder-kernels
+# used for: working with external IDEs
+# license: ()
+# install from: (comes with anaconda) or `uv pip install spyder-kernels`
 jupyter notebook
 # used for: repository notebooks
 # license: (BSD-3) https://jupyter.org/governance/projectlicense.html
-# install from: (should be installed already)
+# install from: (comes with anaconda) or `uv pip install jupyter`
 graphviz
 # used for: plotting graphs using graphviz
 # license: (CPL 1.0) https://graphviz.org/license/ 
-# install from: https://anaconda.org/anaconda/graphviz
+# install from: https://anaconda.org/anaconda/graphviz or https://graphviz.org/download/
 ```
 
+From there, it can be helpful to install an IDE like [VSCode](https://code.visualstudio.com/) or [Spyder](https://www.spyder-ide.org/).
+
 Note: On Windows, some versions `fmdtools` dependencies may require a compiler such as that provided with [Microsoft Studio Build tools](https://visualstudio.microsoft.com/downloads/?q=build+tools) to build, so it (while not required) may be helpful to install it also.
 
 
@@ -357,13 +366,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.0.7
+   git checkout v2.1.1
 ```
 
 
 #### Dependencies
 
-fmdtools requires `Python 3.11` (anaconda recommended) 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.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.
 
 ```
 scipy
@@ -495,12 +504,12 @@ To cite a particular version of the fmdtools, you may use:
   author = {{NASA}},
   title = {fmdtools},
   url = {https://github.com/nasa/fmdtools},
-  version = {2.0.7},
+  version = {2.1.1},
   date = {2024-11-13},
 }
 ```
 
-To cite a particular fmdtools example or published research methodology, use the relevant reference provided in the in accompanying README file for the example.
+To cite a particular fmdtools example use the relevant reference provided in the in accompanying README file for the example. To cite a given published research methodology embodied by fmdtools, see our [publication list](PUBLICATIONS.md).
 
 ## License/Notices
 

{fmdtools-2.0.7 → fmdtools-2.1.1}/README.md

@@ -36,7 +36,7 @@ Simulation techniques in fmdtools represent the state-of-the-art in dynamical sy
 <img align="left" width="100" height="100" src="/docs-source/figures/powerpoint/efficient.svg"> 
 
 ### Efficient Analysis Process
-Readily-deployable analysis methods are built in to fmdtools to enable the rapid and iterative statistical analysis of simulation results. With fmdtools, you can write 2-3 lines of code to visualize model behavior instead of spending hours writing it yourself.
+Readily-deployable analysis methods are built in to fmdtools to enable the rapid and iterative statistical analysis of simulation results. With fmdtools, you can easily leverage our existing methods to understand simulation results instead of spending hours implementing your own.
 
 
 
@@ -54,23 +54,31 @@ The fmdtools library is developed in Python 3.11 but tested to maintain compatib
 
 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.
 
-### Set up python environment
+### Set up python tooling environment
 
-The fmdtools library was developed to run in an anaconda python environment. If you do not have an existing python environment, first [download and install anaconda.](https://docs.anaconda.com/free/anaconda/install/index.html).
+The fmdtools library was developed to run in a python development environments.
 
-After the base installation, set up a new `Python 3.11` environment for fmdtools and install these external external (non-python) packages in it:
+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]().
+
+After the base installation, set up a new `Python 3.11` environment for fmdtools and install these external external packages in it:
 
 ```
+spyder-kernels
+# used for: working with external IDEs
+# license: ()
+# install from: (comes with anaconda) or `uv pip install spyder-kernels`
 jupyter notebook
 # used for: repository notebooks
 # license: (BSD-3) https://jupyter.org/governance/projectlicense.html
-# install from: (should be installed already)
+# install from: (comes with anaconda) or `uv pip install jupyter`
 graphviz
 # used for: plotting graphs using graphviz
 # license: (CPL 1.0) https://graphviz.org/license/ 
-# install from: https://anaconda.org/anaconda/graphviz
+# install from: https://anaconda.org/anaconda/graphviz or https://graphviz.org/download/
 ```
 
+From there, it can be helpful to install an IDE like [VSCode](https://code.visualstudio.com/) or [Spyder](https://www.spyder-ide.org/).
+
 Note: On Windows, some versions `fmdtools` dependencies may require a compiler such as that provided with [Microsoft Studio Build tools](https://visualstudio.microsoft.com/downloads/?q=build+tools) to build, so it (while not required) may be helpful to install it also.
 
 
@@ -97,13 +105,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.0.7
+   git checkout v2.1.1
 ```
 
 
 #### Dependencies
 
-fmdtools requires `Python 3.11` (anaconda recommended) 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.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.
 
 ```
 scipy
@@ -235,12 +243,12 @@ To cite a particular version of the fmdtools, you may use:
   author = {{NASA}},
   title = {fmdtools},
   url = {https://github.com/nasa/fmdtools},
-  version = {2.0.7},
+  version = {2.1.1},
   date = {2024-11-13},
 }
 ```
 
-To cite a particular fmdtools example or published research methodology, use the relevant reference provided in the in accompanying README file for the example.
+To cite a particular fmdtools example use the relevant reference provided in the in accompanying README file for the example. To cite a given published research methodology embodied by fmdtools, see our [publication list](PUBLICATIONS.md).
 
 ## License/Notices
 

{fmdtools-2.0.7 → fmdtools-2.1.1}/examples/asg_demo/demo_model.py

@@ -52,7 +52,8 @@ class Hazard(Flow):
 
 
 class ActionMode(Mode):
-    fm_args = ('failed', 'unable')
+    fault_failed = ()
+    fault_unable = ()
     mode: str = 'nominal'
     exclusive = True
 
@@ -191,8 +192,8 @@ class HazardModel(FunctionArchitecture):
 if __name__ == '__main__':
     import fmdtools.sim.propagate as prop
     mdl = HazardModel()
-    result_fault, mdlhist_fault = prop.one_fault(mdl, 'detect_hazard',
-                                                 'act_unable', time=4,
+    result_fault, mdlhist_fault = prop.one_fault(mdl, 'detect_hazard.aa.acts.act',
+                                                 'unable', time=4,
                                                  desired_result='graph')
 
     result_fault.graph.draw()
@@ -203,7 +204,7 @@ if __name__ == '__main__':
                                     'aa.flows.hazard.s.percieved',
                                     'aa.flows.hazard.s.mitigated', figsize=(10,5))
 
-    result_fault, mdlhist_fault = prop.one_fault(mdl, 'detect_hazard',
-                                                 'perceive_failed', time=4,
+    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')

{fmdtools-2.0.7 → fmdtools-2.1.1}/examples/eps/eps.py

@@ -58,9 +58,9 @@ class Signal(Flow):
 
 
 class ImportEEModes(Mode):
-    fm_args = {"low_v": (1e-5, 100),
-               "high_v": (5e-6, 100),
-               "no_v": (1e-5, 300)}
+    fault_low_v = (1e-5, 100)
+    fault_high_v = (5e-6, 100)
+    fault_no_v = (1e-5, 300)
 
 
 class ImportEE(Function):
@@ -96,8 +96,8 @@ class ImportEE(Function):
 
 
 class ImportSigModes(Mode):
-    fm_args = {"partial_signal": (1e-5, 750),
-               "no_signal": (1e-6, 750)}
+    fault_partial_signal = (1e-5, 750)
+    fault_no_signal = (1e-6, 750)
 
 
 class ImportSig(Function):
@@ -117,8 +117,8 @@ class ImportSig(Function):
 
 
 class StoreEEModes(Mode):
-    fm_args = {"low_storage": (5e-6, 2000),
-               "no_storage": (5e-6, 2000)}
+    fault_low_storage = (5e-6, 2000)
+    fault_no_storage = (5e-6, 2000)
 
 
 class StoreEE(Function):
@@ -149,11 +149,11 @@ class StoreEE(Function):
 
 
 class SupplyEEModes(Mode):
-    fm_args = {"adverse_resist": (2e-6, 400),
-               "minor_overload": (1e-5, 400),
-               "major_overload": (3e-6, 400),
-               "short": (1e-7, 400),
-               "open_circuit": (5e-8, 200)}
+    fault_adverse_resist = (2e-6, 400)
+    fault_minor_overload = (1e-5, 400)
+    fault_major_overload = (3e-6, 400)
+    fault_short = (1e-7, 400)
+    fault_open_circuit = (5e-8, 200)
 
 
 class SupplyEE(Function):
@@ -193,10 +193,10 @@ class SupplyEE(Function):
 
 
 class DistEEModes(Mode):
-    fm_args = {"adverse_resist": (1e-5, 1500),
-               "poor_alloc": (2e-5, 500),
-               "short": (2e-5, 1500),
-               "open_circuit": (3e-5, 1500)}
+    fault_adverse_resist = (1e-5, 1500)
+    fault_poor_alloc = (2e-5, 500)
+    fault_short = (2e-5, 1500)
+    fault_open_circuit = (3e-5, 1500)
 
 
 class DistEE(Function):
@@ -247,8 +247,8 @@ class DistEE(Function):
 
 
 class ExportHEModes(Mode):
-    fm_args = {"hot_sink": (1e-5, 500),
-               "ineffective_sink": (0.5e-5, 1000)}
+    fault_hot_sink = (1e-5, 500)
+    fault_ineffective_sink = (0.5e-5, 1000)
 
 
 class ExportHE(Function):
@@ -286,11 +286,11 @@ class ExportOE(Function):
 
 
 class EEtoMEModes(Mode):
-    fm_args = {"high_torque": (1e-4, 200),
-               "low_torque": (1e-4, 200),
-               "toohigh_torque": (5e-5, 200),
-               "open_circuit": (5e-5, 200),
-               "short": (5e-5, 200)}
+    fault_high_torque = (1e-4, 200)
+    fault_low_torque = (1e-4, 200)
+    fault_toohigh_torque = (5e-5, 200)
+    fault_open_circuit = (5e-5, 200)
+    fault_short = (5e-5, 200)
 
 
 class EEtoME(Function):
@@ -333,10 +333,10 @@ class EEtoME(Function):
 
 
 class EEtoHEModes(Mode):
-    fm_args = {"low_heat": (2e-6, 200),
-               "high_heat": (1e-7, 200),
-               "toohigh_heat": (5e-7, 200),
-               "open_circuit": (1e-7, 200)}
+    fault_low_heat = (2e-6, 200)
+    fault_high_heat = (1e-7, 200)
+    fault_toohigh_heat = (5e-7, 200)
+    fault_open_circuit = (1e-7, 200)
 
 
 class EEtoHE(Function):
@@ -372,8 +372,8 @@ class EEtoHE(Function):
 
 
 class EEtoOEModes(Mode):
-    fm_args = {"optical_resist": (5e-7, 70),
-               "burnt_out": (2e-6, 100)}
+    fault_optical_resist = (5e-7, 70)
+    fault_burnt_out = (2e-6, 100)
 
 
 class EEtoOE(Function):

{fmdtools-2.0.7 → fmdtools-2.1.1}/examples/eps/test_eps.py

@@ -40,7 +40,7 @@ class epsTests(unittest.TestCase, CommonTests):
         """
         res, hist = prop.one_fault(self.mdl, "distribute_ee", "short",
                                    desired_result="endfaults")
-        self.assertEqual(res["endfaults"]["store_ee"], ["no_storage"])
+        self.assertEqual(res["endfaults"], ['store_ee.no_storage', 'distribute_ee.short'])
 
     def test_backward_fault_prop_2(self):
         """Tests that defined fault cases that require reverse propagation propagate
@@ -48,8 +48,7 @@ class epsTests(unittest.TestCase, CommonTests):
         """
         res, hist = prop.one_fault(self.mdl, "ee_to_me", "short",
                                    desired_result="endfaults")
-        self.assertEqual(res["endfaults"]["store_ee"], ["no_storage"])
-        self.assertEqual(res["endfaults"]["distribute_ee"], ["short"])
+        self.assertEqual(res["endfaults"], ['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--
@@ -57,7 +56,7 @@ class epsTests(unittest.TestCase, CommonTests):
         than repairs"""
         mdl = self.mdl
         res, hist = prop.single_faults(mdl, showprogress=False)
-        actual_num_faults = np.sum([len(f.m.faultmodes) for f in mdl.fxns.values()
+        actual_num_faults = np.sum([len(f.m.get_all_faultnames()) for f in mdl.fxns.values()
                                     if hasattr(f, 'm')])
         self.assertEqual(len(res.nest(1)), actual_num_faults + 1)
         hist_len_is_1 = all([len(v) == 1 for v in hist.values()])
@@ -66,7 +65,7 @@ class epsTests(unittest.TestCase, CommonTests):
                               if 'nominal' not in k])
         # all endresults have positive costs
         self.assertTrue(all_have_costs)
-        repcosts = np.sum([np.sum([m["cost"] for m in f.m.faultmodes.values()])
+        repcosts = np.sum([np.sum([m["cost"] for m in f.m.get_faults().values()])
                            for f in mdl.fxns.values() if hasattr(f, 'm')])
         # fault costs higher than if it was just repairs
         total_simcosts = sum([v for v in res.get_values('.cost').values()])
@@ -75,7 +74,7 @@ class epsTests(unittest.TestCase, CommonTests):
     def test_fault_app(self):
         """Tests that the expected number of scenarios are generated for a given
         approach"""
-        tot_faults = [len(f.m.faultmodes) for f in self.mdl.fxns.values()
+        tot_faults = [len(f.m.get_all_faultnames()) for f in self.mdl.fxns.values()
                       if hasattr(f, 'm')]
         actual_num_faults = int(np.sum(tot_faults))
         for n_joint in [2, 3, actual_num_faults]:

{fmdtools-2.0.7 → fmdtools-2.1.1}/examples/multirotor/drone_mdl_dynamic.py

@@ -36,6 +36,7 @@ import fmdtools.sim as fs
 
 import numpy as np
 
+
 class DroneEnvironmentGridParam(CoordsParam):
     """
     Define the grid parameters.
@@ -161,8 +162,8 @@ class PlanPathMode(Mode):
     """
 
     failrate = 1e-5
-    fm_args = {'noloc': (0.2, 10000),
-               'degloc': (0.8, 10000)}
+    fault_noloc = (0.2, 10000)
+    fault_degloc = (0.8, 10000)
     opermodes = ('taxi', 'hover', 'move', 'descend', 'land')
     mode: int = 'taxi'
 
@@ -452,10 +453,8 @@ class Drone(FunctionArchitecture):
         else:
             crashcost = 0
 
-        modes, modeprops = self.return_faultmodes()
-        repcost = sum([c['cost']
-                       for f, m in modeprops.items()
-                       for a, c in m.items()])
+        modeprops = self.return_faultmodes()
+        repcost = sum([m['cost'] for f, m in modeprops.items()])
 
         totcost = repcost + crashcost + lostcost
         rate = scen.rate
@@ -554,5 +553,5 @@ if __name__ == "__main__":
     import doctest
     # doctest.testmod(verbose=True)
     # script_nominal_viewed()
-    # script_faulty_trajectories()
-    ani = script_env_viewed()
+    script_faulty_trajectories()
+    # ani = script_env_viewed()

{fmdtools-2.0.7 → fmdtools-2.1.1}/examples/multirotor/drone_mdl_hierarchical.py

@@ -168,16 +168,16 @@ class AffectDOF(AffectDOFDynamic):
     def reconfig_faults(self):
         """Corrects for individual line faultmodes by turning off the opposite rotor
         and upping the throttle (amp_factor)"""
-        for fault in self.m.faults:
-            if fault in self.ca.m.sub_modes:
-                comp = self.ca.m.sub_modes[fault]
-                opp = self.ca.p.opposite[comp]
-                if self.ca.s.forward[comp] != 0.0:
-                    self.ca.s.forward[comp] = 0.0
-                    self.ca.s.upward[comp] = 0.0
-                if self.ca.s.forward[opp] != 0.0:
-                    self.ca.s.forward[opp] = 0.0
-                    self.ca.s.upward[opp] = 0.0
+        if self.get_faults(with_base_faults=False, only_present=True):
+            for cname, comp in self.ca.comps.items():
+                if comp.m.faults:
+                    oname = self.ca.p.opposite[cname]
+                    if self.ca.s.forward[cname] != 0.0:
+                        self.ca.s.forward[cname] = 0.0
+                        self.ca.s.upward[cname] = 0.0
+                    if self.ca.s.forward[oname] != 0.0:
+                        self.ca.s.forward[oname] = 0.0
+                        self.ca.s.upward[oname] = 0.0
         tot_comps = len(self.ca.comps)
         empty_comps = len([c for c in self.ca.s.forward if self.ca.s.forward[c] == 0.0])
         try:
@@ -305,25 +305,26 @@ if __name__ == "__main__":
 
     # check rf_mechbreack fault propagation in quad architecture:
     hierarchical_model = Drone(p=DroneParam(arch='quad'))
-    endclass, mdlhist = fs.propagate.one_fault(hierarchical_model,
-                                               'affect_dof',
-                                               'rf_mechbreak',
-                                               time=5)
-    mdlhist.plot_line('flows.dofs.s.x', 'flows.dofs.s.y', 'flows.dofs.s.z', 'fxns.store_ee.s.soc')
+    # endclass, mdlhist = fs.propagate.one_fault(hierarchical_model,
+    #                                            'affect_dof.ca.comps.rf',
+    #                                            'mechbreak',
+    #                                            time=5)
+    # mdlhist.plot_line('flows.dofs.s.x', 'flows.dofs.s.y', 'flows.dofs.s.z', 'fxns.store_ee.s.soc')
 
     # check rr2_propstuck fault in oct architecture over several times:
     mdl = Drone(p=DroneParam(arch='oct'))
     rr2_faults = FaultDomain(mdl)
-    rr2_faults.add_fault('affect_dof', 'rr2_propstuck')
+    # rr2_faults.add_fault('affect_dof.ca.comps.rr2', 'propstuck')
+    rr2_faults.add_all_fxn_modes("affect_dof")
 
     rr2_samp = FaultSample(rr2_faults, phasemap=PhaseMap(mdl.sp.phases))
     rr2_samp.add_fault_phases()
 
-    ec, hist = fs.propagate.fault_sample(mdl, rr2_samp , staged=True, pool=mp.Pool(4))
+    ec, hist = fs.propagate.fault_sample(mdl, rr2_samp, staged=True)
 
     # plot a single scen (at t=8)
     fault_kwargs = {'alpha': 0.2, 'color': 'red'}
-    h_plot = hist.get('nominal', 'affect_dof_rr2_propstuck_t8p0').flatten()
+    h_plot = hist.get('nominal', 'affect_dof_ca_comps_rr2_propstuck_t8p0').flatten()
     h_plot.plot_line('flows.dofs.s.x', 'flows.dofs.s.y', 'flows.dofs.s.z', 'fxns.store_ee.s.soc')
 
     # plot all scens

{fmdtools-2.0.7 → fmdtools-2.1.1}/examples/multirotor/drone_mdl_rural.py

@@ -188,12 +188,12 @@ class BatMode(Mode):
     """
 
     failrate = 1e-4
-    fm_args = {'short': (0.2, 100, {"taxi": 0.3, "move": 0.3, "land": 0.3}),
-               'degr': (0.2, 100, {"taxi": 0.3, "move": 0.3, "land": 0.3}),
-               'break': (0.2, 100, {"taxi": 0.3, "move": 0.3, "land": 0.3}),
-               'nocharge': (0.6, 100, {"taxi": 0.7, "move": 0.2, "land": 0.1}),
-               'lowcharge': (0.4, 100, {"taxi": 0.5, "move": 0.2, "land": 0.3})}
-    units = 'hr'
+    fault_short = (0.2, 100, (("taxi", 0.3), ("move", 0.3), ("land", 0.3)))
+    fault_degr = (0.2, 100, (("taxi", 0.3), ("move", 0.3), ("land", 0.3)))
+    fault_break = (0.2, 100, (("taxi", 0.3), ("move", 0.3), ("land", 0.3)))
+    fault_nocharge = (0.6, 100, (("taxi", 0.7), ("move", 0.2), ("land", 0.1)))
+    fault_lowcharge = (0.4, 100, (("taxi", 0.5), ("move", 0.2), ("land", 0.3)))
+    default_units = 'hr'
 
 
 class BatParam(Parameter):
@@ -347,8 +347,9 @@ class StoreEEMode(Mode):
     """Overall StoreEE mode."""
 
     failrate = 1e-4
-    fm_args = {'nocharge': (0.2, 0, {"taxi": 0.6, "move": 0.2, "land": 0.2}),
-               'lowcharge': (0.7, 0, {"taxi": 0.6, "move": 0.2, "land": 0.2})}
+    fault_nocharge = (0.2, 0)
+    fault_lowcharge = (0.7, 0)
+    default_phases = (("taxi", 0.6), ("move", 0.2), ("land", 0.2))
     units = 'hr'
 
 
@@ -421,9 +422,10 @@ class HoldPayloadMode(Mode):
     """
 
     failrate = 1e-6
-    fm_args = {'break': (0.2, 1000, {"taxi": 0.3, "move": 0.3, "land": 0.3}),
-               'deform': (0.8, 1000, {"taxi": 0.3, "move": 0.3, "land": 0.3})}
-    units = 'hr'
+    fault_break = (0.2, 1000)
+    fault_deform = (0.8, 1000)
+    default_phases = (("taxi", 0.3), ("move", 0.3), ("land", 0.3))
+    default_units = 'hr'
 
 
 class HoldPayload(HoldPayloadDyn):
@@ -444,7 +446,7 @@ class ManageHealthMode(Mode):
     """
 
     failrate = 1e-6
-    fm_args = {'lostfunction': (0.05, 1000, {"taxi": 0.3, "move": 0.3, "land": 0.3})}
+    fault_lostfunction = (0.05, 1000, (("taxi", 0.3), ("move", 0.3), ("land", 0.3)))
     units = 'hr'
 
 
@@ -513,8 +515,8 @@ class CtlDOFMode(Mode):
     """
 
     failrate = 1e-5
-    fm_args = {'noctl': (0.2, 1000, {"taxi": 0.6, "move": 0.3, "land": 0.1}),
-               'degctl': (0.8, 1000, {"taxi": 0.6, "move": 0.3, "land": 0.1})}
+    fault_noctl = (0.2, 1000, (("taxi", 0.6), ("move", 0.3), ("land", 0.1)))
+    fault_degctl = (0.8, 1000, (("taxi", 0.6), ("move", 0.3), ("land", 0.1)))
     mode: str = 'nominal'
     units = 'hr'
 
@@ -551,9 +553,9 @@ class PlanPathMode(Mode):
     """
 
     failrate = 1e-5
-    fm_args = {'noloc': (0.2, 1000),
-               'degloc': (0.8, 1000)}
-    phases = {"taxi": 0.6, "move": 0.3, "land": 0.1}
+    fault_noloc = (0.2, 1000)
+    fault_degloc = (0.8, 1000)
+    default_phases = (("taxi", 0.6), ("move", 0.3), ("land", 0.1))
     opermodes = ('taxi', 'to_nearest', 'to_home', 'emland', 'land', 'move')
     mode: str = 'taxi'
     exclusive = False
@@ -738,10 +740,8 @@ class Drone(FunctionArchitecture):
         ----------
         scen : Scenario
             Fault Scenario
-        viewed : TYPE
-            DESCRIPTION.
-        faulttime : TYPE
-            DESCRIPTION.
+        faulttime : int
+            time when the fault occurs.
 
         Returns
         -------
@@ -924,6 +924,7 @@ if __name__ == "__main__":
     import fmdtools.sim.propagate as prop
     from fmdtools.analyze import phases
     from fmdtools.sim.sample import SampleApproach
+    from fmdtools.define.architecture.function import FunctionArchitectureGraph
 
     # check operational phases
     mdl = Drone()