fmdtools 2.3.3__tar.gz → 2.4.0__tar.gz

{fmdtools-2.3.3 → fmdtools-2.4.0}/LICENSE

@@ -1,4 +1,4 @@
-fmdtools version 2.3.3
+fmdtools version 2.4.0
 ---------------------------
                                  Apache License
                            Version 2.0, January 2004

{fmdtools-2.3.3 → fmdtools-2.4.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: fmdtools
-Version: 2.3.3
+Version: 2.4.0
 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.3.3
+License: fmdtools version 2.4.0
         ---------------------------
                                          Apache License
                                    Version 2.0, January 2004
@@ -236,13 +236,13 @@ Project-URL: Documentation, https://nasa.github.io/fmdtools/
 Project-URL: source-code, https://github.com/nasa/fmdtools
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Science/Research
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: >=3.11
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: scipy
@@ -273,15 +273,15 @@ Dynamic: license-file
 
 # Overview
 
-![Python Version](https://img.shields.io/badge/Python-3.13-blue)
+![Python Version](https://img.shields.io/badge/Python-3.14-blue)
 [![PyPI](https://img.shields.io/pypi/v/fmdtools)](https://pypi.org/project/fmdtools/)
 [![Total Downloads](https://static.pepy.tech/badge/fmdtools)](https://pepy.tech/project/fmdtools)
 [![Downloads/Month](https://static.pepy.tech/badge/fmdtools/month)](https://pepy.tech/project/fmdtools)
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/nasa/fmdtools?label=GitHub%20Release)](https://github.com/nasa/fmdtools/releases)
 [![GitHub Tag](https://img.shields.io/github/v/tag/nasa/fmdtools)](https://github.com/nasa/fmdtools/tags)
 [![CodeFactor](https://www.codefactor.io/repository/github/nasa/fmdtools/badge)](https://www.codefactor.io/repository/github/nasa/fmdtools)
-[![Tests Status](./tests/reports/full-py313/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/full-py313/junit/report.html)
-[![Tests Coverage](./tests/reports/full-py313/coverage-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/full-py313/coverage_html/index.html)
+[![Tests Status](./tests/reports/full-py314/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/full-py314/junit/report.html)
+[![Tests Coverage](./tests/reports/full-py314/coverage-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/full-py314/coverage_html/index.html)
 [![GitHub License](https://img.shields.io/badge/License-Apache%202.0-green)](https://github.com/nasa/fmdtools/blob/main/LICENSE)
 [![NASA Software Classification](https://img.shields.io/badge/Software_Class-E-blue)](https://nodis3.gsfc.nasa.gov/displayDir.cfm?Internal_ID=N_PR_7150_002D_&page_name=AppendixD)
 
@@ -326,15 +326,16 @@ The fmdtools documentation repository is also home to the Functional Reasoning D
 
 ### Python version compatibility
 
-The fmdtools library is developed in Python 3.13 but is tested to maintain compatibility over three versions of Python. See current doctest reports below:
+The fmdtools library is developed in Python 3.14 but is tested to maintain compatibility over three versions of Python. See current doctest reports below:
 
 | Python Version    | Doctests |
 | -------- | ------- |
-| 3.11  | [![Python 3.11 Tests](./tests/reports/doctests-py311/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/doctests-py311/junit/report.html)   |
-| 3.12 | [![Python 3.12 Tests](./tests/reports/doctests-py312/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/doctests-py312/junit/report.html)    |
-| 3.13    | [![Python 3.13 Tests](./tests/reports/doctests-py313/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/doctests-py313/junit/report.html)   |
+| 3.12 | [![Python 3.12 Tests](./tests/reports/doctests-py312/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/doctests-py312/junit/report.html)   |
+| 3.13 | [![Python 3.13 Tests](./tests/reports/doctests-py313/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/doctests-py313/junit/report.html)    |
+| 3.14 | [![Python 3.14 Tests](./tests/reports/doctests-py314/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/doctests-py314/junit/report.html)   |
 
-Further (functional and integration) tests are performed in the Python 3.13 to ensure that examples run as desired. Thus, it is generally recommended to use Python 3.13 with this version to keep pace with development, especially when running examples.
+Further (functional and integration) tests are performed in the Python 3.14 to ensure that examples run as desired. Thus, it is generally recommended to use Python 3.14
+ with this version to keep pace with development, especially when running examples.
 
 ### Set up python tooling environment
 
@@ -342,11 +343,13 @@ The fmdtools library was developed to run in a python development environments.
 
 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](https://docs.astral.sh/uv/).
 
-After the base installation, set up a new `Python 3.13` environment for fmdtools and install these external external packages in it:
+From there, it can be helpful to install an IDE like [VSCode](https://code.visualstudio.com/) or [Spyder](https://www.spyder-ide.org/).
+
+After the base installation, set up a new `Python 3.14` environment for fmdtools and install these external external packages in it, making sure to configure them correctly with your IDE of choice:
 
 ```
 spyder-kernels
-# used for: working with external IDEs
+# used for: working with external IDEs - make sure to use the version Spyder asks for 
 # license: ()
 # install from: (comes with anaconda) or `uv pip install spyder-kernels`
 jupyter notebook
@@ -359,7 +362,6 @@ 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.
 
@@ -392,13 +394,13 @@ More guidance on development installations is provided in [How to Contribute](ht
 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`` in the context of a development install you can checkout the tag corresponding to the version you want, e.g.:
 
 ```
-   git checkout v2.3.3
+   git checkout v2.4.0
 ```
 
 
 #### Dependencies
 
-fmdtools requires `Python 3.13` and depends directly on the packages below (see requirements.txt). Note that the use of these dependencies is governed by their respective licenses, which may be obtained at the provided links.
+fmdtools requires `Python 3.14` and depends directly on the packages below (see pyproject.toml). Note that the use of these dependencies is governed by their respective licenses, which may be obtained at the provided links.
 
 ```
 scipy
@@ -529,8 +531,8 @@ To cite a particular version of the fmdtools, you may use:
   author = {{NASA}},
   title = {fmdtools},
   url = {https://github.com/nasa/fmdtools},
-  version = {2.3.3},
-  date = {2025-4-10},
+  version = {2.4.0},
+  date = {2026-5-29},
 }
 ```
 

{fmdtools-2.3.3 → fmdtools-2.4.0}/README.md

@@ -2,15 +2,15 @@
 
 # Overview
 
-![Python Version](https://img.shields.io/badge/Python-3.13-blue)
+![Python Version](https://img.shields.io/badge/Python-3.14-blue)
 [![PyPI](https://img.shields.io/pypi/v/fmdtools)](https://pypi.org/project/fmdtools/)
 [![Total Downloads](https://static.pepy.tech/badge/fmdtools)](https://pepy.tech/project/fmdtools)
 [![Downloads/Month](https://static.pepy.tech/badge/fmdtools/month)](https://pepy.tech/project/fmdtools)
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/nasa/fmdtools?label=GitHub%20Release)](https://github.com/nasa/fmdtools/releases)
 [![GitHub Tag](https://img.shields.io/github/v/tag/nasa/fmdtools)](https://github.com/nasa/fmdtools/tags)
 [![CodeFactor](https://www.codefactor.io/repository/github/nasa/fmdtools/badge)](https://www.codefactor.io/repository/github/nasa/fmdtools)
-[![Tests Status](./tests/reports/full-py313/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/full-py313/junit/report.html)
-[![Tests Coverage](./tests/reports/full-py313/coverage-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/full-py313/coverage_html/index.html)
+[![Tests Status](./tests/reports/full-py314/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/full-py314/junit/report.html)
+[![Tests Coverage](./tests/reports/full-py314/coverage-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/full-py314/coverage_html/index.html)
 [![GitHub License](https://img.shields.io/badge/License-Apache%202.0-green)](https://github.com/nasa/fmdtools/blob/main/LICENSE)
 [![NASA Software Classification](https://img.shields.io/badge/Software_Class-E-blue)](https://nodis3.gsfc.nasa.gov/displayDir.cfm?Internal_ID=N_PR_7150_002D_&page_name=AppendixD)
 
@@ -55,15 +55,16 @@ The fmdtools documentation repository is also home to the Functional Reasoning D
 
 ### Python version compatibility
 
-The fmdtools library is developed in Python 3.13 but is tested to maintain compatibility over three versions of Python. See current doctest reports below:
+The fmdtools library is developed in Python 3.14 but is tested to maintain compatibility over three versions of Python. See current doctest reports below:
 
 | Python Version    | Doctests |
 | -------- | ------- |
-| 3.11  | [![Python 3.11 Tests](./tests/reports/doctests-py311/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/doctests-py311/junit/report.html)   |
-| 3.12 | [![Python 3.12 Tests](./tests/reports/doctests-py312/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/doctests-py312/junit/report.html)    |
-| 3.13    | [![Python 3.13 Tests](./tests/reports/doctests-py313/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/doctests-py313/junit/report.html)   |
+| 3.12 | [![Python 3.12 Tests](./tests/reports/doctests-py312/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/doctests-py312/junit/report.html)   |
+| 3.13 | [![Python 3.13 Tests](./tests/reports/doctests-py313/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/doctests-py313/junit/report.html)    |
+| 3.14 | [![Python 3.14 Tests](./tests/reports/doctests-py314/tests-badge.svg)](https://htmlpreview.github.io/?https://github.com/nasa/fmdtools/blob/main/tests/reports/doctests-py314/junit/report.html)   |
 
-Further (functional and integration) tests are performed in the Python 3.13 to ensure that examples run as desired. Thus, it is generally recommended to use Python 3.13 with this version to keep pace with development, especially when running examples.
+Further (functional and integration) tests are performed in the Python 3.14 to ensure that examples run as desired. Thus, it is generally recommended to use Python 3.14
+ with this version to keep pace with development, especially when running examples.
 
 ### Set up python tooling environment
 
@@ -71,11 +72,13 @@ The fmdtools library was developed to run in a python development environments.
 
 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](https://docs.astral.sh/uv/).
 
-After the base installation, set up a new `Python 3.13` environment for fmdtools and install these external external packages in it:
+From there, it can be helpful to install an IDE like [VSCode](https://code.visualstudio.com/) or [Spyder](https://www.spyder-ide.org/).
+
+After the base installation, set up a new `Python 3.14` environment for fmdtools and install these external external packages in it, making sure to configure them correctly with your IDE of choice:
 
 ```
 spyder-kernels
-# used for: working with external IDEs
+# used for: working with external IDEs - make sure to use the version Spyder asks for 
 # license: ()
 # install from: (comes with anaconda) or `uv pip install spyder-kernels`
 jupyter notebook
@@ -88,7 +91,6 @@ 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.
 
@@ -121,13 +123,13 @@ More guidance on development installations is provided in [How to Contribute](ht
 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`` in the context of a development install you can checkout the tag corresponding to the version you want, e.g.:
 
 ```
-   git checkout v2.3.3
+   git checkout v2.4.0
 ```
 
 
 #### Dependencies
 
-fmdtools requires `Python 3.13` and depends directly on the packages below (see requirements.txt). Note that the use of these dependencies is governed by their respective licenses, which may be obtained at the provided links.
+fmdtools requires `Python 3.14` and depends directly on the packages below (see pyproject.toml). Note that the use of these dependencies is governed by their respective licenses, which may be obtained at the provided links.
 
 ```
 scipy
@@ -258,8 +260,8 @@ To cite a particular version of the fmdtools, you may use:
   author = {{NASA}},
   title = {fmdtools},
   url = {https://github.com/nasa/fmdtools},
-  version = {2.3.3},
-  date = {2025-4-10},
+  version = {2.4.0},
+  date = {2026-5-29},
 }
 ```
 

{fmdtools-2.3.3 → fmdtools-2.4.0}/examples/airport_taxiway/model_asset.py

@@ -72,7 +72,10 @@ 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("asset_req", to_update="atc", to_get="local",)
+        try:
+            self.perc_requests.update("asset_req", to_update="atc", to_get="local",)
+        except:
+            pass
 
         self.perc_location = self.location.create_local("percieved", s=self.location.s)
 

{fmdtools-2.3.3 → fmdtools-2.4.0}/examples/airport_taxiway/model_main.py

@@ -131,6 +131,8 @@ if __name__ == "__main__":
     from fmdtools.define.flow.commsflow import CommsFlowGraph
 
     mdl = taxiway_model()
+    # mdl.flows['requests'].copy()
+    mdl.copy()
 
 
     endresults, mdlhist = prop.one_fault(mdl, "ma3", "lost_sight",

{fmdtools-2.3.3 → fmdtools-2.4.0}/examples/airspacelib/contingency_management/model_aircraft.py

@@ -201,13 +201,13 @@ class ContingencyAviate(Aviate):
             if dist <= 0.1:
                 self.m.add_fault('crash')
                 self.m.set_mode('falling')
-                self.environment.ga.points['self'].s.buffer_speed = 0.0
-                self.environment.ga.points[name].s.buffer_speed = 0.0
+                self.environment.ga.geoms['self'].s.buffer_speed = 0.0
+                self.environment.ga.geoms[name].s.buffer_speed = 0.0
         super().static_behavior()
 
     def dynamic_behavior(self):
         super().dynamic_behavior()
-        self.environment.ga.points['self'].s.assign(self.trajectories.s, 'x', 'y', 'z')
+        self.environment.ga.geoms['self'].s.assign(self.trajectories.s, 'x', 'y', 'z')
 
 
 
@@ -479,7 +479,7 @@ def plot_flightpath(mdl={}, history={}, fig={}, ax={}, with_plans=True, with_loc
         else:
             bhist = history
         geoms = dict()
-        for pt in mdl.flows['environment'].ga.points:
+        for pt in mdl.flows['environment'].ga.geoms:
             if pt == 'self':
                 geoms[pt] = {'shapes': {'envelope': {'color': 'blue'}}}
             else:
@@ -625,9 +625,9 @@ if __name__ == "__main__":
     #                                  'trajectories.s.z',
     #                                  time_groups='nominal', time_ticks=2.0, fig=fig, ax=ax)
 
-    # fig, ax = hist.plot_trajectories('environment.ga.points.uav.s.x',
-    #                                  'environment.ga.points.uav.s.y',
-    #                                  'environment.ga.points.uav.s.z',
+    # fig, ax = hist.plot_trajectories('environment.ga.geoms.uav.s.x',
+    #                                  'environment.ga.geoms.uav.s.y',
+    #                                  'environment.ga.geoms.uav.s.z',
     #                                  time_groups='nominal', time_ticks=2.0, fig=fig, ax=ax)
 
 

{fmdtools-2.3.3 → fmdtools-2.4.0}/examples/airspacelib/contingency_management/model_environment.py

@@ -21,7 +21,7 @@ from fmdtools_examples.airspacelib.base.state import AircraftPosition3
 
 from fmdtools.define.object.coords import Coords, CoordsParam
 from fmdtools.define.architecture.geom import GeomArchitecture
-from fmdtools.define.object.geom import GeomPoint, PointParam
+from fmdtools.define.object.geom import GeomPoint, GeomParameter
 from fmdtools.define.block.function import Function
 
 from shapely import distance
@@ -141,7 +141,7 @@ class ThreatState(AircraftPosition3):
         self.buffer_speed = self.get_vel()
 
 
-class ThreatParam(PointParam):
+class ThreatParam(GeomParameter):
     """
     Parameter defining the exteral threat shape.
 
@@ -167,6 +167,9 @@ class Threat(GeomPoint):
         """Update position given known speed."""
         self.s.update_position(self.s.buffer_speed)
 
+    def get_shapely_args(self):
+        return (self.s.x, self.s.y)
+
 
 class ContingencyThreats(GeomArchitecture):
     """Overall environment-defining geometries of the drone and external threats."""
@@ -175,40 +178,40 @@ class ContingencyThreats(GeomArchitecture):
 
     def init_architecture(self, **kwargs):
         """Initialize drone and intruders given 'intruders' options."""
-        self.add_point('self', Threat)
+        self.add_geom('self', Threat)
         if self.p.intruders == "across":
             s = {'buffer_speed': 3.3, 'x': 100, 'y': 0.0, 'z': 25.0,
                  'goal_x': 0.0, 'goal_y': 100.0, 'goal_z': 25.0}
-            self.add_point("uav", Threat, s=s)
+            self.add_geom("uav", Threat, s=s)
         elif self.p.intruders == "middle":
             s = {'buffer_speed': 0.0, 'x': 60, 'y': 60, 'z': 25.0,
                  'goal_x': 60.0, 'goal_y': 60.0, 'goal_z': 25.0}
-            self.add_point("uav", Threat, s=s)
+            self.add_geom("uav", Threat, s=s)
         elif self.p.intruders == "down":
             s = {'buffer_speed': 2.5,
                  'x': 60, 'y': 120, 'z': 25.0,
                  'goal_x': 60.0, 'goal_y': 0.0, 'goal_z': 25.0}
-            self.add_point("uav", Threat, s=s)
+            self.add_geom("uav", Threat, s=s)
         elif self.p.intruders == "down-over":
             s = {'buffer_speed': 2.5,
                  'x': 40, 'y': 120, 'z': 25.0,
                  'goal_x': 40.0, 'goal_y': 0.0, 'goal_z': 25.0}
-            self.add_point("uav", Threat, s=s)
+            self.add_geom("uav", Threat, s=s)
         elif self.p.intruders:
             raise Exception("Invalid option for intruders: "+self.p.intruders)
             
 
     def update_positions(self):
         """Update positions of the threats."""
-        for threatname, threat in self.points.items():
+        for threatname, threat in self.geoms.items():
             if threatname != 'self':
                 threat.update_position()
 
     def calc_dist_to_threats(self, self_shape='envelope', threat_shape='safety'):
         """Calculate distancses b/t self_shape for self and threat_shape for threats."""
         dists = {}
-        self_envelope = self.points['self'].get_shape(self_shape)
-        for threatname, threat in self.points.items():
+        self_envelope = self.geoms['self'].get_shape(self_shape)
+        for threatname, threat in self.geoms.items():
             if threatname != 'self':
                 threat_envelope = threat.get_shape(threat_shape)
                 dists[threatname] = distance(self_envelope, threat_envelope)
@@ -270,5 +273,5 @@ if __name__ == "__main__":
     from fmdtools.sim import propagate
     res, hist = propagate.nominal(cc)
 
-    hist.plot_trajectories('environment.ga.points.uav.s.x',
-                           'environment.ga.points.uav.s.y')
+    hist.plot_trajectories('environment.ga.geoms.uav.s.x',
+                           'environment.ga.geoms.uav.s.y')

{fmdtools-2.3.3 → fmdtools-2.4.0}/examples/airspacelib/contingency_management/model_flightplanner.py

@@ -73,7 +73,7 @@ class DroneFlightGrid(Coords):
     >>> from fmdtools_examples.airspacelib.contingency_management.model_environment import ContingencyEnvironment
     >>> env = ContingencyEnvironment()
     >>> param = DroneFlightGridParam(x_size=120, y_size=120, blocksize=1.0)
-    >>> grid = DroneFlightGrid(env, p=param)
+    >>> grid = DroneFlightGrid(env=env, p=param)
     >>> start = (10.0, 10.0)
     >>> goal = (100.0, 100.0)
     >>> path = grid.a_star_worldcoords(start_xy=start, goal_xy=goal,
@@ -98,10 +98,14 @@ class DroneFlightGrid(Coords):
     state_grid_costs: tuple = (float, 0.0)
     state_fuel_costs: tuple = (dict, None)
     state_edge_weights: tuple = (dict, None)
+    attrs = Coords.attrs + ('env',)
 
     def init_properties(self, env={}, **kwargs):
-        self.env_coords = env.c
-        self.env = env
+        if env:
+            self.env_coords = env.c
+            self.env = env
+        else:
+            raise Exception("No env provided")
         for i in range(self.p.y_size):
             for j in range(self.p.x_size):
                 self.fuel_costs[i, j] = {}
@@ -171,10 +175,10 @@ class DroneFlightGrid(Coords):
         unsafe_points = set()
         if obstacle:
             try:
-                uav_geom = self.env.ga.geoms()['uav']
+                uav_geom = self.env.ga.geoms['uav']
             except (AttributeError, KeyError):
                 print("No such UAV geometry architecture exists")
-            uav_geom = self.env.ga.geoms()['uav']
+            uav_geom = self.env.ga.geoms['uav']
             coarse_block = self.env.c.p.blocksize
             fine_block = self.p.blocksize
             coarse_unsafe_pts = [pt for pt in self.env_coords.pts if uav_geom.at(pt, 'safety')]
@@ -451,7 +455,8 @@ if __name__ == "__main__":
     import numpy as np
     env = ContingencyEnvironment()
     param = DroneFlightGridParam(x_size=120/2.5, y_size=120/2.5, blocksize=2.5, max_cost=np.inf)
-    grid = DroneFlightGrid(env, p=param)
+    grid = DroneFlightGrid(env=env, p=param)
+    grid.copy()
     start = (45.0, 72.5)
     goal = (50.0, 60.0)
     path = grid.a_star_worldcoords(start_xy=start, goal_xy=goal, max_distance=5,
@@ -459,5 +464,5 @@ if __name__ == "__main__":
                                    restricted_cost=100.0, fuel_rate= 20, obstacle=True) # *25000.0/25
     print(path)
 
-    # import doctest
-    # doctest.testmod(verbose=True)
+    import doctest
+    doctest.testmod(verbose=True)

{fmdtools-2.3.3 → fmdtools-2.4.0}/examples/cooling_tank/model_main.py

@@ -212,11 +212,11 @@ class HumanASG(ActionArchitecture):
 
         self.add_act('look', Look)
         self.add_act('detect', Detect, 'detect_sig', 'tank_sig',
-                     duration=self.p.reacttime)
+                     t={'duration': self.p.reacttime})
         self.add_act('reach', Reach)
         self.add_act('grasp', Grasp)
         self.add_act('turn', Turn, 'detect_sig',
-                     'valve1_sig', 'valve2_sig', duration=1.0)
+                     'valve1_sig', 'valve2_sig', t={'duration': 1.0})
 
         self.add_cond('look', 'detect', 'looked', condition=self.acts['look'].looked)
         self.add_cond('detect', 'reach', 'detected',

{fmdtools-2.3.3 → fmdtools-2.4.0}/examples/cooling_tank/test_tank.py

@@ -262,6 +262,7 @@ if __name__ == '__main__':
     # runner.run(suite)
 
     # suite = unittest.TestSuite()
+    # suite.addTest(TankTests("test_model_copy_same"))
     # suite.addTest(TankTests("test_approach_parallelism_notrack"))
     # suite.addTest(TankTests("test_approach_parallelism_0"))
     # suite.addTest(TankTests("test_approach_parallelism_1"))

{fmdtools-2.3.3 → fmdtools-2.4.0}/examples/multirotor_drone/model_hierarchical.py

@@ -337,6 +337,12 @@ class Drone(DynDrone):
 
 
 if __name__ == "__main__":
+    ad = AffectDOFArch()
+    ad.copy()
+
+    hierarchical_model = Drone(p=DroneParam(arch='quad'))
+    hierarchical_model.asdict(withflex=False, as_copy=True)
+    hierarchical_model.copy()
     lap = LineArchParam()
     lap = LineArchParam(archtype='quad')
 

{fmdtools-2.3.3 → fmdtools-2.4.0}/examples/multirotor_drone/model_rural.py

@@ -358,11 +358,11 @@ class BatArch(ComponentArchitecture):
         elif self.p.archtype == 'series-split':
             ee_provided = np.max(list(ees.values()))
         elif self.p.archtype == 'parallel-split':
-            ee_provided = np.sum(list(ees.values()))
+            ee_provided = np.mean(list(ees.values()))
         elif self.p.archtype == 'split-both':
             e = list(ees.values())
             e.sort()
-            ee_provided = e[-1]+e[-2]
+            ee_provided = (e[-1]+e[-2])/2
         self.flows['ee_1'].s.effort = ee_provided
 
 

{fmdtools-2.3.3 → fmdtools-2.4.0}/examples/multirotor_drone/model_urban.py

@@ -535,7 +535,7 @@ if __name__ == "__main__":
                                                mdl_kwargs = {'sp':{'dt':1.0}})
     plot_env_with_traj_z(hists, mdl)
     plot_env_with_traj(hists, mdl)
-    statsfmea = an.tabulate.FMEA(endresults, app, group_by=('function', 'fault'),
+    statsfmea = an.tabulate.FMEA(endresults, app, group_by=('obj', 'fault'),
                                  average_metric=['rate', 'unsafe_flight_time', 'cost',
                                                   'repcost', 'landcost', 'body_strikes',
                                               'head_strikes', 'property_restrictions'],
@@ -544,7 +544,7 @@ if __name__ == "__main__":
     statsfmea.as_table()
     import matplotlib.colors as mcolors
     statsfmea.as_plots("average_repcost", "average_unsafe_flight_time", "average_cost", "average_rate",
-                       color_factor="function", suppress_ticklabels=True,
+                       color_factor="obj", suppress_ticklabels=True,
                        legend_loc=2, pallette=[*mcolors.XKCD_COLORS])
 
 

{fmdtools-2.3.3 → fmdtools-2.4.0}/examples/multirotor_drone/script_opt_model_rural.py

@@ -200,4 +200,7 @@ def x_to_rcost(xdes, xoper, xres, loc='rural', fullcosts=False, faultmodes='all'
 
 
 if __name__ == "__main__":
+    import multiprocessing as mp
+    # x_to_rcost([1, 1], [40], [2, 2])
+    x_to_rcost([2, 2], [40], [2, 2], pool=mp.Pool(5))
     pass

{fmdtools-2.3.3 → fmdtools-2.4.0}/examples/navigating_rover/model_main.py

@@ -45,7 +45,7 @@ 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
-from fmdtools.define.object.geom import PointParam, GeomPoint, LineParam, GeomLine
+from fmdtools.define.object.geom import GeomParameter, GeomPoint, GeomLine
 from fmdtools.define.architecture.geom import GeomArchitecture
 from fmdtools.define.environment import Environment
 import fmdtools.sim.propagate as prop
@@ -165,7 +165,7 @@ class ResCorrection(Parameter):
     cor_t: np.float64 = 0.0
     cor_f: np.float64 = 0.0
 
-class DestParam(PointParam):
+class DestParam(GeomParameter):
     """
     Parameter defining start and end points.
 
@@ -173,8 +173,7 @@ class DestParam(PointParam):
     the location.
     """
 
-    x: np.float64 = 0.0
-    y: np.float64 = 0.0
+    coordinates: tuple = (0.0, 0.0)
     buffer_on: np.float64 = 1.0
     buffer_near: np.float64 = 2.0
 
@@ -184,10 +183,10 @@ def sin_func(x, amp, period):
     return amp * np.sin(x * 2 * np.pi / period)
 
 
-class PathParam(LineParam):
+class PathParam(GeomParameter):
     """Parameter defining the path."""
 
-    xys: tuple = tuple([[x, sin_func(x, 1, 1)] for x in np.arange(0, 100, 1)])
+    coordinates: tuple = tuple(([[x, sin_func(x, 1, 1)] for x in np.arange(0, 100, 1)]),)
     buffer_on: np.float64 = 0.2
     buffer_poor: np.float64 = 0.3
     buffer_near: np.float64 = 0.4
@@ -239,14 +238,14 @@ class GroundGeomArch(GeomArchitecture):
     def init_architecture(self, **kwargs):
         """Initialize geometry with line and start/end points."""
         ls = self.p.gen_ls()
-        self.add_line('line', PathLine, p={'xys': ls,
+        self.add_geom('line', PathLine, p={'coordinates': (ls,),
                                            'buffer_on': self.p.path_buffer_on,
                                            'buffer_poor': self.p.path_buffer_poor,
                                            'buffer_near': self.p.path_buffer_near})
-        self.add_point('start', Dest, p={'x': ls[0][0], 'y': ls[0][1],
+        self.add_geom('start', Dest, p={'coordinates': ls[0],
                                          'buffer_on': self.p.dest_buffer_on,
                                          'buffer_near': self.p.dest_buffer_near})
-        self.add_point('end', Dest, p={'x': ls[-1][0], 'y': ls[-1][1],
+        self.add_geom('end', Dest, p={'coordinates': ls[-1],
                                        'buffer_on': self.p.dest_buffer_on,
                                        'buffer_near': self.p.dest_buffer_near})
 
@@ -266,15 +265,15 @@ class Ground(Environment):
 
     def on_course(self, pos_state):
         """Check if the rover is on_course (i.e., within the 'on' buffer)."""
-        return self.ga.lines['line'].at(pos_state.get('x', 'y'), 'on')
+        return self.ga.geoms['line'].at(pos_state.get('x', 'y'), 'on')
 
     def at_end(self, pos_state):
         """Check if the rover is at the end point, accounting for the 'on' buffer)."""
-        return self.ga.points['end'].at(pos_state.get("x", "y"), 'on')
+        return self.ga.geoms['end'].at(pos_state.get("x", "y"), 'on')
 
     def end_dist(self, pos_state):
         """Calculate minimum distance between the end point and the rover."""
-        on_shape = self.ga.points['end'].get_shape('on')
+        on_shape = self.ga.geoms['end'].get_shape('on')
         return on_shape.distance(Point(pos_state.get("x", "y")))
 
     def max_line_dist(self, pos_hist):
@@ -283,7 +282,7 @@ class Ground(Environment):
         yhist = pos_hist.y
         max_dist = 0.0
         for i, x in enumerate(xhist):
-            dist = self.ga.lines['line'].get_shape().distance(Point(x, yhist[i]))
+            dist = self.ga.geoms['line'].get_shape().distance(Point(x, yhist[i]))
             if dist > max_dist:
                 max_dist = dist
         return max_dist
@@ -770,10 +769,10 @@ class Perception(Function):
         xy = self.pos.s.get('x', 'y')
         # calculate the unit vector to determine the direction of the line at
         # the nearest point in the line from the current location
-        ux, uy = self.ground.ga.lines['line'].vect_at_shape(xy)
+        ux, uy = self.ground.ga.geoms['line'].vect_at_shape(xy)
         # calculates the direction the rover needs to travel to reach the
         # nearest point in the line
-        dx, dy = self.ground.ga.lines['line'].vect_to_shape(xy)
+        dx, dy = self.ground.ga.geoms['line'].vect_to_shape(xy)
         self.video.s.put(lin_ux=ux[0], lin_uy=uy[0],
                          lin_dx=dx[0], lin_dy=dy[0], quality=1.0)
 

{fmdtools-2.3.3 → fmdtools-2.4.0}/examples/water_pump/script_jointfaults.py

@@ -33,7 +33,7 @@ if __name__ == "__main__":
 
     results, mdlhists = prop.fault_sample(mdl, fs_2)
 
-    fmea = an.tabulate.FMEA(results, fs_2, group_by=('phase', 'functions', 'modes'))
+    fmea = an.tabulate.FMEA(results, fs_2, group_by=('phase', 'objects', 'modes'))
     fmea.sort_by_metric("expected_cost")
     fmea.as_plot("expected_cost", color_factor='phase', suppress_ticklabels=True)
 

{fmdtools-2.3.3 → fmdtools-2.4.0}/examples/water_pump/test_pump_stochastic.py

@@ -277,7 +277,7 @@ class StochasticPumpTests(unittest.TestCase, CommonTests):
 
 if __name__ == '__main__':
     # suite = unittest.TestSuite()
-    # suite.addTest(StochasticPumpTests("test_rand_paramsample_plot"))
+    # suite.addTest(StochasticPumpTests("test_model_copy_same"))
     # suite.addTest(StochasticPumpTests("test_save_load_nominalapproach_indiv"))
     # runner = unittest.TextTestRunner()
     # runner.run(suite)