fmdtools 2.3.2__tar.gz → 2.3.3__tar.gz

{fmdtools-2.3.2 → fmdtools-2.3.3}/LICENSE

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

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

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: fmdtools
-Version: 2.3.2
+Version: 2.3.3
 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.2
+License: fmdtools version 2.3.3
         ---------------------------
                                          Apache License
                                    Version 2.0, January 2004
@@ -250,7 +250,7 @@ Requires-Dist: tqdm
 Requires-Dist: networkx
 Requires-Dist: numpy>=2.0
 Requires-Dist: matplotlib>=3.7.0
-Requires-Dist: pandas[all]
+Requires-Dist: pandas[all]>=2.2.0
 Requires-Dist: ordered-set
 Requires-Dist: dill
 Requires-Dist: recordclass==0.24
@@ -293,12 +293,12 @@ Dynamic: license-file
 
 See: [Examples](https://nasa.github.io/fmdtools/examples/Examples.html)
 
-<img src="/docs/_images/tutorial_fmdtools_basics.webp" width="15%"></img>
-<img src="/docs/_images/demo_proxthreat.webp" width="15%"></img>
-<img src="/docs/_images/demo_wildfire.webp" width="15%"></img>
-<img src="/docs/_images/paper_jcise_dsa.webp" width="15%"></img>
-<img src="/docs/_images/demo_urban_flight.webp" width="15%"></img> 
-<img src="/docs/_images/demo_degradation.webp" width="15%"></img>
+<img src="https://nasa.github.io/fmdtools/_images/tutorial_fmdtools_basics.webp" width="15%"></img>
+<img src="https://nasa.github.io/fmdtools/_images/demo_proxthreat.webp" width="15%"></img>
+<img src="https://nasa.github.io/fmdtools/_images/demo_wildfire.webp" width="15%"></img>
+<img src="https://nasa.github.io/fmdtools/_images/paper_jcise_dsa.webp" width="15%"></img>
+<img src="https://nasa.github.io/fmdtools/_images/demo_urban_flight.webp" width="15%"></img> 
+<img src="https://nasa.github.io/fmdtools/_images/demo_degradation.webp" width="15%"></img>
 
 ## About
 
@@ -392,7 +392,7 @@ 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.2
+   git checkout v2.3.3
 ```
 
 
@@ -529,8 +529,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.2},
-  date = {2025-3-6},
+  version = {2.3.3},
+  date = {2025-4-10},
 }
 ```
 

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

@@ -22,12 +22,12 @@
 
 See: [Examples](https://nasa.github.io/fmdtools/examples/Examples.html)
 
-<img src="/docs/_images/tutorial_fmdtools_basics.webp" width="15%"></img>
-<img src="/docs/_images/demo_proxthreat.webp" width="15%"></img>
-<img src="/docs/_images/demo_wildfire.webp" width="15%"></img>
-<img src="/docs/_images/paper_jcise_dsa.webp" width="15%"></img>
-<img src="/docs/_images/demo_urban_flight.webp" width="15%"></img> 
-<img src="/docs/_images/demo_degradation.webp" width="15%"></img>
+<img src="https://nasa.github.io/fmdtools/_images/tutorial_fmdtools_basics.webp" width="15%"></img>
+<img src="https://nasa.github.io/fmdtools/_images/demo_proxthreat.webp" width="15%"></img>
+<img src="https://nasa.github.io/fmdtools/_images/demo_wildfire.webp" width="15%"></img>
+<img src="https://nasa.github.io/fmdtools/_images/paper_jcise_dsa.webp" width="15%"></img>
+<img src="https://nasa.github.io/fmdtools/_images/demo_urban_flight.webp" width="15%"></img> 
+<img src="https://nasa.github.io/fmdtools/_images/demo_degradation.webp" width="15%"></img>
 
 ## About
 
@@ -121,7 +121,7 @@ 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.2
+   git checkout v2.3.3
 ```
 
 
@@ -258,8 +258,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.2},
-  date = {2025-3-6},
+  version = {2.3.3},
+  date = {2025-4-10},
 }
 ```
 

{fmdtools-2.3.2 → fmdtools-2.3.3}/examples/airspacelib/base/arch/aviate.py

@@ -67,7 +67,7 @@ class Aviate(Function):
         if self.trajectories.s.z > 0.0:
             if self.electricity.s.voltage_high <= 0.0:
                 self.m.set_mode('falling')
-            else:
+            elif not self.m.in_mode('falling'):
                 self.m.set_mode('flight')
         else:
             if self.electricity.s.voltage_high > 0.0:

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

@@ -94,7 +94,7 @@ class ContingencyControlParameter(Parameter):
     fuel_rate: float = 20.0
     disallowed_cost: float = 10.0
     occupied_cost: float = 20.0
-    restricted_cost: float = 1000000.0
+    restricted_cost: float = 100.0
     max_distance: int = 5
     blocksize: float = 2.5
     
@@ -134,6 +134,8 @@ class ContingencyControlFlight(ControlFlight):
             else:
                 if self.m.in_mode('pause'):
                     self.m.set_mode('flight')
+                    self.replan_mission()
+                    self.s.pt = 1
                 self.s.reconfigured_proxthreat = False
                 
     def static_behavior(self):
@@ -173,10 +175,6 @@ class ContingencyControlFlight(ControlFlight):
         # if UAV within distance 10, require A* consideration for UAV safety
         obstacle = self.s.closest_dist <= 10
         # if battery low, bump fuel cost proportionally to current battery level
-        if 0.0 < self.electricity.s.charge <= 25.0:
-            fuel_rate = self.p.fuel_rate * 25000.0 / self.electricity.s.charge
-        else:
-            fuel_rate = self.p.fuel_rate
         curr_pt = self.trajectories.perc_traj.s.gett('x', 'y')
         new_path = grid.a_star_worldcoords(
             start_xy = curr_pt, 
@@ -185,7 +183,7 @@ class ContingencyControlFlight(ControlFlight):
             disallowed_cost = self.p.disallowed_cost,
             occupied_cost = self.p.occupied_cost,
             restricted_cost = self.p.restricted_cost,
-            fuel_rate = fuel_rate, 
+            fuel_rate = self.p.fuel_rate, 
             obstacle = obstacle
             )
 
@@ -197,6 +195,16 @@ class ContingencyControlFlight(ControlFlight):
 class ContingencyAviate(Aviate):
     """Movement of the drone. Updates encironment point."""
 
+    def static_behavior(self):
+        dists = self.environment.ga.calc_dist_to_threats("envelope", "envelope")
+        for name, dist in dists.items():
+            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
+        super().static_behavior()
+
     def dynamic_behavior(self):
         super().dynamic_behavior()
         self.environment.ga.points['self'].s.assign(self.trajectories.s, 'x', 'y', 'z')

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

@@ -177,7 +177,7 @@ class ContingencyThreats(GeomArchitecture):
         """Initialize drone and intruders given 'intruders' options."""
         self.add_point('self', Threat)
         if self.p.intruders == "across":
-            s = {'buffer_speed': 3.5, 'x': 100, 'y': 0.0, 'z': 25.0,
+            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)
         elif self.p.intruders == "middle":
@@ -266,9 +266,9 @@ if __name__ == "__main__":
     he.ga.update_positions()
     he.show()
 
-    hc = ContingencyConditions(track=['environment'])
+    cc = ContingencyConditions(track=['environment'])
     from fmdtools.sim import propagate
-    res, hist = propagate.nominal(hc)
+    res, hist = propagate.nominal(cc)
 
     hist.plot_trajectories('environment.ga.points.uav.s.x',
                            'environment.ga.points.uav.s.y')

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

@@ -217,7 +217,7 @@ class DroneFlightGrid(Coords):
                                 restricted_cost * restricted
                             )
                 if (i, j) in unsafe_points:
-                    total += restricted_cost
+                    total +=100*restricted_cost
                 self.set(i, j, 'grid_costs', total)
 
     def neighbor_gen(self, j, i, max_distance):
@@ -446,5 +446,18 @@ class DroneFlightGrid(Coords):
         return path_xy
     
 if __name__ == "__main__":
-    import doctest
-    doctest.testmod(verbose=True)
+    from fmdtools_examples.airspacelib.contingency_management.model_flightplanner import DroneFlightGrid, DroneFlightGridParam
+    from fmdtools_examples.airspacelib.contingency_management.model_environment import ContingencyEnvironment
+    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)
+    start = (45.0, 72.5)
+    goal = (50.0, 60.0)
+    path = grid.a_star_worldcoords(start_xy=start, goal_xy=goal, max_distance=5,
+                                   disallowed_cost=10.0, occupied_cost=20.0,
+                                   restricted_cost=100.0, fuel_rate= 20, obstacle=True) # *25000.0/25
+    print(path)
+
+    # import doctest
+    # doctest.testmod(verbose=True)