flightanalysis 0.3.8__tar.gz → 0.3.9__tar.gz

{flightanalysis-0.3.8/flightanalysis.egg-info → flightanalysis-0.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightanalysis
-Version: 0.3.8
+Version: 0.3.9
 Summary: A package for analysing flight data
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3

{flightanalysis-0.3.8 → flightanalysis-0.3.9}/flightanalysis/analysis/manoeuvre_analysis/basic.py

@@ -23,16 +23,6 @@ class Basic(Analysis):
     def name(self):
         return self.mdef.uid
 
-
-    def to_analysis_dict(self) -> dict:
-        return dict(
-            id=self.id,
-            mdef=self.mdef.to_dict(),
-            flown=self.flown.to_dict(),
-            entry=self.entry.name if self.entry else None,
-            exit=self.exit.name if self.exit else None,
-        )
-
     def run_all(self, optimise_aligment=True, force=False) -> Scored:
         """Run the analysis to the final stage"""
         drs = [r._run(True) for r in self.run()]

{flightanalysis-0.3.8 → flightanalysis-0.3.9}/flightanalysis/analysis/sch_analysis.py

@@ -61,28 +61,27 @@ class ScheduleAnalysis(Collection):
         if not isinstance(data, dict):
             data = load(open(data, "r"))
 
-        sts = data["states"]["data"]
-        entry = Heading.infer(State(sts[data["mans"][0]["start"]]).att.bearing()[0])
-
         mas = []
         for man in data["mans"]:
-            mdef = ManDef.load(ScheduleInfo(**man["sinfo"]), man["name"])
-            if not data["isComp"]:
-                heading = Heading.infer(State(sts[man["start"]]).att.bearing()[0])
-            else:
-                heading = mdef.info.start.direction.wind_swap_heading(entry)
+            mdef = ManDef.load(ScheduleInfo(**man["schedule"]), man["name"])
 
             st = (
-                State.from_dict(sts[man["start"] : man["stop"]])
+                State.from_dict(man["flown"]['data'])
                 .label(manoeuvre=man["name"])
                 .label_els(list(man["history"].values())[-1]["els"])
             )
 
+            if not data["isComp"] or len(mas)==0:
+                heading = Heading.infer(st[0].att.bearing()[0])
+            else:
+                heading = mdef.info.start.direction.wind_swap_heading(mas[0].entry)
+
+
             mas.append(analysis.Basic(man["id"], mdef, st, heading, None))
 
         return ScheduleAnalysis(mas)
 
-    def create_analysis_dict(self, **kwargs) -> dict:
+    def create_analysis_json(self, **kwargs) -> dict:
         pass
 
 

{flightanalysis-0.3.8 → flightanalysis-0.3.9}/flightanalysis/builders/f3a/criteria.py

@@ -41,7 +41,7 @@ class F3AIntra:
     peak_drop_pitch_rate = Trough(Exponential(10, 1, 6), 0.2)
     recovery_roll_rate = Bounded(Exponential(1, 1, 0.01), np.pi * 2, -np.pi*2)
     box = Bounded(Exponential(10 / np.radians(7.5), 1, 2), None, 0)
-    depth = Bounded(Exponential.fit_points([20, 40], [0.5, 1], 4), None, 0)
+    depth = Bounded(Exponential.fit_points([20, 40], [0.5, 1], 4), 0, None)
 
 
 class F3AInter:

{flightanalysis-0.3.8 → flightanalysis-0.3.9}/flightanalysis/data/f3a_a25_schedule.json

@@ -1116,8 +1116,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -1861,8 +1861,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -3412,8 +3412,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -4157,8 +4157,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -5058,8 +5058,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -6012,8 +6012,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -6915,8 +6915,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -7851,8 +7851,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -8601,8 +8601,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -9297,8 +9297,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -10191,8 +10191,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -10886,8 +10886,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -11414,8 +11414,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -12540,8 +12540,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -13290,8 +13290,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -13986,8 +13986,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -14404,8 +14404,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }

{flightanalysis-0.3.8 → flightanalysis-0.3.9}/flightanalysis/data/f3a_f25_schedule.json

@@ -1235,8 +1235,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -2075,8 +2075,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -3448,8 +3448,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -3779,8 +3779,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -4986,8 +4986,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -5752,8 +5752,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -6360,8 +6360,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -7600,8 +7600,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -10854,8 +10854,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -12030,8 +12030,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -13253,8 +13253,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -14558,8 +14558,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -15385,8 +15385,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -16225,8 +16225,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -17087,8 +17087,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -17649,8 +17649,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -19680,8 +19680,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }

{flightanalysis-0.3.8 → flightanalysis-0.3.9}/flightanalysis/data/f3a_p23_schedule.json

@@ -1954,8 +1954,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -2699,8 +2699,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -3883,8 +3883,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -5044,8 +5044,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -5788,8 +5788,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -6675,8 +6675,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -7433,8 +7433,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -7880,8 +7880,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -8423,8 +8423,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -9579,8 +9579,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -11008,8 +11008,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -11753,8 +11753,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -13260,8 +13260,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -14368,8 +14368,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -16349,8 +16349,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -17696,8 +17696,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }
@@ -18306,8 +18306,8 @@
               "exponent": 0.9999999999999999,
               "limit": 4
             },
-            "min_bound": null,
-            "max_bound": 0
+            "min_bound": 0,
+            "max_bound": null
           },
           "unit": "m"
         }