flightanalysis 0.2.14__tar.gz → 0.2.15__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightanalysis
-Version: 0.2.14
+Version: 0.2.15
 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.13
+Requires-Dist: flightdata>=0.2.14
 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.13; extra == "dev"
+Requires-Dist: flightdata>=0.2.14; extra == "dev"
 Requires-Dist: ardupilot_log_reader>=0.3.1; extra == "dev"
 Requires-Dist: pymavlink; extra == "dev"
 

{flightanalysis-0.2.14 → flightanalysis-0.2.15}/flightanalysis/analysis/manoeuvre_analysis/alignment.py

@@ -92,6 +92,13 @@ class Alignment(Basic):
                 **data
             )
         return data
-        
+
+    def fcj_results(self):
+        df = self.flown.label_ranges('element').iloc[:,:3]
+        df.columns = ['name', 'start', 'stop']
+        return dict(
+            els=df.to_dict('records')
+        )
+
 from .complete import Complete  # noqa: E402
 from .scored import Scored  # noqa: E402

{flightanalysis-0.2.14 → flightanalysis-0.2.15}/flightanalysis/analysis/manoeuvre_analysis/scored.py

@@ -42,4 +42,9 @@ class Scored(Complete):
         )
         
         return data
-        
+    
+    def fcj_results(self):
+        return dict(
+            **super().fcj_results(),
+            results=self.scores.fcj_results()
+        )

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

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from typing import Self, Union
-from json import load
+from json import load, dump
 from flightdata import Flight, State, Origin, Collection
 from flightanalysis.definition import SchedDef, ScheduleInfo
 from . import manoeuvre_analysis as analysis
@@ -9,7 +9,7 @@ from joblib import Parallel, delayed
 import os
 import pandas as pd
 from importlib.metadata import version
-import geometry as g
+from packaging import version as pkgversion
 
 
 class ScheduleAnalysis(Collection):
@@ -22,10 +22,8 @@ class ScheduleAnalysis(Collection):
 
     @staticmethod
     def from_fcj(file: Union[str, dict], info: ScheduleInfo=None) -> ScheduleAnalysis:
-        if isinstance(file, str):
-            data = load(open(file, 'r'))
-        else:
-            data = file
+        data = load(open(file, 'r')) if isinstance(file, str) else file
+
         flight = Flight.from_fc_json(data)
         
         if info is None:
@@ -33,25 +31,50 @@ class ScheduleAnalysis(Collection):
         
         sdef = SchedDef.load(info)
         box = Origin.from_fcjson_parmameters(data["parameters"])
-        state = State.from_flight(flight, box).splitter_labels(
-            data["mans"],
-            sdef.uids
-        )
+        state = State.from_flight(flight, box).splitter_labels(data["mans"],sdef.uids)
         direction = -state.get_manoeuvre(1)[0].direction()[0]
 
-        return ScheduleAnalysis(
-            [analysis.Basic(
-                i,
-                mdef, 
-                state.get_manoeuvre(mdef.uid), 
-                direction
-            ) for i, mdef in enumerate(sdef)],
-            info
-        )
+        if 'fcs_scores' in data:
+            versions = [pkgversion.parse(res['fa_version']) for res in data['fcs_scores']]
+            ilatest = versions.index(max(versions))
+
+        mas = []
+        for i, mdef in enumerate(sdef):
+            st = state.get_manoeuvre(mdef.uid)
+
+            if 'fcs_scores' in data and len(data['fcs_scores']) > 0:
+                df = pd.DataFrame(data['fcs_scores'][ilatest]['manresults'][i+1]['els'])
+                st = st.splitter_labels(df.to_dict('records'), target_col='element')
+            
+            mas.append(analysis.Basic(i, mdef, st, direction).proceed())
+
+        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
+
+        new_results = dict(
+            fa_version = version('flightanalysis'),
+            manresults = [None] + \
+                [man.fcj_results() if hasattr(man, 'fcj_results') else None for man in self]
+        )
+
+        if 'fcs_scores' not in data:
+            data['fcs_scores'] = []
+
+        for res in data['fcs_scores']:
+            if res['fa_version'] == new_results['fa_version']:
+                res['manresults'] = new_results['manresults']
+                break
+        else:
+            data['fcs_scores'].append(new_results)
+
+        return data
+        
+
     def run_all(self) -> Self:
         def parse_analyse_serialise(pad):
-            res = analysis.Basic.from_dict(pad).run_all()
+            res = analysis.parse_dict(pad).run_all()
             logger.info(f'Completed {res.name}')
             return res.to_dict()
         
@@ -73,23 +96,6 @@ class ScheduleAnalysis(Collection):
         madicts = Parallel(n_jobs=os.cpu_count())(delayed(parse_analyse_serialise)(mad) for mad in inmadicts)
         return ScheduleAnalysis([analysis.Scored.from_dict(mad) for mad in madicts], self.sinfo)
     
-    @staticmethod
-    def from_fcscore(file: Union[str, dict], fallback=True) -> ScheduleAnalysis:
-        if isinstance(file, str) or isinstance(file, os.PathLike):
-            data = load(open(file, 'r'))
-        else:
-            data = file
-        sinfo = ScheduleInfo(**data['sinfo'])
-        sdef = SchedDef.load(sinfo)
-
-        mas = []
-        for mdef in sdef:
-            mas.append(analysis.Scored.from_dict(
-                data['data'][mdef.info.short_name],
-                fallback
-            ))
-
-        return ScheduleAnalysis(mas, sinfo)
     
     def scores(self):
         scores = {}
@@ -101,16 +107,4 @@ class ScheduleAnalysis(Collection):
     def summarydf(self):
         return pd.DataFrame([ma.scores.summary() if hasattr(ma, 'scores') else {} for ma in self])
 
-    def to_fcscore(self, name: str) -> dict:        
-        total, scores = self.scores()
-       
-        odata = dict(
-            name = name,
-            client_version = 'Py',
-            server_version = version('flightanalysis'),
-            sinfo = self.sinfo.__dict__,
-            score = total,
-            manscores = scores,
-            data = self.to_dict()
-        )
-        return odata
+    

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

@@ -8,6 +8,16 @@ from flightanalysis.scoring.measurement import Measurement
 from dataclasses import dataclass
 
 
+def ease(val, factor=3):
+    '''factor == 3 for hard / no easement'''
+    b = 1.3 - factor*0.1
+    m = 6 / 6**b
+    return m * val**b
+
+def trunc(val):
+    return np.floor(val * 2) / 2
+
+
 @dataclass
 class Result:
     """
@@ -25,6 +35,10 @@ class Result:
     def total(self):
         return float(sum(self.dgs))
     
+    def score(self, difficulty=3, truncate: None | str=None):
+        res = sum(ease(self.dgs, difficulty))
+        return trunc(res) if truncate=='result' else res
+    
     def to_dict(self):
         return dict(
             name = self.name,
@@ -99,6 +113,10 @@ class Results(Collection):
     VType = Result
     uid="name"
 
+    def score(self, difficulty=3, truncate: None | str=False):
+        res = sum([r.score(difficulty, truncate) for r in self])
+        return trunc(res) if truncate=='results' else res
+
     def __init__(self, name, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.name = name
@@ -143,6 +161,9 @@ class ElementsResults(Collection):
     VType=Results
     uid="name"
 
+    def score(self, difficulty=3, truncate=False):
+        return sum([r.score(difficulty, truncate) for r in self])
+    
     @property
     def total(self):
         return sum([r.total for r in self])
@@ -181,8 +202,19 @@ class ManoeuvreResults:
     def summary(self):
         return {k: v.total for k, v in self.__dict__.items() if v is not None} 
 
-    def score(self):
-        return max(0, 10 - sum([v for v in self.summary().values()]))
+    def score_summary(self, difficulty, truncate):
+        intra=self.intra.score(difficulty, 'results' if truncate else None)
+        inter=self.inter.score(difficulty, 'result' if truncate else None)
+        positioning=self.positioning.score(difficulty, 'result' if truncate else None)
+        return dict(
+            intra=intra,
+            inter=inter,
+            positioning=positioning,
+            total=10 - intra - inter - positioning
+        )
+
+    def score(self, difficulty=3, truncate: bool=False):
+        return self.score_summary(difficulty, truncate)['total']
     
     def to_dict(self):
         return dict(
@@ -199,4 +231,17 @@ class ManoeuvreResults:
             Results.from_dict(data['inter']),
             ElementsResults.from_dict(data['intra']),
             Results.from_dict(data['positioning']),
-        )
+        )
+    
+    def fcj_results(self):
+        res = []
+        for diff in [1,2,3]:
+            for trunc in [False, True]:
+                res.append(dict(
+                    score=self.score_summary(diff, trunc),
+                    properties=dict(
+                        difficulty=diff,
+                        truncate=trunc
+                    )                    
+                ))
+        return res

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightanalysis
-Version: 0.2.14
+Version: 0.2.15
 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.13
+Requires-Dist: flightdata>=0.2.14
 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.13; extra == "dev"
+Requires-Dist: flightdata>=0.2.14; extra == "dev"
 Requires-Dist: ardupilot_log_reader>=0.3.1; extra == "dev"
 Requires-Dist: pymavlink; extra == "dev"
 

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

@@ -6,7 +6,7 @@ simplejson
 loguru
 joblib
 pfc-geometry>=0.2.6
-flightdata>=0.2.13
+flightdata>=0.2.14
 
 [dev]
 numpy
@@ -17,6 +17,6 @@ simplejson
 loguru
 joblib
 pfc-geometry>=0.2.6
-flightdata>=0.2.13
+flightdata>=0.2.14
 ardupilot_log_reader>=0.3.1
 pymavlink

{flightanalysis-0.2.14 → flightanalysis-0.2.15}/requirements-dev.txt

@@ -6,6 +6,6 @@ simplejson
 loguru
 joblib
 pfc-geometry>=0.2.6
-flightdata>=0.2.13
+flightdata>=0.2.14
 ardupilot_log_reader>=0.3.1
 pymavlink

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

@@ -6,4 +6,4 @@ simplejson
 loguru
 joblib
 pfc-geometry>=0.2.6
-flightdata>=0.2.13
+flightdata>=0.2.14