fmdtools 2.1.0__tar.gz → 2.1.2__tar.gz

{fmdtools-2.1.0 → fmdtools-2.1.2}/LICENSE

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

{fmdtools-2.1.0 → fmdtools-2.1.2}/PKG-INFO

@@ -1,10 +1,10 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: fmdtools
-Version: 2.1.0
+Version: 2.1.2
 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.0
+License: fmdtools version 2.1.2
         ---------------------------
                                          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,9 +297,10 @@ 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.
 
 
+The fmdtools documentation repository is also home to the Functional Reasoning Design Language specification, a graphical language that may be used to represent the structure of behavioral interactions in a system to inform hazard analysis.
 
 ## Getting Started
 
@@ -314,23 +316,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 +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.0
+   git checkout v2.1.2
 ```
 
 
 #### 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
@@ -491,16 +501,16 @@ To cite fmdtools in general, you may cite our explanatory publication:
 To cite a particular version of the fmdtools, you may use:
 
 ```
-@software{nasa2024fmdtools,
+@software{nasa2025fmdtools,
   author = {{NASA}},
   title = {fmdtools},
   url = {https://github.com/nasa/fmdtools},
-  version = {2.1.0},
-  date = {2024-11-13},
+  version = {2.1.2},
+  date = {2025-5-19},
 }
 ```
 
-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.1.0 → fmdtools-2.1.2}/README.md

@@ -36,9 +36,10 @@ 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.
 
 
+The fmdtools documentation repository is also home to the Functional Reasoning Design Language specification, a graphical language that may be used to represent the structure of behavioral interactions in a system to inform hazard analysis.
 
 ## Getting Started
 
@@ -54,23 +55,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 +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.0
+   git checkout v2.1.2
 ```
 
 
 #### 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
@@ -231,16 +240,16 @@ To cite fmdtools in general, you may cite our explanatory publication:
 To cite a particular version of the fmdtools, you may use:
 
 ```
-@software{nasa2024fmdtools,
+@software{nasa2025fmdtools,
   author = {{NASA}},
   title = {fmdtools},
   url = {https://github.com/nasa/fmdtools},
-  version = {2.1.0},
-  date = {2024-11-13},
+  version = {2.1.2},
+  date = {2025-5-19},
 }
 ```
 
-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.1.0 → fmdtools-2.1.2}/examples/multirotor/drone_mdl_rural.py

@@ -956,7 +956,6 @@ if __name__ == "__main__":
 
     # check single lowcharge fault from approach
     h = History(nominal=mdlhists.nominal,
-                faulty=mdlhists.store_ee_lowcharge_t5p0)
+                faulty=mdlhists.drone_fxns_store_ee_lowcharge_t5p0)
     fig, ax = plot_env_with_traj_z(h, mdl)
     fig, ax = plot_env_with_traj(mdlhists, mdl)
-

{fmdtools-2.1.0 → fmdtools-2.1.2}/examples/rover/rover_mode_space.py

@@ -25,57 +25,54 @@ from fmdtools.analyze.phases import from_hist
 
 import multiprocessing as mp
 
+
+set_ranges = {"s.friction": {1.5, 3.0, 10.0},
+              "s.transfer": {0.5, 0.0},
+              "s.drift": {-0.2, 0.2}}
+
+dist_ranges = ranges = {"s.friction": (0.0, 20, 10),
+                        "s.transfer": (1.0, 0.0, 10),
+                        "s.drift": (-0.5, 0.5, 10)}
+
+p_test = {'ground': {'linetype': 'turn',
+                     'buffer_on': 0.5,
+                     'buffer_poor': 0.8,
+                     'buffer_near': 1.0}}
+
 if __name__ == "__main__":
     mdl = Rover()
     p = RoverParam()
     endresults, mdlhist = prop.nominal(mdl)
     pm = from_hist(mdlhist)
+    mdl_test = Rover(p=p_test, sp={'end_condition': ''})
 
     # range modes
