fmdtools 2.0.6__tar.gz → 2.0.7__tar.gz

{fmdtools-2.0.6 → fmdtools-2.0.7}/LICENSE

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

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

@@ -1,10 +1,10 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: fmdtools
-Version: 2.0.6
+Version: 2.0.7
 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.6
+License: fmdtools version 2.0.7
         ---------------------------
                                          Apache License
                                    Version 2.0, January 2004
@@ -357,7 +357,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.0.6
+   git checkout v2.0.7
 ```
 
 
@@ -495,7 +495,7 @@ To cite a particular version of the fmdtools, you may use:
   author = {{NASA}},
   title = {fmdtools},
   url = {https://github.com/nasa/fmdtools},
-  version = {2.0.6},
+  version = {2.0.7},
   date = {2024-11-13},
 }
 ```

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

@@ -97,7 +97,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.0.6
+   git checkout v2.0.7
 ```
 
 
@@ -235,7 +235,7 @@ To cite a particular version of the fmdtools, you may use:
   author = {{NASA}},
   title = {fmdtools},
   url = {https://github.com/nasa/fmdtools},
-  version = {2.0.6},
+  version = {2.0.7},
   date = {2024-11-13},
 }
 ```

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

@@ -194,9 +194,6 @@ if __name__ == '__main__':
     result_fault, mdlhist_fault = prop.one_fault(mdl, 'detect_hazard',
                                                  'act_unable', time=4,
                                                  desired_result='graph')
-    result_fault, mdlhist_fault = prop.one_fault(mdl, 'detect_hazard',
-                                                 'perceive_failed', time=4,
-                                                 desired_result='graph')
 
     result_fault.graph.draw()
     ex_fxn = DetectHazard('detect_hazard')

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

@@ -522,17 +522,24 @@ def script_env_viewed(**kwargs):
     """Show the viewed properties of the environment in various configurations."""
     mdl = Drone(**kwargs)
     ec, mdlhist = fs.propagate.nominal(mdl)
+    l_k = dict(new_labs={'viewed': 'viewed_true', 'target': 'target_true'})
     mdl.flows['environment'].c.assign_from(mdlhist.flows.environment.c, 10)
     mdl.flows['environment'].c.show({'viewed': {}})
 
     mdl.flows['environment'].c.show({'viewed': {}, 'target': {}})
     mdl.flows['environment'].c.show({'target': {},
                                      'viewed': {'alpha': 0.5}},
+                                    legend_kwargs=l_k,
                                     collections={'start': {}, 'safe': {}})
 
     mdl.flows['environment'].c.show_from(10, mdlhist.flows.environment.c,
-                                         {'viewed': {}}, title='hi')
+                                         {'viewed': {}}, title='hi',
+                                         legend_kwargs=l_k)
     properties={'target': {'alpha': 0.6}, 'viewed': {'alpha': 0.5}}
+    mdl.flows['environment'].c.show_over_time([0, 10, 15],
+                                              history=mdlhist.flows.environment.c,
+                                              properties=properties, title='hi')
+
     ani = mdl.flows['environment'].c.animate(mdlhist.flows.environment.c,
                                              properties=properties,
                                              collections={'start': {}, 'safe': {}})

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

