fmdtools 2.1.1__tar.gz → 2.1.2__tar.gz

{fmdtools-2.1.1 → fmdtools-2.1.2}/LICENSE

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

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

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: fmdtools
-Version: 2.1.1
+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.1
+License: fmdtools version 2.1.2
         ---------------------------
                                          Apache License
                                    Version 2.0, January 2004
@@ -300,6 +300,7 @@ Simulation techniques in fmdtools represent the state-of-the-art in dynamical sy
 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
 
@@ -366,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.1.1
+   git checkout v2.1.2
 ```
 
 
@@ -500,12 +501,12 @@ 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.1},
-  date = {2024-11-13},
+  version = {2.1.2},
+  date = {2025-5-19},
 }
 ```
 

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

@@ -39,6 +39,7 @@ Simulation techniques in fmdtools represent the state-of-the-art in dynamical sy
 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
 
@@ -105,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.1.1
+   git checkout v2.1.2
 ```
 
 
@@ -239,12 +240,12 @@ 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.1},
-  date = {2024-11-13},
+  version = {2.1.2},
+  date = {2025-5-19},
 }
 ```
 

{fmdtools-2.1.1 → 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.1 → 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.1'
+__version__ = '2.1.2'
 __copyright__ = "Copyright 2024 United States Government"
 __license__ = "Apache-2.0"

{fmdtools-2.1.1 → 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.1 → fmdtools-2.1.2}/fmdtools.egg-info/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: fmdtools
-Version: 2.1.1
+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.1
+License: fmdtools version 2.1.2
         ---------------------------
                                          Apache License
                                    Version 2.0, January 2004
@@ -300,6 +300,7 @@ Simulation techniques in fmdtools represent the state-of-the-art in dynamical sy
 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
 
@@ -366,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.1.1
+   git checkout v2.1.2
 ```
 
 
@@ -500,12 +501,12 @@ 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.1},
-  date = {2024-11-13},
+  version = {2.1.2},
+  date = {2025-5-19},
 }
 ```
 

{fmdtools-2.1.1 → fmdtools-2.1.2}/pyproject.toml

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