fmdtools 2.0.5__tar.gz → 2.0.7__tar.gz

{fmdtools-2.0.5 → fmdtools-2.0.7}/LICENSE

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

{fmdtools-2.0.5/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.5
+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.5
+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.5
+   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.5}, # <- replace with your version number
+  version = {2.0.7},
   date = {2024-11-13},
 }
 ```

{fmdtools-2.0.5 → 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.5
+   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.5}, # <- replace with your version number
+  version = {2.0.7},
   date = {2024-11-13},
 }
 ```

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

@@ -157,7 +157,7 @@ class ProduceHazard(Function):
 class PassStates(State):
     """Whether or not the hazard is ultimately passed or mitigated."""
 
-    hazards_mitigated:  int = 0
+    hazards_mitigated: int = 0
     hazards_propagated: int = 0
 
 
@@ -185,7 +185,7 @@ class HazardModel(FunctionArchitecture):
         self.add_flow("hazard", Hazard)
         self.add_fxn("produce_hazard", ProduceHazard, 'hazard')
         self.add_fxn("detect_hazard", DetectHazard, 'hazard')
-        self.add_fxn("pass_hazard",  PassHazard, 'hazard')
+        self.add_fxn("pass_hazard", PassHazard, 'hazard')
 
 
 if __name__ == '__main__':
@@ -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.5 → fmdtools-2.0.7}/examples/multiflow_demo/multiflow_demo.py

@@ -66,10 +66,10 @@ class Mover(Function):
         # communicate
         if self.p.x_up != 0.0:
             self.internal_info.s.x = self.loc.s.x
-            self.internal_info.send("all", "local", "x")
+            self.internal_info.send("all", "x")
         elif self.p.y_up != 0.0:
             self.internal_info.s.y = self.loc.s.y
-            self.internal_info.send("all", "local", "y")
+            self.internal_info.send("all", "y")
 
     def find_classification(self, scen, fxnhist):
         return {"last_x": self.loc.s.x, "min_x": fxnhist.faulty.location.get(self.name).x}
@@ -89,8 +89,8 @@ class Coordinator(Function):
 
     def static_behavior(self, time):
         self.coord_view.receive()
-        self.coord_view.update("local", "mover_1", "y")
-        self.coord_view.update("local", "mover_2", "x")
+        self.coord_view.update("y", to_update="local", to_get="mover_1")
+        self.coord_view.update("x", to_update="local", to_get="mover_2")
 
 
 class ExModel(FunctionArchitecture):
@@ -100,7 +100,7 @@ class ExModel(FunctionArchitecture):
     def init_architecture(self, **kwargs):
 
         self.add_flow("communications", Communications)
-        self.add_flow("location",  Location)
+        self.add_flow("location", Location)
         self.add_fxn("mover_1", Mover, "communications", "location", p={"x_up": 1.0})
         self.add_fxn("mover_2", Mover, "communications", "location", p={"y_up": 1.0})
 

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

@@ -86,8 +86,8 @@ class SightGrid(Coords):
     container_p = DroneEnvironmentGridParam
 
     def init_properties(self, *args, **kwargs):
-        """Set target true between 0 and 150 in the x and 10 and 160 in the y."""
-        self.set_range("target", True, 0, 150, 10, 160)
+        """Set target true between 0 and 155 in the x and 10 and 155 in the y."""
+        self.set_range("target", True, 0, 155, 10, 155)
 
 
 class DroneEnvironment(Environment):
@@ -189,12 +189,12 @@ class PlanPathState(State):
 class PlanPathParams(Parameter):
     """Defines flightplan."""
 
-    goals = ((0.0,      0.0,    50.0),
-             (100.0,    0.0,    50.0),
-             (100.0,    100.0,  50.0),
-             (150.0,    150.0,  50.0),
-             (0.0,      0.0,    50.0),
-             (0.0,      0.0,    0.0))
+    goals = ((0.0, 0.0, 50.0),
+             (100.0, 0.0, 50.0),
+             (100.0, 100.0, 50.0),
+             (150.0, 150.0, 50.0),
+             (0.0, 0.0, 50.0),
+             (0.0, 0.0, 0.0))
 
 
 class PlanPathTime(Time):