@@ -169,8 +169,8 @@ class AffectDOF(AffectDOFDynamic):
         """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.faultmodes:
-                comp = self.ca.faultmodes[fault]
+            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

{fmdtools-2.0.6 → fmdtools-2.0.7}/examples/multirotor/drone_mdl_urban.py

@@ -535,13 +535,13 @@ if __name__ == "__main__":
     plot_env_with_traj_z(hists, mdl)
     plot_env_with_traj(hists, mdl)
     statsfmea = an.tabulate.FMEA(endresults, app, group_by=('function', 'fault'),
-                                 weight_metrics=['rate'],
-                                 avg_metrics=['unsafe_flight_time', 'cost', 'repcost',
-                                              'landcost', 'body_strikes',
-                                              'head_strikes', 'property_restrictions'])
-    statsfmea.sort_by_metric("cost")
+                                 average_metric=['rate', 'unsafe_flight_time', 'cost',
+                                                  'repcost', 'landcost', 'body_strikes',
+                                              'head_strikes', 'property_restrictions'],
+                                 rates='rate')
+    statsfmea.sort_by_metric("average_cost")
     statsfmea.as_table()
-    statsfmea.as_plots("repcost", "unsafe_flight_time", "cost", "rate",
+    statsfmea.as_plots("average_repcost", "average_unsafe_flight_time", "average_cost", "average_rate",
                        color_factor="function", suppress_ticklabels=True,
                        legend_loc=2)
 

{fmdtools-2.0.6 → fmdtools-2.0.7}/examples/pump/ex_pump.py

@@ -644,7 +644,7 @@ def script_sample_faults(track='all', **kwargs):
 
 
 
-    c = an.tabulate.Comparison(endclasses, faultapp, default_stat=np.mean,
+    c = an.tabulate.Comparison(endclasses, faultapp, default_stat=np.average,
                                metrics=['cost', 'rate', 'expected_cost'],
                                ci_metrics=['cost'])
     c.as_table()
@@ -654,8 +654,8 @@ def script_sample_faults(track='all', **kwargs):
 
     fmea = an.tabulate.FMEA(endclasses, faultapp)
     fmea.as_table()
-    fmea.sort_by_metric("cost")
-    fmea.as_plot("cost", color_factor="function")
+    fmea.sort_by_metric("expected_cost")
+    fmea.as_plot("expected_cost", color_factor="function")
 
     # test cases for multiplot legend/axis sharing
     mdlhists.plot_line("flows.ee_1.s.current", "flows.sig_1.s.power",

{fmdtools-2.0.6 → fmdtools-2.0.7}/examples/pump/parallelism_methods.py

@@ -146,7 +146,7 @@ def parallel_mc3():
     pool = mp.Pool(4)
     mdl = Pump()
     inputlist = [(fxn, fm) for fxn in mdl.fxns
-                 for fm in mdl.fxns[fxn].faultmodes.keys()]
+                 for fm in mdl.fxns[fxn].m.faultmodes.keys()]
     resultslist = pool.map(one_fault_helper, inputlist)
     close_pool(pool)
     return resultslist

{fmdtools-2.0.6 → fmdtools-2.0.7}/examples/pump/test_pump_stochastic.py

@@ -44,20 +44,20 @@ class StochasticPumpTests(unittest.TestCase, CommonTests):
     def test_stochastic_pdf(self):
         """Tests that (1) track_pdf option runs and (2) gives repeated
         probability density results under the same seed(s)"""
-        testvals = [6.634978895402383,
-                    7.52240849998729,
-                    0.015351713962842411,
-                    4.19649888042945,
-                    0.11203099056041071,
-                    1.5036852812847645,
-                    7.936686476148655,
-                    0.0853617670950819,
-                    3.0182506814918377]
+        testvals = [35.23570453993965,
+                    49.32124529702974,
+                    0.31327201999190035,
+                    21.386958080811567,
+                    1.1103965455215503,
+                    9.066120598345039,
+                    131.79987407014573,
+                    5.81402243889764,
+                    19.01081621541118]
+        mdl = Pump(r={'run_stochastic': 'track_pdf'})
         for i in range(1, 10):
-            self.mdl.update_seed(i)
-            self.mdl.propagate(i, run_stochastic='track_pdf')
-            pd = self.mdl.return_probdens()
-            # print(pd)
+            mdl.update_seed(i)
+            mdl.propagate(i, run_stochastic='track_pdf')
+            pd = mdl.return_probdens()
             self.assertAlmostEqual(pd, testvals[i-1])
 
     def test_run_safety(self):
@@ -282,7 +282,7 @@ class StochasticPumpTests(unittest.TestCase, CommonTests):
 
 if __name__ == '__main__':
     # suite = unittest.TestSuite()
-    # suite.addTest(StochasticPumpTests("test_run_approach"))
+    # suite.addTest(StochasticPumpTests("test_stochastic_pdf"))
 
     # suite.addTest(StochasticPumpTests("test_save_load_nominalapproach"))
     # suite.addTest(StochasticPumpTests("test_save_load_nominalapproach_indiv"))
@@ -292,6 +292,6 @@ if __name__ == '__main__':
     # runner = unittest.TextTestRunner()
     # runner.run(suite_for_plots(StochasticPumpTests))
 
-    # runner = unittest.TextTestRunner()
-    # runner.run(suite_for_plots(StochasticPumpTests, True))
+    runner = unittest.TextTestRunner()
+    runner.run(suite_for_plots(StochasticPumpTests, True))
     unittest.main()

{fmdtools-2.0.6 → fmdtools-2.0.7}/examples/taxiway/common.py

@@ -823,7 +823,7 @@ def plot_tstep(mdl, mdlhist, t, fxnattr="", locattr="", markersize=10,
             if fxnattr:
                 try:
                     atthist = mdlhist.fxns.get(f + "." + fxnattr)
-                except AttributeError:
+                except Exception or AttributeError:
                     atthist = None
                 if (not atthist is None) and len(atthist) > 0:
                     if fxnattr == "s.visioncov" and atthist[t]:

{fmdtools-2.0.6 → fmdtools-2.0.7}/examples/taxiway/model.py

@@ -83,19 +83,19 @@ class taxiway_model(FunctionArchitecture):
 
 def create_fault_scen_metrics(mdlhist):
     nomhist = History({'incorrect_fields':
-             mdlhist.nominal.get_metric("i.incorrect", metric=np.sum, axis=0),
+             mdlhist.nominal.get_metric("i.incorrect", method=np.sum, axis=0),
              'assets_without_sight':
-             mdlhist.nominal.get_metric("i.nosight", metric=np.sum, axis=0),
+             mdlhist.nominal.get_metric("i.nosight", method=np.sum, axis=0),
              "unsafe_distances":
-            mdlhist.nominal.get_metric("i.unsafe", metric=np.sum, axis=0),
+            mdlhist.nominal.get_metric("i.unsafe", method=np.sum, axis=0),
             "overbooked_locations":
-            mdlhist.nominal.get_metric("i.overbooked", metric=np.sum, axis=0),
+            mdlhist.nominal.get_metric("i.overbooked", method=np.sum, axis=0),
             "incorrect_perception":
-            mdlhist.nominal.get_metric("i.incorrect_perception", metric=np.sum, axis=0),
+            mdlhist.nominal.get_metric("i.incorrect_perception", method=np.sum, axis=0),
             "duplicate_land_commands":
-            mdlhist.nominal.get_metric("i.duplicate_land", metric=np.sum, axis=0),
+            mdlhist.nominal.get_metric("i.duplicate_land", method=np.sum, axis=0),
             "cycled_assets":
-            mdlhist.nominal.get_metric('cycled', metric=np.sum, axis=0),
+            mdlhist.nominal.get_metric('cycled', methodc=np.sum, axis=0),
             "degraded_fields":
             0*mdlhist.nominal.time,
             "faulty_functions":
@@ -103,19 +103,19 @@ def create_fault_scen_metrics(mdlhist):
             "time": mdlhist.nominal.time})
         
     faulthist = History({"incorrect_fields":
-             mdlhist.faulty.get_metric("i.incorrect", metric=np.sum, axis=0),
+             mdlhist.faulty.get_metric("i.incorrect", method=np.sum, axis=0),
              'assets_without_sight':
-             mdlhist.faulty.get_metric("i.nosight", metric=np.sum, axis=0),
+             mdlhist.faulty.get_metric("i.nosight", method=np.sum, axis=0),
              "unsafe_distances":
-            mdlhist.faulty.get_metric("i.unsafe", metric=np.sum, axis=0),
+            mdlhist.faulty.get_metric("i.unsafe", method=np.sum, axis=0),
             "overbooked_locations":
-            mdlhist.faulty.get_metric("i.overbooked", metric=np.sum, axis=0),
+            mdlhist.faulty.get_metric("i.overbooked", method=np.sum, axis=0),
             "incorrect_perception":
-            mdlhist.faulty.get_metric("i.incorrect_perception", metric=np.sum, axis=0),
+            mdlhist.faulty.get_metric("i.incorrect_perception", method=np.sum, axis=0),
             "duplicate_land_commands":
-            mdlhist.faulty.get_metric("i.duplicate_land", metric=np.sum, axis=0),
+            mdlhist.faulty.get_metric("i.duplicate_land", method=np.sum, axis=0),
             "cycled_assets": 
-            mdlhist.faulty.get_metric('cycled', metric=np.sum, axis=0),
+            mdlhist.faulty.get_metric('cycled', method=np.sum, axis=0),
             "degraded_fields":
             100*mdlhist.get_degraded_hist(*mdlhist.nominal.flows.keys())['total']/len(mdlhist.nominal.flows.keys()),
             "faulty_functions":

{fmdtools-2.0.6 → fmdtools-2.0.7}/fmdtools/__init__.py

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