-    mdl_range = Rover(p={"drive_modes": {"mode_args": 'range-manual-all'},
-                     'ground':{'linetype': 'turn', 'buffer_on': 0.5, 'buffer_poor': 0.8, 'buffer_near': 1.0}},
-                  sp={'end_condition': ''})
-    fd_range = FaultDomain(mdl_range)
-    fd_range.add_all_fxnclass_modes('Drive')
-    # fd_range.add_fault('drive', 'hmode_5')
-    # fd_range.add_fault('drive', 'hmode_995')
-    # fd_range.add_fault('drive', 'elec_open')
-    # faults = [('drive', 'hmode_'+str(i)) for i in range(800)]
-    # fd_range.add_faults(*faults)
+    fd_range = FaultDomain(mdl_test)
+    fd_range.add_fault_space('drive', 'custom', dist_ranges)
+
     fs_range = FaultSample(fd_range, pm['plan_path'])
     fs_range.add_fault_phases('drive')
-    results_range, mdlhists_range = prop.fault_sample(mdl_range, fs_range, pool=mp.Pool(4),
+    results_range, mdlhists_range = prop.fault_sample(mdl_test, fs_range, pool=mp.Pool(4),
                                                       staged=True)
 
     # set modes
-    mdl_id = Rover(p={"drive_modes": {"mode_args": "set"}})
-    pd_id = FaultDomain(mdl_id)
-    pd_id.add_all_fxn_modes('drive')
+    pd_id = FaultDomain(mdl_test)
+    pd_id.add_fault_space('drive', 'custom', set_ranges)
 
     ps_id = FaultSample(pd_id, phasemap=pm['plan_path'])
     ps_id.add_fault_phases('drive', args=(3,))
 
-    ec_id, hist_id = prop.fault_sample(mdl, ps_id, pool=mp.Pool(4), staged=True)
-    #  manual modes
-    mdl_id = Rover(p={"drive_modes": {"mode_args": "manual"}})
-    endresults, mdlhist = prop.one_fault(mdl_id, "drive", "elec_open",
-                                         time=1, staged=False)
+    ec_id, hist_id = prop.fault_sample(mdl_test, ps_id, pool=mp.Pool(4), staged=True)
 
-    # 100 drive faults
-    mdl_100 = Rover(p={"drive_modes": {"mode_args": 100}})
-    endresults, mdlhist = prop.one_fault(mdl_100, "drive", "hmode_34",
+    #  manual modes
+    endresults, mdlhist = prop.one_fault(mdl_test, "drive", "elec_open",
                                          time=1, staged=False)
 
     # custom fault
-    x = [1.0, 0.0, 1.0]
-    mdl = Rover(p={"drive_modes":
-                   {"custom_fault":
-                    {"friction": x[0], "drift": x[1], "transfer": x[2]}}})
-
-    _, mdlhist = prop.nominal(mdl)
+    f_kw = {'disturbances': {'s.friction': 1.0, 's.transfer': 0.0, 's.drift': 1.0}}
 
-    endresults, reshist = prop.one_fault(mdl, "drive", "custom_fault",
-                                         time=15, staged=True)
+    endresults, reshist = prop.one_fault(mdl, "drive", "custom", time=15,
+                                         staged=True, f_kw=f_kw)
 
     line_dist = endresults.endclass.line_dist
     end_loc = (reshist.faulty.flows.pos.s.x[-1], reshist.faulty.flows.pos.s.y[-1])

{fmdtools-2.1.0 → fmdtools-2.1.2}/examples/rover/rover_model.py

@@ -41,7 +41,7 @@ specific language governing permissions and limitations under the License.
 
 from fmdtools.define.container.parameter import Parameter
 from fmdtools.define.container.state import State
-from fmdtools.define.container.mode import Mode, FlexibleMode
+from fmdtools.define.container.mode import Mode
 from fmdtools.define.block.function import Function
 from fmdtools.define.architecture.function import FunctionArchitecture
 from fmdtools.define.flow.base import Flow
@@ -608,59 +608,23 @@ def rdiff_from_vects(u_self, u_lin):
     return rdiff
 
 
-class DriveMode(FlexibleMode):
-    """
-    Instantiate Modes for the Drive Function.
-
-    key_phases_by = 'plan_path' defines that the modes may be intantiated for
-    certain phases of PlanPath. The phases are defined by opptvect.
-    mode_options: determines if the how the modes in Drivemodes should be
-    formulated (e.g., as a parameter, manually, as set of modes, etc. )
-    """
+class DriveMode(Mode):
+    """Mode for the drive function, including custom fault modes."""
 
-    mode_options: tuple = tuple()
     default_phases = (('drive', 1.0), ('start', 1.0),)
-    set_franges = {"s.friction": {1.5, 3.0, 10.0},
-                   "s.transfer": {0.5, 0.0},
-                   "s.drift": {-0.2, 0.2}}
-    range_franges = {"s.friction": (0.0, 20, 10),
-                     "s.transfer": (1.0, 0.0, 10),
-                     "s.drift": (-0.5, 0.5, 10)}
+    fault_elec_open = {"disturbances": (("s.transfer", 0.0),)}
+    fault_stuck: dict = {"disturbances": (("s.friction",  10.0),)}
+    fault_stuck_right: dict = {"disturbances": (("s.friction", 3.0), ("s.drift", 0.2))}
+    fault_stuck_left: dict = {"disturbances": (("s.friction", 3.0), ("s.drift", -0.2))}
+    fault_custom: dict = {}
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        if type(self.mode_options) is int:
-            self.init_faultspace(self.range_franges, n=self.mode_options)
-        elif type(self.mode_options) is list:
-            self.add_mode_list()
-        elif type(self.mode_options) is dict:
-            self.init_faultmodes(**self.mode_options)
-        else:
-            if "manual" in self.mode_options:
-                self.add_manual_modes()
-            if "set" in self.mode_options:
-                self.init_faultspace(self.set_franges)
-            if "range" in self.mode_options:
-                if "all" in self.mode_options:
-                    self.init_faultspace(self.range_franges, n="all")
-                else:
-                    self.init_faultspace(self.range_franges, n=1)
-
-    def add_manual_modes(self, drift=0.0, friction=0.0):
-        self.init_faultmodes(elec_open={"disturbances": (("s.transfer", 0.0),)},
-                             stuck={"disturbances": (("s.friction",  10.0+friction),)},
-                             stuck_right={"disturbances": (("s.friction", 3.0+friction), ("s.drift", 0.2+drift))},
-                             stuck_left={"disturbances": (("s.friction", 3.0+friction), ("s.drift", -0.2+drift))})
-
-    def add_degradation_modes(self, deg_params):
-        self.add_manual_modes(drift=deg_params.drift, friction=deg_params.friction)
-
-    def add_mode_list(self):
-        manual_modes = {"s_" + str(i):
-                        {"friction": mode[0], "transfer": mode[1], "drift": mode[2]}
-                        for i, mode in enumerate(self.mode_options)}
-        self.init_faultstate_modes(manual_modes)
+    def update_degradation_modes(self, drift=0.0, friction=0.0):
+        """Update mode parameters based on degradation parameters."""
+        self.fault_stuck = {"disturbances": (("s.friction",  10.0+friction),)}
+        self.fault_stuck_right = {"disturbances": (("s.friction", 3.0+friction),
+                                                   ("s.drift", 0.2+drift))}
+        self.fault_stuck_left = {"disturbances": (("s.friction", 3.0+friction),
+                                                  ("s.drift", -0.2+drift))}
 
 
 class Drive(Function):
@@ -681,7 +645,8 @@ class Drive(Function):
         """Set degradation state to input degradation parameters."""
         self.s.assign(self.p, "friction", "drift")
         if self.p.drift != 0.0 and self.p.friction != 0.0:
-            self.m.add_degradation_modes(self.p)
+            self.m.update_degradation_modes(friction=self.p.friction,
+                                            drift=self.p.drift)
 
     def dynamic_behavior(self, time):
         """Define the drive behavior for a given time step."""
@@ -844,6 +809,8 @@ class PowerMode(Mode):
         Battery is out of charge.
     short: Fault
         There is a short.
+    depletion: Fault
+        The battery is depleted to a given percent
     supply: Mode
         supply power
     charge: Mode
@@ -856,6 +823,7 @@ class PowerMode(Mode):
 
     fault_no_charge = (1e-5, 100, (("off", 1.0),))
     fault_short = (1e-5, 100, (("supply", 1.0),))
+    fault_depleted: dict = {'disturbances': {'s.charge': 20.0}}
     opermodes = ("supply", "charge", "off")
     mode: str = "off"
     exclusive = True
@@ -876,7 +844,7 @@ class Power(Function):
         """Determine power use based on mode."""
         if self.m.in_mode("off"):
             self.off_power()
-        elif self.m.in_mode("supply"):
+        elif self.m.in_mode("supply", "depleted"):
             self.supply_power()
         elif self.m.in_mode("short"):
             self.short_power()
@@ -925,9 +893,10 @@ class Power(Function):
             self.ee_12.s.v = 12
             self.ee_15.s.v = 15
         else:
-            self.m.set_mode("no_charge")
+            self.m.to_fault("no_charge")
         if not self.switch.s.power:
-            self.m.set_mode("off")
+            if not self.m.any_faults():
+                self.m.set_mode("off")
 
     def power_usage(self):
         """Calculate the power usage in general."""
@@ -1028,14 +997,6 @@ class Operator(Function):
         self.set_power(t)
 
 
-def gen_model_params(x, scen):
-    """Generate model parameters for the scenario."""
-    params = {"drive_modes": {"custom_fault": {"friction": x[scen][0][0],
-                                               "drift": x[scen][0][1],
-                                               "transfer": x[scen][0][2]}}}
-    return params
-
-
 class Rover(FunctionArchitecture):
     """
     Overall rover functional architecture.
@@ -1101,7 +1062,7 @@ class Rover(FunctionArchitecture):
 
     def find_classification(self, scen, mdlhist):
         """
-        calculates metrics that need to be tracked for the simulation
+        Calculate metric that need to be tracked for the simulation.
 
         Returns
         ----------
@@ -1206,6 +1167,7 @@ if __name__ == "__main__":
 
     mdl = Rover()
 
+    ec, hist = prop.one_fault(mdl, 'power', 'depleted', time=1)
 
     ec1, hist1 = prop.nominal(mdl)
     fig, ax = hist1.plot_trajectories('flows.pos.s.x', 'flows.pos.s.y',

{fmdtools-2.1.0 → fmdtools-2.1.2}/fmdtools/__init__.py

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

{fmdtools-2.1.0 → fmdtools-2.1.2}/fmdtools/analyze/graph/style.py

@@ -87,9 +87,9 @@ def mod_prefix():
     import os
     wd = os.getcwd()
     if 'graph' in wd:
-        return '../../../docs-source/figures/frdl/'
+        return '../../../docs-source/figures/frdl/primitives/'
     else:
-        return 'docs-source/figures/frdl/'
+        return 'docs-source/figures/frdl/primitives/'
 
 
 class BaseStyle(dataobject, copy_default=True):
@@ -297,20 +297,20 @@ def edge_style_factory(style_tag, styles={}, **kwargs):
     --------
     >>> loc = mod_prefix()
     >>> fs = edge_style_factory('flow')
-    >>> fig, ax = fs.show_nx(saveas=loc+'nx_flowconnection.svg')
-    >>> sv = fs.show_gv(disp=False, saveas=loc+'gv_flowconnection.svg')
+    >>> fig, ax = fs.show_nx(saveas=loc+'nx/flowconnection.svg')
+    >>> sv = fs.show_gv(disp=False, saveas=loc+'gv/flowconnection.svg')
 
     >>> a_s = edge_style_factory('activation')
-    >>> fig, ax = a_s.show_nx(saveas=loc+'nx_activation.svg')
-    >>> sv = a_s.show_gv(disp=False, saveas=loc+'gv_activation.svg')
+    >>> fig, ax = a_s.show_nx(saveas=loc+'nx/activation.svg')
+    >>> sv = a_s.show_gv(disp=False, saveas=loc+'gv/activation.svg')
 
     >>> c_s = edge_style_factory('containment')
-    >>> fig, ax = c_s.show_nx(saveas=loc+'nx_containment.svg')
-    >>> sv = c_s.show_gv(disp=False, saveas=loc+'gv_containment.svg')
+    >>> fig, ax = c_s.show_nx(saveas=loc+'nx/containment.svg')
+    >>> sv = c_s.show_gv(disp=False, saveas=loc+'gv/containment.svg')
 
     >>> cs = edge_style_factory('connection')
-    >>> fig, ax = cs.show_nx(saveas=loc+'nx_connection.svg')
-    >>> sv = cs.show_gv(disp=False, saveas=loc+'gv_connection.svg')
+    >>> fig, ax = cs.show_nx(saveas=loc+'nx/connection.svg')
+    >>> sv = cs.show_gv(disp=False, saveas=loc+'gv/connection.svg')
     """
     if style_tag in ['flow', 'flows', 'Flow', 'functions', 'aggregation']:
         style_class = FlowEdgeStyle
@@ -519,36 +519,36 @@ def node_style_factory(style_tag, styles={}, **kwargs):
     --------
     >>> loc = mod_prefix()
     >>> fs = node_style_factory('flow')
-    >>> fig, ax = fs.show_nx(saveas=loc+'nx_flow.svg')
-    >>> sv = fs.show_gv(disp=False, saveas=loc+'gv_flow.svg')
+    >>> fig, ax = fs.show_nx(saveas=loc+'nx/flow.svg')
+    >>> sv = fs.show_gv(disp=False, saveas=loc+'gv/flow.svg')
 
     >>> ms = node_style_factory('multiflow')
-    >>> fig, ax = ms.show_nx(saveas=loc+'nx_multiflow.svg')
-    >>> sv = ms.show_gv(disp=False, saveas=loc+'gv_multiflow.svg')
+    >>> fig, ax = ms.show_nx(saveas=loc+'nx/multiflow.svg')
+    >>> sv = ms.show_gv(disp=False, saveas=loc+'gv/multiflow.svg')
 
     >>> cs = node_style_factory('commsflow')
-    >>> fig, ax = cs.show_nx(saveas=loc+'nx_commsflow.svg')
-    >>> sv = cs.show_gv(disp=False, saveas=loc+'gv_commsflow.svg')
+    >>> fig, ax = cs.show_nx(saveas=loc+'nx/commsflow.svg')
+    >>> sv = cs.show_gv(disp=False, saveas=loc+'gv/commsflow.svg')
 
     >>> fs = node_style_factory('function')
-    >>> fig, ax = fs.show_nx(saveas=loc+'nx_function.svg')
-    >>> sv = fs.show_gv(disp=False, saveas=loc+'gv_function.svg')
+    >>> fig, ax = fs.show_nx(saveas=loc+'nx/function.svg')
+    >>> sv = fs.show_gv(disp=False, saveas=loc+'gv/function.svg')
 
     >>> a_s = node_style_factory('action')
-    >>> fig, ax = a_s.show_nx(saveas=loc+'nx_action.svg')
-    >>> sv = a_s.show_gv(disp=False, saveas=loc+'gv_action.svg')
+    >>> fig, ax = a_s.show_nx(saveas=loc+'nx/action.svg')
+    >>> sv = a_s.show_gv(disp=False, saveas=loc+'gv/action.svg')
 
     >>> cs = node_style_factory('component')
-    >>> fig, ax = cs.show_nx(saveas=loc+'nx_component.svg')
-    >>> sv = cs.show_gv(disp=False, saveas=loc+'gv_component.svg')
+    >>> fig, ax = cs.show_nx(saveas=loc+'nx/component.svg')
+    >>> sv = cs.show_gv(disp=False, saveas=loc+'gv/component.svg')
 
     >>> cs = node_style_factory('container')
-    >>> fig, ax = cs.show_nx(saveas=loc+'nx_container.svg')
-    >>> sv = cs.show_gv(disp=False, saveas=loc+'gv_container.svg')
+    >>> fig, ax = cs.show_nx(saveas=loc+'nx/container.svg')
+    >>> sv = cs.show_gv(disp=False, saveas=loc+'gv/container.svg')
 
     >>> a_s = node_style_factory('architecture')
-    >>> fig, ax = a_s.show_nx(saveas=loc+'nx_architecture.svg')
-    >>> sv = a_s.show_gv(disp=False, saveas=loc+'gv_architecture.svg')
+    >>> fig, ax = a_s.show_nx(saveas=loc+'nx/architecture.svg')
+    >>> sv = a_s.show_gv(disp=False, saveas=loc+'gv/architecture.svg')
     """
     if style_tag in ['flow', 'Flow']:
         node_style = FlowNodeStyle

{fmdtools-2.1.0 → fmdtools-2.1.2}/fmdtools/analyze/tabulate.py

@@ -71,10 +71,10 @@ def result_summary_fmea(endresult, mdlhist, *attrs, metrics=()):
                                                              degraded  ... expected_cost
     exfxnarch_fxns_ex_fxn_no_charge_t1              ['ex_fxn', 'exf']  ...           0.0
     exfxnarch_fxns_ex_fxn_no_charge_t2              ['ex_fxn', 'exf']  ...           0.0
-    exfxnarch_fxns_ex_fxn_short_t1                  ['ex_fxn', 'exf']  ...           0.0
-    exfxnarch_fxns_ex_fxn_short_t2                  ['ex_fxn', 'exf']  ...           0.0
     exfxnarch_fxns_ex_fxn2_no_charge_t1  ['ex_fxn', 'ex_fxn2', 'exf']  ...           0.0
     exfxnarch_fxns_ex_fxn2_no_charge_t2  ['ex_fxn', 'ex_fxn2', 'exf']  ...           0.0
+    exfxnarch_fxns_ex_fxn_short_t1                  ['ex_fxn', 'exf']  ...           0.0
+    exfxnarch_fxns_ex_fxn_short_t2                  ['ex_fxn', 'exf']  ...           0.0
     exfxnarch_fxns_ex_fxn2_short_t1      ['ex_fxn', 'ex_fxn2', 'exf']  ...           0.0
     exfxnarch_fxns_ex_fxn2_short_t2      ['ex_fxn', 'ex_fxn2', 'exf']  ...           0.0
     nominal                                                        []  ...           1.0
@@ -450,23 +450,23 @@ class FMEA(BaseTab):
     >>> FMEA(res, exfs).as_table(sort_by="sum_cost")
                                       average_scenario_rate  ...  expected_cost
     exfxnarch.fxns.ex_fxn2 short                        0.0  ...            0.0
-                           no_charge                    0.0  ...            0.0
     exfxnarch.fxns.ex_fxn  short                        0.0  ...            0.0
-                           no_charge                    0.0  ...            0.0
+    exfxnarch.fxns.ex_fxn2 no_charge                    0.0  ...            0.0
+    exfxnarch.fxns.ex_fxn  no_charge                    0.0  ...            0.0
     <BLANKLINE>
     [4 rows x 3 columns]
     >>> FMEA(res, exfs, average_metric=["rate"], sum_metric=["cost"], expected_metric=["cost"], rates="rate").as_table()
                                       average_rate  sum_cost  expected_cost
     exfxnarch.fxns.ex_fxn2 short               1.5        13             20
-                           no_charge           1.5         9             14
-    exfxnarch.fxns.ex_fxn  short               1.5         5              8
-                           no_charge           1.5         1              2
+    exfxnarch.fxns.ex_fxn  short               1.5         9             14
+    exfxnarch.fxns.ex_fxn2 no_charge           1.5         5              8
+    exfxnarch.fxns.ex_fxn  no_charge           1.5         1              2
     >>> FMEA(res, exfs, sum_metric=["rate"], average_metric=["cost"]).as_table()
                                       sum_rate  average_cost
     exfxnarch.fxns.ex_fxn2 short             3           6.5
-                           no_charge         3           4.5
-    exfxnarch.fxns.ex_fxn  short             3           2.5
-                           no_charge         3           0.5
+    exfxnarch.fxns.ex_fxn  short             3           4.5
+    exfxnarch.fxns.ex_fxn2 no_charge         3           2.5
+    exfxnarch.fxns.ex_fxn  no_charge         3           0.5
     """
 
     def __init__(self, res, fs, add_res={}, group_by=('function', 'fault'),