@@ -391,7 +391,8 @@ class ViewEnvironment(Function):
                                      self.dofs.s.x - width/2,
                                      self.dofs.s.x + width/2,
                                      self.dofs.s.y - height/2,
-                                     self.dofs.s.y + height/2)
+                                     self.dofs.s.y + height/2,
+                                     outside_error=False)
 
 
 class Drone(FunctionArchitecture):
@@ -521,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': {}})
@@ -542,6 +550,7 @@ if __name__ == "__main__":
     from fmdtools.sim.sample import SampleApproach
     from fmdtools.analyze.phases import PhaseMap
     from fmdtools import analyze as an
+    s = SightGrid()
     import doctest
     # doctest.testmod(verbose=True)
     # script_nominal_viewed()

{fmdtools-2.0.5 → 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.5 → fmdtools-2.0.7}/examples/multirotor/drone_mdl_rural.py

@@ -111,7 +111,7 @@ class DroneParam(Parameter, readonly=True):
     phys_param: DronePhysicalParameters
     """
 
-    respolicy:  ResPolicy = ResPolicy()
+    respolicy: ResPolicy = ResPolicy()
     flightplan: tuple = ((0, 0, 0),  # flies through a few points and back to the start
                          (0, 0, 100),
                          (100, 0, 100),
@@ -164,9 +164,9 @@ class BatState(State):
         Power transference with nominal value 1.0
     """
 
-    soc:  float = 100.0
+    soc: float = 100.0
     ee_e: float = 1.0
-    e_t:  float = 1.0
+    e_t: float = 1.0
 
 
 class BatMode(Mode):
@@ -347,7 +347,7 @@ class StoreEEMode(Mode):
     """Overall StoreEE mode."""
 
     failrate = 1e-4
-    fm_args = {'nocharge':  (0.2, 0, {"taxi": 0.6, "move": 0.2, "land": 0.2}),
+    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})}
     units = 'hr'
 
@@ -934,7 +934,7 @@ if __name__ == "__main__":
 
     # run approach - all faults in "move" mode
     mdl = Drone()
-    app = SampleApproach(mdl,  phasemaps=phasemaps)
+    app = SampleApproach(mdl, phasemaps=phasemaps)
     app.add_faultdomain("drone_faults", "all")
     app.add_faultsample("move_scens", "fault_phases", "drone_faults", "move",
                         phasemap='plan_path', args=(3,))

{fmdtools-2.0.5 → fmdtools-2.0.7}/examples/multirotor/drone_mdl_static.py

@@ -351,7 +351,7 @@ class HoldPayloadState(State):
         Force from the ground
     """
 
-    force_gr:   float = 1.0
+    force_gr: float = 1.0
 
 
 class HoldPayload(Function):

{fmdtools-2.0.5 → 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.5 → fmdtools-2.0.7}/examples/multirotor/test_multirotor.py

@@ -94,7 +94,7 @@ class DroneParameterTests(unittest.TestCase):
 mdl = Drone()
 
 sp = SingleFaultScenarioProblem(mdl, ("affect_dof", "rf_propwarp"),
-                                t_start=2.0, track=None)
+                                sim_start=2.0, track=None)
 sp.add_result_objective("f1", "plan_path.t.time", time=15)
 sp.add_result_objective("f2", "dofs.s.x", time=15)
 

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

@@ -599,7 +599,7 @@ def script_fault_degradation_tables(**kwargs):
     """Show fault/degradation tables/plots for a given fault scenario."""
     mdl = Pump(**kwargs, track="all")
     endclass, mdlhist = propagate.one_fault(
-        mdl, 'import_ee', 'no_v', time=29,  staged=True)
+        mdl, 'import_ee', 'no_v', time=29, staged=True)
 
     ks = mdl.get_roles_as_dict("fxn", "flow", flex_prefixes=True)
     deghist = mdlhist.get_degraded_hist(*ks)
@@ -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.5 → fmdtools-2.0.7}/examples/pump/parallelism_methods.py

@@ -30,33 +30,42 @@ def close_pool(pool):
     pool.close()
     pool.terminate()
 
-def delay_test(delays =  [i for i in range(0,100,10)]):
-    """ Delay parameter use-case described in notebook--here we are using pool.map to manually
-    simulate the model several times over parameters we want to run."""
+
+def delay_test(delays=[i for i in range(0, 100, 10)]):
+    """
+    Delay parameter use-case described in notebook.
+
+    Uses pool.map to manually simulate the model several times over parameters we want
+    to run.
+    """
     pool = mp.Pool(4)
     resultslist = pool.map(one_delay_helper, delays)
     close_pool(pool)
     return resultslist
 
+
 def one_delay_helper(delay):
-    """This helper function is used by pool.map to generate output over the given 
-    input delays"""
+    """Generate output over the given input delays."""
     mdl = Pump(p=PumpParam(delay=delay))
     endclasses, mdlhists = propagate.one_fault(mdl, 'export_water', 'block')
     return endclasses
 
-def compare_pools(mdl, app, pools, staged=False, track=False, verbose= True, track_times='all'):
+
+def compare_pools(mdl, app, pools, staged=False, track=False, verbose=True,
+                  track_times='all'):
     """
