flightanalysis 0.2.11__tar.gz → 0.2.13__tar.gz

{flightanalysis-0.2.11 → flightanalysis-0.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightanalysis
-Version: 0.2.11
+Version: 0.2.13
 Summary: A package for analysing flight data
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3
@@ -16,7 +16,7 @@ Requires-Dist: simplejson
 Requires-Dist: loguru
 Requires-Dist: joblib
 Requires-Dist: pfc-geometry>=0.2.6
-Requires-Dist: flightdata>=0.2.10
+Requires-Dist: flightdata>=0.2.11
 Provides-Extra: dev
 Requires-Dist: numpy; extra == "dev"
 Requires-Dist: pandas; extra == "dev"
@@ -26,7 +26,7 @@ Requires-Dist: simplejson; extra == "dev"
 Requires-Dist: loguru; extra == "dev"
 Requires-Dist: joblib; extra == "dev"
 Requires-Dist: pfc-geometry>=0.2.6; extra == "dev"
-Requires-Dist: flightdata>=0.2.10; extra == "dev"
+Requires-Dist: flightdata>=0.2.11; extra == "dev"
 Requires-Dist: ardupilot_log_reader>=0.3.1; extra == "dev"
 Requires-Dist: pymavlink; extra == "dev"
 

{flightanalysis-0.2.11 → flightanalysis-0.2.13}/examples/scoring/f3a_criteria_maker.py

@@ -1,6 +1,6 @@
 from flightanalysis.scoring.criteria import Single, Exponential, ContAbs, ContRat, InsideBound, MaxBound, Comparison, free, OutsideBound
 import numpy as np
-
+from itertools import chain
 
 f3a=dict(
     single=dict(
@@ -21,14 +21,14 @@ f3a=dict(
         pitch_break_length=InsideBound(Exponential.fit_points([1, 2], [0.7,3.5]), [-2,2]),
         nose_drop_amount=OutsideBound(Exponential(20,1), [-np.radians(15), np.radians(15)]),
         recovery_length=MaxBound(Exponential.fit_points([1, 2], [0.7,3.5]), 2),
-        box=InsideBound(Exponential(10/np.radians(15), 1), [-np.radians(60), np.radians(60)]), # 10 points if the entire manoeuvre is 15 degrees outside the box
+        box=InsideBound(Exponential(10/np.radians(7.5), 1), [-np.radians(60), np.radians(60)]), # 10 points if the entire manoeuvre is 7.5 degrees outside the box
         depth=MaxBound(Exponential.fit_points([20, 40], [0.5, 1]), 170)
     ),
     inter=dict(
-        radius=Comparison(Exponential.fit_points([1,5], [1, 2], 2)),
+        radius=Comparison(Exponential.fit_points([1,2], [1.5, 3])),
         speed=Comparison(Exponential.fit_points([1,5], [0.25, 1.0])),
-        roll_rate=Comparison(Exponential.fit_points([1,5], [0.25, 1.5],2)),
-        length=Comparison(Exponential.fit_points([1,5], [1, 3], 3)),
+        roll_rate=Comparison(Exponential.fit_points([1,5], [0.25, 1.5])),
+        length=Comparison(Exponential.fit_points([1,2], [1.5, 3])),
         free=Comparison(free),
     )
 )
@@ -47,7 +47,24 @@ def plot_lookup(lu, v0=0, v1=10):
     x = np.linspace(v0, v1, 30)
     px.line(x=x,y=lu(x)).show()
 
+def plot_all(crits):
+    from plotly.subplots import make_subplots
+    import plotly.graph_objects as go
+    criteria = [cr for crit in crits.values() for cr in crit.values()]
+    names = [cr for crit in crits.values() for cr in crit.keys()]
+
+    nplots = sum([len(cr) for cr in crits.values()])
+    ncols=5
+    fig = make_subplots(int(np.ceil(nplots / ncols)), ncols, subplot_titles=names)
+    
+    for i, crit in enumerate(criteria):
+        row, col = 1 + i // ncols, 1 + i % ncols
+        x = np.linspace(0, 10, 30)
+        fig.add_trace(go.Scatter(x=x, y=crit.lookup(x), showlegend=False), row=row, col=col)
+    fig.show()
+
 if __name__ == "__main__":
     #plot_lookup(f3a['intra']['recovery_length'].lookup,-10,10)
 
+#    plot_all(f3a)
     dump_criteria_to_py(f3a)

{flightanalysis-0.2.11 → flightanalysis-0.2.13}/examples/scoring/temp.py

@@ -14,11 +14,11 @@ class F3AIntra:
     pitch_break_length=InsideBound(Exponential(0.7,2.321928094887362, None ), [-2, 2])
     nose_drop_amount=OutsideBound(Exponential(20,1, None ), [-0.2617993877991494, 0.2617993877991494])
     recovery_length=MaxBound(Exponential(0.7,2.321928094887362, None ), 2)
-    box=InsideBound(Exponential(38.197186342054884,1, None ), [-1.0471975511965976, 1.0471975511965976])
+    box=InsideBound(Exponential(76.39437268410977,1, None ), [-1.0471975511965976, 1.0471975511965976])
     depth=MaxBound(Exponential(0.02500000000000001,0.9999999999999999, None ), 170)
 class F3AInter:
-    radius=Comparison(Exponential(1.0,0.4306765580733931, 2 ))
+    radius=Comparison(Exponential(1.5,1.0, None ))
     speed=Comparison(Exponential(0.25,0.8613531161467862, None ))
-    roll_rate=Comparison(Exponential(0.25,1.1132827525593783, 2 ))
-    length=Comparison(Exponential(1.0,0.6826061944859854, 3 ))
+    roll_rate=Comparison(Exponential(0.25,1.1132827525593783, None ))
+    length=Comparison(Exponential(1.5,1.0, None ))
     free=Comparison(Exponential(0,1, None ))

{flightanalysis-0.2.11 → flightanalysis-0.2.13}/flightanalysis/analysis/sch_analysis.py

@@ -9,6 +9,7 @@ from joblib import Parallel, delayed
 import os
 import pandas as pd
 from importlib.metadata import version
+import geometry as g
 
 
 class ScheduleAnalysis(Collection):
@@ -26,16 +27,16 @@ class ScheduleAnalysis(Collection):
         else:
             data = file
         flight = Flight.from_fc_json(data)
-        box = Origin.from_fcjson_parmameters(data["parameters"])
+        
         if info is None:
             info = ScheduleInfo.from_str(data["parameters"]["schedule"][1])
+        
         sdef = SchedDef.load(info)
-
+        box = Origin.from_fcjson_parmameters(data["parameters"])
         state = State.from_flight(flight, box).splitter_labels(
             data["mans"],
             sdef.uids
-        )#.move(g.Transformation(g.Point(-data['parameters']['moveEast'], -data['parameters']['moveNorth'], 0)))
-
+        )
         direction = -state.get_manoeuvre(1)[0].direction()[0]
 
         return ScheduleAnalysis(