flightanalysis 0.3.3__tar.gz → 0.3.5__tar.gz

{flightanalysis-0.3.3/flightanalysis.egg-info → flightanalysis-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightanalysis
-Version: 0.3.3
+Version: 0.3.5
 Summary: A package for analysing flight data
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3
@@ -19,6 +19,7 @@ Requires-Dist: pfc-geometry>=0.2.10
 Requires-Dist: flightdata>=0.2.18
 Requires-Dist: GitPython
 Requires-Dist: pyperclip
+Requires-Dist: packaging
 Provides-Extra: dev
 Requires-Dist: numpy; extra == "dev"
 Requires-Dist: pandas; extra == "dev"

{flightanalysis-0.3.3 → flightanalysis-0.3.5}/flightanalysis/analysis/manoeuvre_analysis/complete.py

@@ -56,14 +56,14 @@ class Complete(Alignment):
         return list(self.mdef.eds.data.keys())
 
     def __iter__(self):
-        for edn in ["entry_line"] + list(self.mdef.eds.data.keys()):
+        for edn in list(self.mdef.eds.data.keys()):
             yield self.get_ea(edn)
 
     def __getitem__(self, i):
-        return self.get_ea("entry_line" if i == 0 else self.mdef.eds[i + 1].name)
+        return self.get_ea(self.mdef.eds[i + 1].name)
 
     def __getattr__(self, name):
-        if name in self.mdef.eds.data.keys() or name == "entry_line":
+        if name in self.mdef.eds.data.keys():
             return self.get_ea(name)
         raise AttributeError(f"Attribute {name} not found in {self.__class__.__name__}")
 

{flightanalysis-0.3.3 → flightanalysis-0.3.5}/flightanalysis/analysis/sch_analysis.py

@@ -93,6 +93,9 @@ class ScheduleAnalysis(Collection):
         else:
             data["fcs_scores"].append(new_results)
 
+        if 'jhash' in data:
+            del data['jhash']        
+
         if ofile:
             dump(
                 data,

{flightanalysis-0.3.3 → flightanalysis-0.3.5}/flightanalysis/data/f3a_a25_schedule.json

@@ -127,6 +127,23 @@
         "collectors": {
           "e_3_0.roll": "e_3_0.roll"
         }
+      },
+      "e_3_pad_length": {
+        "name": "e_3_pad_length",
+        "criteria": {
+          "kind": "Comparison",
+          "lookup": {
+            "factor": 1.0,
+            "exponent": 1.0,
+            "limit": 2
+          }
+        },
+        "defaul": null,
+        "unit": "m",
+        "collectors": {
+          "e_3_pad1.length": "e_3_pad1.length",
+          "e_3_pad2.length": "e_3_pad2.length"
+        }
       }
     },
     "eds": {
@@ -402,6 +419,23 @@
         "collectors": {
           "e_1_0.roll": "e_1_0.roll"
         }
+      },
+      "e_1_pad_length": {
+        "name": "e_1_pad_length",
+        "criteria": {
+          "kind": "Comparison",
+          "lookup": {
+            "factor": 1.0,
+            "exponent": 1.0,
+            "limit": 2
+          }
+        },
+        "defaul": null,
+        "unit": "m",
+        "collectors": {
+          "e_1_pad1.length": "e_1_pad1.length",
+          "e_1_pad2.length": "e_1_pad2.length"
+        }
       }
     },
     "eds": {
@@ -637,6 +671,23 @@
           "e_3_0.roll": "e_3_0.roll"
         }
       },
+      "e_3_pad_length": {
+        "name": "e_3_pad_length",
+        "criteria": {
+          "kind": "Comparison",
+          "lookup": {
+            "factor": 1.0,
+            "exponent": 1.0,
+            "limit": 2
+          }
+        },
+        "defaul": null,
+        "unit": "m",
+        "collectors": {
+          "e_3_pad1.length": "e_3_pad1.length",
+          "e_3_pad2.length": "e_3_pad2.length"
+        }
+      },
       "e_5_rolls": {
         "name": "e_5_rolls",
         "criteria": {
@@ -660,6 +711,23 @@
         "collectors": {
           "e_5_0.roll": "e_5_0.roll"
         }
+      },
+      "e_5_pad_length": {
+        "name": "e_5_pad_length",
+        "criteria": {
+          "kind": "Comparison",
+          "lookup": {
+            "factor": 1.0,
+            "exponent": 1.0,
+            "limit": 2
+          }
+        },
+        "defaul": null,
+        "unit": "m",
+        "collectors": {
+          "e_5_pad1.length": "e_5_pad1.length",
+          "e_5_pad2.length": "e_5_pad2.length"
+        }
       }
     },
     "eds": {
@@ -997,6 +1065,23 @@
         "collectors": {
           "e_1_0.roll": "e_1_0.roll"
         }
+      },
+      "e_1_pad_length": {
+        "name": "e_1_pad_length",
+        "criteria": {
+          "kind": "Comparison",
+          "lookup": {
+            "factor": 1.0,
+            "exponent": 1.0,
+            "limit": 2
+          }
+        },
+        "defaul": null,
+        "unit": "m",
+        "collectors": {
+          "e_1_pad1.length": "e_1_pad1.length",
+          "e_1_pad2.length": "e_1_pad2.length"
+        }
       }
     },
     "eds": {
@@ -1450,6 +1535,23 @@
         "collectors": {
           "e_3_0.roll": "e_3_0.roll"
         }
+      },
+      "e_3_pad_length": {
+        "name": "e_3_pad_length",
+        "criteria": {
+          "kind": "Comparison",
+          "lookup": {
+            "factor": 1.0,
+            "exponent": 1.0,
+            "limit": 2
+          }
+        },
+        "defaul": null,
+        "unit": "m",
+        "collectors": {
+          "e_3_pad1.length": "e_3_pad1.length",
+          "e_3_pad2.length": "e_3_pad2.length"
+        }
       }
     },
     "eds": {
@@ -1959,6 +2061,23 @@
         "collectors": {
           "e_3_0.roll": "e_3_0.roll"
         }
+      },
+      "e_3_pad_length": {
+        "name": "e_3_pad_length",
+        "criteria": {
+          "kind": "Comparison",
+          "lookup": {
+            "factor": 1.0,
+            "exponent": 1.0,
+            "limit": 2
+          }
+        },
+        "defaul": null,
+        "unit": "m",
+        "collectors": {
+          "e_3_pad1.length": "e_3_pad1.length",
+          "e_3_pad2.length": "e_3_pad2.length"
+        }
       }
     },
     "eds": {
@@ -2976,7 +3095,7 @@
         },
         "dgs": [
           "track_y_before_slowdown",
-          "line_track_z",
+          "track_z_before_slowdown",
           "line_roll_angle",
           "yaw_after_slowdown"
         ]
@@ -2998,8 +3117,8 @@
           "peak_drop_pitch_rate",
           "drop_pitch_rate",
           "recovery_rate_delta",
-          "end_track_y",
-          "end_track_z"
+          "spin_track_y",
+          "loop_track_z"
         ]
       },
       "e_1": {
@@ -3155,6 +3274,23 @@
         "collectors": {
           "e_1_0.roll": "e_1_0.roll"
         }
+      },
+      "e_1_pad_length": {
+        "name": "e_1_pad_length",
+        "criteria": {
+          "kind": "Comparison",
+          "lookup": {
+            "factor": 1.0,
+            "exponent": 1.0,
+            "limit": 2
+          }
+        },
+        "defaul": null,
+        "unit": "m",
+        "collectors": {
+          "e_1_pad1.length": "e_1_pad1.length",
+          "e_1_pad2.length": "e_1_pad2.length"
+        }
       }
     },
     "eds": {
@@ -3435,6 +3571,23 @@
         "collectors": {
           "e_1_0.roll": "e_1_0.roll"
         }
+      },
+      "e_1_pad_length": {
+        "name": "e_1_pad_length",
+        "criteria": {
+          "kind": "Comparison",
+          "lookup": {
+            "factor": 1.0,
+            "exponent": 1.0,
+            "limit": 2
+          }
+        },
+        "defaul": null,
+        "unit": "m",
+        "collectors": {
+          "e_1_pad1.length": "e_1_pad1.length",
+          "e_1_pad2.length": "e_1_pad2.length"
+        }
       }
     },
     "eds": {