-    Method to compare the performance of different process pools on a given model/fault sampling approach
+    Compare the performance for given a model and sampling approach.
 
     Parameters
     ----------
     mdl : Model
         fmdtools model
     app : FaultSample
-        SampleApproach of fault scenarios to simulate the model over using propagate.fault_sample
+        SampleApproach of fault scenarios to simulate the model over using
+        propagate.fault_sample
     pools : dict
-        Dictionary of parallel/process pools {'poolname':pool} to compare. Pools must have a map function.
+        Dictionary of parallel/process pools {'poolname':pool} to compare. Pools must
+        have a map function.
     staged : bool, optional
         Whether to use staged execution on the model. The default is False.
     track : str/bool, optional
@@ -67,7 +76,8 @@ def compare_pools(mdl, app, pools, staged=False, track=False, verbose= True, tra
         Defines what times to include in the history. Options are:
             'all'--all simulated times
             ('interval', n)--includes every nth time in the history
-            ('times', [t1, ... tn])--only includes times defined in the vector [t1 ... tn]
+            ('times', [t1, ... tn])--only includes times defined in the vector
+            [t1 ... tn]
 
     Returns
     -------
@@ -114,31 +124,36 @@ def parallel_mc(iters=10):
     close_pool(pool)
     return res
 
+
 def parallel_mc2(iters=10):
-    """run for performance evaluation of model with map function"""
+    """Run to evaluate performance of model with map function."""
     pool = mp.Pool(4)
     models = [Pump() for i in range(iters)]
     result_list = pool.map(propagate.nominal, models)
     close_pool(pool)
     return result_list
 
+
 def one_fault_helper(args):
-    """Helper function for parallel_mc3 to run in pool.map"""
+    """Helper function for parallel_mc3 to run in pool.map."""
     mdl = Pump()
     endclasses, mdlhists = propagate.one_fault(mdl, args[0], args[1])
     return endclasses, mdlhists
 
+
 def parallel_mc3():
-    """run for performance evaluation of model single fault simulation"""
+    """Run for performance evaluation of model single fault simulation."""
     pool = mp.Pool(4)
     mdl = Pump()
-    inputlist = [(fxn,fm) for fxn in mdl.fxns for fm in mdl.fxns[fxn].faultmodes.keys()]
+    inputlist = [(fxn, fm) for fxn in mdl.fxns
+                 for fm in mdl.fxns[fxn].m.faultmodes.keys()]
     resultslist = pool.map(one_fault_helper, inputlist)
     close_pool(pool)
     return resultslist
 
+
 def instantiate_pools(cores, with_pathos=False):
-    """Used to instantiate multiprocessing pools for comparison"""
+    """Instantiate multiprocessing pools for comparison."""
     if with_pathos:
         from pathos.pools import ParallelPool, ProcessPool, SerialPool, ThreadPool
         return {'multiprocessing': mp.Pool(cores),
@@ -150,14 +165,18 @@ def instantiate_pools(cores, with_pathos=False):
         return {'multiprocessing': mp.Pool(cores),
                 'multiprocess': ms.Pool(cores)}
 
+
 def terminate_pools(pools):
     """End pools after comparing them."""
     for pool in pools.values():
         pool.terminate()
 
 
-if __name__=='__main__':
-    mdl=Pump(sp = dict(phases=(('start',0,4),('on',5, 49),('end',50,500)), end_time=500))
+if __name__ == '__main__':
+    mdl = Pump(sp=dict(phases=(('start', 0, 4),
+                               ('on', 5, 49),
+                               ('end', 50, 500)),
+                       end_time=500))
     from fmdtools.sim.sample import FaultDomain, FaultSample
     fd = FaultDomain(mdl)
     fd.add_all()

{fmdtools-2.0.5 → fmdtools-2.0.7}/examples/pump/pump_stochastic.py

@@ -19,7 +19,7 @@ CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
 
-from examples.pump.ex_pump  import MoveWat as DetMoveWat
+from examples.pump.ex_pump import MoveWat as DetMoveWat
 from examples.pump.ex_pump import ImportWater, ExportWater
 from examples.pump.ex_pump import ImportEE as DetImportEE
 from examples.pump.ex_pump import ImportSig as DetImportSig
@@ -214,13 +214,13 @@ if __name__ == "__main__":
         #    print(fxn.return_probdens())
         #    print(getattr(fxn, 'pds', None))
 
-    endresults,  mdlhist = propagate.one_fault(mdl, 'export_water', 'block',
-                                               time=20, staged=False, run_stochastic=False,
-                                               new_params={'modelparams': {'seed': 50}})
+    endresults, mdlhist = propagate.one_fault(mdl, 'export_water', 'block',
+                                              time=20, staged=False, run_stochastic=False,
+                                              new_params={'modelparams': {'seed': 50}})
 
-    endresults,  mdlhist = propagate.one_fault(mdl, 'export_water', 'block',
-                                               time=20, staged=False, run_stochastic=True,
-                                               new_params={'modelparams': {'seed': 50}})
+    endresults, mdlhist = propagate.one_fault(mdl, 'export_water', 'block',
+                                              time=20, staged=False, run_stochastic=True,
+                                              new_params={'modelparams': {'seed': 50}})
 
     # mdlhist['faulty']['functions']['ImportEE']['probdens']
 

{fmdtools-2.0.5 → 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):
@@ -67,10 +67,10 @@ class StochasticPumpTests(unittest.TestCase, CommonTests):
             res_1, hist_1 = prop.nominal(mdl, run_stochastic=True, showprogress=False)
             res_f1, hist_f1 = prop.single_faults(mdl, run_stochastic=True,
                                                  showprogress=False)
-            if seed == None:
+            if seed is None:
                 seed = mdl.r.seed
             mdl2 = Pump(r={'seed': seed})
-            res_2,  hist_2 = prop.nominal(mdl2, run_stochastic=True, showprogress=False)
+            res_2, hist_2 = prop.nominal(mdl2, run_stochastic=True, showprogress=False)
             res_f2, hist_f2 = prop.single_faults(mdl2, run_stochastic=True,
                                                  showprogress=False)
             self.assertTrue(all(hist_1.fxns.move_water.s.eff ==
@@ -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.5 → fmdtools-2.0.7}/examples/rover/rover_model.py

@@ -489,7 +489,7 @@ class PlanPathState(State):
 
     u_self: np.array = np.array([0.0, 0.0])
     u_lin: np.array = np.array([0.0, 0.0])
-    u_lin_dev:  np.array = np.array([0.0, 0.0])
+    u_lin_dev: np.array = np.array([0.0, 0.0])
     rdiff: float = 0.0
     vel_adj: float = 1.0
 
@@ -647,7 +647,7 @@ class DriveMode(Mode):
                 self.init_n_faultstates(franges, phases=ph)
             if "range" in self.mode_args:
                 franges = {"friction": {*np.linspace(0.0, 20, 10)},
-                           "transfer":  {*np.linspace(1.0, 0.0, 10)},
+                           "transfer": {*np.linspace(1.0, 0.0, 10)},
                            "drift": {*np.linspace(-0.5, 0.5, 10)}}
                 if "all" in self.mode_args:
                     self.init_n_faultstates(franges, phases=ph, n="all")
@@ -668,7 +668,7 @@ class DriveMode(Mode):
 
     def add_n_modes(self, ph):
         franges = {"friction": {*np.linspace(0.0, 20, 10)},
-                   "transfer":  {*np.linspace(1.0, 0.0, 10)},
+                   "transfer": {*np.linspace(1.0, 0.0, 10)},
                    "drift": {*np.linspace(-0.5, 0.5, 10)}}
         self.init_n_faultstates(franges, n=self.mode_args, phases=ph)
 

{fmdtools-2.0.5 → fmdtools-2.0.7}/examples/tank/tank_model.py

@@ -149,8 +149,8 @@ class GuideLiquidOut(GuideLiquid):
 
 
 class StoreLiquidState(State):
-    level:      float = 10.0
-    net_flow:   float = 0.0
+    level: float = 10.0
+    net_flow: float = 0.0
 
 
 class StoreLiquidMode(Mode):
@@ -419,11 +419,15 @@ if __name__ == '__main__':
     import fmdtools.sim.propagate as propagate
     from fmdtools.sim.sample import FaultDomain, FaultSample
 
-    mdl = Tank()
+    mdl = Tank(track='all')
 
     endclass, mdlhist = propagate.one_fault(mdl, 'human', 'look_not_visible', time=2,
                                             staged=True)
 
+    from fmdtools.define.architecture.function import FunctionArchitectureGraph
+    mg = FunctionArchitectureGraph(mdl)
+    fig, ax = mg.draw_from(10, mdlhist)
+
     # nominal run
     endresults, mdlhist = propagate.nominal(mdl, desired_result=['endclass', 'graph'])
     mdlhist.plot_line("fxns.store_water.s.level")

{fmdtools-2.0.5 → fmdtools-2.0.7}/examples/taxiway/asset.py

@@ -25,7 +25,7 @@ CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
 
-from common import  default_air_loc, AssetParams, Location, Requests, Environment
+from common import AssetParams, Location, Requests, Environment
 
 from fmdtools.define.container.state import State
 from fmdtools.define.container.mode import Mode
@@ -33,7 +33,6 @@ from fmdtools.define.container.time import Time
 from fmdtools.define.block.function import Function
 
 from shapely.geometry import Point, Polygon
-from shapely.ops import nearest_points
 import numpy as np
 
 
@@ -73,7 +72,7 @@ class Asset(Function):
             self.perc_requests.s.put(asset_req="land")
         atc_requests.s.assign(self.perc_requests.s, as_copy=True)
 
-        self.perc_requests.update("atc", "local", "asset_req")
+        self.perc_requests.update("asset_req", to_update="atc", to_get="local",)
 
         self.perc_location = self.location.create_local("percieved", s=self.location.s)
 
@@ -189,7 +188,7 @@ class Asset(Function):
             self.perc_requests.s.put(asset_req="none")
     def send_perception(self):
         self.perc_location.s.assign(self.location.s)
-        self.perc_requests.send('atc', 'local', 'asset_req')
+        self.perc_requests.send('atc', 'asset_req')
     def determine_visioncov(self, xd, yd):
         """
         Creates the polygon corresponding to the asset's vision cone.
@@ -265,7 +264,7 @@ class Asset(Function):
                     colassets[i] = local_pos.distance(assetpos)
         if len(colassets) > 0:
             asset = min(colassets, key=colassets.get)
-            assetloc = getattr(self.location.glob,  asset)
+            assetloc = getattr(self.location.glob, asset)
             distance = colassets[asset]
         if in_vision and assetloc:
             self.closest_location.s.assign(assetloc.s)

{fmdtools-2.0.5 → 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]: