flightanalysis 0.2.15__tar.gz → 0.2.16__tar.gz

{flightanalysis-0.2.15 → flightanalysis-0.2.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightanalysis
-Version: 0.2.15
+Version: 0.2.16
 Summary: A package for analysing flight data
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3
@@ -15,8 +15,8 @@ Requires-Dist: fastdtw
 Requires-Dist: simplejson
 Requires-Dist: loguru
 Requires-Dist: joblib
-Requires-Dist: pfc-geometry>=0.2.6
-Requires-Dist: flightdata>=0.2.14
+Requires-Dist: pfc-geometry>=0.2.7
+Requires-Dist: flightdata>=0.2.15
 Provides-Extra: dev
 Requires-Dist: numpy; extra == "dev"
 Requires-Dist: pandas; extra == "dev"
@@ -25,9 +25,9 @@ Requires-Dist: fastdtw; extra == "dev"
 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.14; extra == "dev"
-Requires-Dist: ardupilot_log_reader>=0.3.1; extra == "dev"
+Requires-Dist: pfc-geometry>=0.2.7; extra == "dev"
+Requires-Dist: flightdata>=0.2.15; extra == "dev"
+Requires-Dist: ardupilot_log_reader>=0.3.3; extra == "dev"
 Requires-Dist: pymavlink; extra == "dev"
 
 # FlightAnalysis

{flightanalysis-0.2.15 → flightanalysis-0.2.16}/examples/scoring/f3a_criteria_maker.py

@@ -7,14 +7,13 @@ f3a=dict(
         track=Single(Exponential.fit_points(np.radians([30, 90]), [2, 6], 6)),
         roll=Single(Exponential.fit_points(np.radians([30, 90]), [1, 6], 6)),
         angle=Single(Exponential.fit_points(np.radians([30, 90]), [2, 6], 6)),
-#        distance = Single(Exponential.fit_points([20, 40], [0.5, 1]))
     ),
     intra=dict(
-        track=ContAbs(Exponential.fit_points(np.radians([30, 90]), [2, 6], 6)),
-        roll=ContAbs(Exponential.fit_points(np.radians([30, 90]), [1.5, 6], 6)),
-        radius=ContRat(Exponential.fit_points([1,5], [0.5, 4], 3)),
-        speed=ContRat(Exponential.fit_points([1,5], [0.15, 0.75], 1)),
-        roll_rate=ContRat(Exponential.fit_points([1,5], [0.15, 0.75], 2)),
+        track=ContAbs(Exponential.fit_points(np.radians([30, 90]), [2, 6], 6), 20),
+        roll=ContAbs(Exponential.fit_points(np.radians([30, 90]), [1.5, 6], 6), 30),
+        radius=ContRat(Exponential.fit_points([1,5], [0.5, 4], 3), 40),
+        speed=ContRat(Exponential.fit_points([1,5], [0.15, 0.75], 1), 50),
+        roll_rate=ContRat(Exponential.fit_points([1,5], [0.15, 0.75], 2), 40),
         stallturn_speed=InsideBound(Exponential.fit_points([2, 5], [0.3,1.5]), [-2,2]),
         stallturn_width=InsideBound(Exponential.fit_points([2, 5], [0.5,2.5]), [-2,2]),
         spin_entry_length=InsideBound(Exponential.fit_points([2, 5], [0.3,1.5]), [-5,5]),

flightanalysis-0.2.16/examples/scoring/temp.py

@@ -0,0 +1,24 @@
+class F3ASingle:
+    track=Single(Exponential(3.8197186342054885,0.9999999999999999, 6 ))
+    roll=Single(Exponential(2.872721387028467,1.6309297535714575, 6 ))
+    angle=Single(Exponential(3.8197186342054885,0.9999999999999999, 6 ))
+class F3AIntra:
+    track=ContAbs(Exponential(3.8197186342054885,0.9999999999999999, 6 ), 10, 3)
+    roll=ContAbs(Exponential(3.3937161800825275,1.2618595071429148, 6 ), 20, 3)
+    radius=ContRat(Exponential(0.5,1.2920296742201793, 3 ), 25, 3)
+    speed=ContRat(Exponential(0.15,1.0, 1 ), 50, 3)
+    roll_rate=ContRat(Exponential(0.15,1.0, 2 ), 25, 3)
+    stallturn_speed=InsideBound(Exponential(0.08879139070041006,1.75647079736603, None ), [-2, 2])
+    stallturn_width=InsideBound(Exponential(0.14798565116735013,1.75647079736603, None ), [-2, 2])
+    spin_entry_length=InsideBound(Exponential(0.08879139070041006,1.75647079736603, None ), [-5, 5])
+    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(76.39437268410977,1, None ), [-1.0471975511965976, 1.0471975511965976])
+    depth=MaxBound(Exponential(0.02500000000000001,0.9999999999999999, None ), 170)
+class F3AInter:
+    radius=Comparison(Exponential(1.0,1.0, 2 ))
+    speed=Comparison(Exponential(0.25,1.0000000000000002, 1 ))
+    roll_rate=Comparison(Exponential(0.25,1.0000000000000002, 1 ))
+    length=Comparison(Exponential(1.0,1.0, 2 ))
+    free=Comparison(Exponential(0,1, None ))

{flightanalysis-0.2.15 → flightanalysis-0.2.16}/flightanalysis/analysis/sch_analysis.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from typing import Self, Union
 from json import load, dump
-from flightdata import Flight, State, Origin, Collection
+from flightdata import Flight, State, Origin, Collection, NumpyEncoder
 from flightanalysis.definition import SchedDef, ScheduleInfo
 from . import manoeuvre_analysis as analysis
 from loguru import logger
@@ -10,7 +10,7 @@ import os
 import pandas as pd
 from importlib.metadata import version
 from packaging import version as pkgversion
-
+from pathlib import Path
 
 class ScheduleAnalysis(Collection):
     VType=analysis.Analysis
@@ -21,8 +21,8 @@ class ScheduleAnalysis(Collection):
         self.sinfo = sinfo
 
     @staticmethod
-    def from_fcj(file: Union[str, dict], info: ScheduleInfo=None) -> ScheduleAnalysis:
-        data = load(open(file, 'r')) if isinstance(file, str) else file
+    def from_fcj(file: Union[Union[str, bytes, os.PathLike], dict], info: ScheduleInfo=None) -> ScheduleAnalysis:
+        data = file if isinstance(file, dict) else load(open(file, 'r'))
 
         flight = Flight.from_fc_json(data)
         
@@ -50,8 +50,8 @@ class ScheduleAnalysis(Collection):
 
         return ScheduleAnalysis(mas,info)
     
-    def append_scores_to_fcj(self, file: Union[str, dict]) -> dict:
-        data = load(open(file, 'r')) if isinstance(file, str) else file
+    def append_scores_to_fcj(self, file: Union[str, dict], ofile: str=None) -> dict:
+        data = file if isinstance(file, dict) else load(open(file, 'r'))
 
         new_results = dict(
             fa_version = version('flightanalysis'),
@@ -69,14 +69,27 @@ class ScheduleAnalysis(Collection):
         else:
             data['fcs_scores'].append(new_results)
 
+        if ofile:
+            if ofile=='same':
+                ofile = file
+            dump(data, open(ofile, 'w'), cls=NumpyEncoder, indent=2)
+
         return data
-        
+    
+#    def export_fcj_and_internals(self, file: Union[str, dict]):
+#        data = load(open(file, 'r')) if isinstance(file, str) else file
+#        fcj = self.append_scores_to_fcj(data)
+
 
     def run_all(self) -> Self:
         def parse_analyse_serialise(pad):
-            res = analysis.parse_dict(pad).run_all()
-            logger.info(f'Completed {res.name}')
-            return res.to_dict()
+            try:
+                pad = analysis.parse_dict(pad)
+                pad = pad.run_all()
+                logger.info(f'Completed {pad.name}')
+            except Exception as e:
+                logger.error(f'Failed to process {pad.name}: {repr(e)}')
+            return pad.to_dict()
         
         logger.info(f'Starting {os.cpu_count()} analysis processes')
         madicts = Parallel(n_jobs=os.cpu_count())(

{flightanalysis-0.2.15 → flightanalysis-0.2.16}/flightanalysis/scoring/criteria/criteria.py

@@ -38,6 +38,10 @@ class Criteria:
         _so = f"{self.__class__.__name__}(Exponential({self.lookup.factor},{self.lookup.exponent}, {self.lookup.limit} )"
         if hasattr(self, 'bound'):
             _so = f"{_so}, {self.bound}"
+        if hasattr(self, 'max_window'):
+            _so = f"{_so}, {self.max_window}"
+        if hasattr(self, 'window_ratio'):
+            _so = f"{_so}, {self.window_ratio}"
         return _so + ')'
         
 @dataclass

{flightanalysis-0.2.15 → flightanalysis-0.2.16}/flightanalysis/scoring/criteria/f3a_criteria.py

@@ -6,11 +6,11 @@ class F3ASingle:
     roll=Single(Exponential(2.872721387028467,1.6309297535714575, 6 ))
     angle=Single(Exponential(3.8197186342054885,0.9999999999999999, 6 ))
 class F3AIntra:
-    track=ContAbs(Exponential(3.8197186342054885,0.9999999999999999, 6 ))
-    roll=ContAbs(Exponential(3.3937161800825275,1.2618595071429148, 6 ))
-    radius=ContRat(Exponential(0.5,1.2920296742201793, 3 ))
-    speed=ContRat(Exponential(0.15,1.0, 1 ))
-    roll_rate=ContRat(Exponential(0.15,1.0, 2 ))
+    track=ContAbs(Exponential(3.8197186342054885,0.9999999999999999, 6 ), 20, 3)
+    roll=ContAbs(Exponential(3.3937161800825275,1.2618595071429148, 6 ), 30, 3)
+    radius=ContRat(Exponential(0.5,1.2920296742201793, 3 ), 40, 3)
+    speed=ContRat(Exponential(0.15,1.0, 1 ), 50, 3)
+    roll_rate=ContRat(Exponential(0.15,1.0, 2 ), 40, 3)
     stallturn_speed=InsideBound(Exponential(0.08879139070041006,1.75647079736603, None ), [-2, 2])
     stallturn_width=InsideBound(Exponential(0.14798565116735013,1.75647079736603, None ), [-2, 2])
     spin_entry_length=InsideBound(Exponential(0.08879139070041006,1.75647079736603, None ), [-5, 5])
@@ -18,7 +18,7 @@ class F3AIntra:
     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(76.39437268410977,1, None ), [-1.0471975511965976, 1.0471975511965976])
-    depth=MaxBound(Exponential(0.02500000000000001,0.9999999999999999, 3 ), 170)
+    depth=MaxBound(Exponential(0.02500000000000001,0.9999999999999999, None ), 170)
 class F3AInter:
     radius=Comparison(Exponential(1.0,1.0, 2 ))
     speed=Comparison(Exponential(0.25,1.0000000000000002, 1 ))
@@ -28,6 +28,7 @@ class F3AInter:
 
 
 
+
 class F3A:
     inter = F3AInter
     intra = F3AIntra

{flightanalysis-0.2.15 → flightanalysis-0.2.16}/flightanalysis/scoring/criteria/intra/continuous.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 import numpy as np
 import numpy.typing as npt
-import pandas as pd
 from .. import Criteria
 from dataclasses import dataclass
 from flightanalysis.scoring import Measurement, Result
@@ -13,6 +12,9 @@ class Continuous(Criteria):
     only downgrades for increases (away from zero) of the value.
     treats each separate increase (peak - trough) as a new error.
     """
+    max_window: int = 40
+    window_ratio: int = 3
+
     @staticmethod
     def get_peak_locs(arr, rev=False):
         increasing = np.sign(np.diff(np.abs(arr)))>0
@@ -66,14 +68,15 @@ class Continuous(Criteria):
         _mean = np.mean(sample)
         sample = (sample - _mean) * window / max_window + _mean
         return sample 
-    
+
+
 class ContAbs(Continuous):
     def prepare(self, values: npt.NDArray, expected: float):
         sample = values - expected
         if len(sample) <= 8:
             return np.linspace(values[0],values[-1], len(sample))
         else:
-            return Continuous.convolve_wind(values, 3, 40)
+            return Continuous.convolve_wind(values, self.window_ratio, self.max_window)
         
     @staticmethod
     def mistakes(data, peaks, troughs):
@@ -98,7 +101,7 @@ class ContRat(Continuous):
                 len(values)
             ))
         else:
-            return np.abs(Continuous.convolve_wind(values, 3, 40))
+            return np.abs(Continuous.convolve_wind(values, self.window_ratio, self.max_window))
 
     @staticmethod
     def mistakes(data, peaks, troughs):

{flightanalysis-0.2.15 → flightanalysis-0.2.16}/flightanalysis/scoring/measurement.py

@@ -4,7 +4,7 @@ from geometry import Point, Quaternion, PX, PY, PZ
 import numpy as np
 import pandas as pd
 import numpy.typing as npt
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from typing import Union, Self
 
 
@@ -72,7 +72,7 @@ class Measurement:
     def _vector_vis(direction: Point, loc: Point) -> Union[Point, npt.NDArray]:
         #a vector error is more visible if it is perpendicular to the viewing vector
         # 0 to np.pi, pi/2 gives max, 0&np.pi give min
-        return direction,  (1 - 0.8* np.abs(Point.cos_angle_between(loc, direction))) * Measurement._pos_vis(loc)
+        return direction,  (1 - 0.9* np.abs(Point.cos_angle_between(loc, direction))) * Measurement._pos_vis(loc)
 
     @staticmethod
     def _roll_vis(fl: State, tp: State) -> Union[Point, npt.NDArray]:
@@ -89,7 +89,7 @@ class Measurement:
         ao[np.abs(afl) > np.abs(atp)] = atp[np.abs(afl) > np.abs(atp)]
         ao[np.sign(azfl) != np.sign(aztp)] = 0 # wings have passed through the view vector
 
-        rvis = (1-0.8*np.abs(ao))
+        rvis = (1-0.9*np.abs(ao))
         
         return fl.att.transform_point(PZ()), rvis * Measurement._pos_vis(fl.pos)
 

{flightanalysis-0.2.15 → flightanalysis-0.2.16}/flightanalysis/scoring/results.py

@@ -210,7 +210,7 @@ class ManoeuvreResults:
             intra=intra,
             inter=inter,
             positioning=positioning,
-            total=10 - intra - inter - positioning
+            total=max(10 - intra - inter - positioning, 0)
         )
 
     def score(self, difficulty=3, truncate: bool=False):

{flightanalysis-0.2.15 → flightanalysis-0.2.16}/flightanalysis/scripts/batch_analyse.py

@@ -40,15 +40,13 @@ def main():
             logger.info(f'Processing file {i} of {len(all_logs)} - {file}')
             data = load(open(file, 'r'))
             
-            if 'analysis.json' not in file.name:
-                sa = ScheduleAnalysis.from_fcj(data)
-            else:
-                sa = ScheduleAnalysis.from_fcscore(data)
+            sa = ScheduleAnalysis.from_fcj(data)
+            
             logger.info(sa.sinfo)
             sa = sa.run_all()
 
-            with open(outdir / f'{file.stem}_analysis.json', 'w') as f:
-                dump(sa.to_fcscore(file.stem), f, indent=4, cls=NumpyEncoder)
+            with open(outdir / f'{file.stem}.json', 'w') as f:
+                dump(sa.append_scores_to_fcj(data), f, indent=4, cls=NumpyEncoder)
             logger.info(f'scores:\n{dumps(sa.scores(), indent=2)}')
         except Exception as e:
             logger.error(f'Error processing {file}: {e}')

{flightanalysis-0.2.15 → flightanalysis-0.2.16}/flightanalysis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightanalysis
-Version: 0.2.15
+Version: 0.2.16
 Summary: A package for analysing flight data
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3
@@ -15,8 +15,8 @@ Requires-Dist: fastdtw
 Requires-Dist: simplejson
 Requires-Dist: loguru
 Requires-Dist: joblib
-Requires-Dist: pfc-geometry>=0.2.6
-Requires-Dist: flightdata>=0.2.14
+Requires-Dist: pfc-geometry>=0.2.7
+Requires-Dist: flightdata>=0.2.15
 Provides-Extra: dev
 Requires-Dist: numpy; extra == "dev"
 Requires-Dist: pandas; extra == "dev"
@@ -25,9 +25,9 @@ Requires-Dist: fastdtw; extra == "dev"
 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.14; extra == "dev"
-Requires-Dist: ardupilot_log_reader>=0.3.1; extra == "dev"
+Requires-Dist: pfc-geometry>=0.2.7; extra == "dev"
+Requires-Dist: flightdata>=0.2.15; extra == "dev"
+Requires-Dist: ardupilot_log_reader>=0.3.3; extra == "dev"
 Requires-Dist: pymavlink; extra == "dev"
 
 # FlightAnalysis

{flightanalysis-0.2.15 → flightanalysis-0.2.16}/flightanalysis.egg-info/SOURCES.txt

@@ -11,9 +11,23 @@ examples/data/__init__.py
 examples/data/manual_F3A_F23_22_04_28_00000231.json
 examples/data/manual_F3A_P23_22_05_31_00000350.json
 examples/data/manual_F3A_P23_23_08_11_00000094.json
+examples/schedule_construction/AMA_Intermediate2024.py
+examples/schedule_construction/__init__.py
+examples/schedule_construction/create_all.py
+examples/schedule_construction/f3a_a25.py
+examples/schedule_construction/f3a_f25.py
+examples/schedule_construction/f3a_p23.py
+examples/schedule_construction/f3a_p25.py
+examples/schedule_construction/f3auk_clubman.py
+examples/schedule_construction/f3auk_intermediate.py
+examples/schedule_construction/imac_sport2024.py
+examples/schedule_construction/imac_unlim2024.py
+examples/schedule_construction/make_manoeuvre.py
+examples/schedule_construction/nsrca_inter2024.py
 examples/scoring/__init__.py
 examples/scoring/f3a_criteria_maker.py
 examples/scoring/judging.py
+examples/scoring/temp.py
 examples/scoring/manoeuvres/__init__.py
 examples/scoring/manoeuvres/inter_analysis.py
 examples/scoring/manoeuvres/intra_analysis.py
@@ -92,19 +106,6 @@ flightanalysis/scoring/criteria/intra/single.py
 flightanalysis/scripts/batch_analyse.py
 flightanalysis/scripts/collect_scores.py
 flightanalysis/scripts/plot_scores.py
-scripts/AMA_Intermediate2024.py
-scripts/__init__.py
-scripts/create_all.py
-scripts/f3a_a25.py
-scripts/f3a_f25.py
-scripts/f3a_p23.py
-scripts/f3a_p25.py
-scripts/f3auk_clubman.py
-scripts/f3auk_intermediate.py
-scripts/imac_sport2024.py
-scripts/imac_unlim2024.py
-scripts/make_manoeuvre.py
-scripts/nsrca_inter2024.py
 tests/EmailedBox.f3a
 tests/__init__.py
 tests/conftest.py

{flightanalysis-0.2.15 → flightanalysis-0.2.16}/flightanalysis.egg-info/requires.txt

@@ -5,8 +5,8 @@ fastdtw
 simplejson
 loguru
 joblib
-pfc-geometry>=0.2.6
-flightdata>=0.2.14
+pfc-geometry>=0.2.7
+flightdata>=0.2.15
 
 [dev]
 numpy
@@ -16,7 +16,7 @@ fastdtw
 simplejson
 loguru
 joblib
-pfc-geometry>=0.2.6
-flightdata>=0.2.14
-ardupilot_log_reader>=0.3.1
+pfc-geometry>=0.2.7
+flightdata>=0.2.15
+ardupilot_log_reader>=0.3.3
 pymavlink

flightanalysis-0.2.16/requirements-dev.txt

@@ -0,0 +1,11 @@
+numpy
+pandas
+scipy
+fastdtw
+simplejson
+loguru
+joblib
+pfc-geometry>=0.2.7
+flightdata>=0.2.15
+ardupilot_log_reader>=0.3.3
+pymavlink

{flightanalysis-0.2.15 → flightanalysis-0.2.16}/requirements.txt

@@ -5,5 +5,5 @@ fastdtw
 simplejson
 loguru
 joblib
-pfc-geometry>=0.2.6
-flightdata>=0.2.14
+pfc-geometry>=0.2.7
+flightdata>=0.2.15

flightanalysis-0.2.15/requirements-dev.txt

@@ -1,11 +0,0 @@
-numpy
-pandas
-scipy
-fastdtw
-simplejson
-loguru
-joblib
-pfc-geometry>=0.2.6
-flightdata>=0.2.14
-ardupilot_log_reader>=0.3.1
-pymavlink