flightanalysis 0.2.11__tar.gz → 0.2.12__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightanalysis
-Version: 0.2.11
+Version: 0.2.12
 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.12}/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(

{flightanalysis-0.2.11 → flightanalysis-0.2.12}/flightanalysis/definition/manparm.py

@@ -70,7 +70,6 @@ class ManParm(Opp):
 
         return Point.concatenate([Point.concatenate([v[0] for v in vi]).mean() for vi in vis ]), [np.mean([v[1]for v in vi]) for vi in vis]
 
-
     def get_downgrades(self, els, state: State):
         coll = self.collect(els)
         values = list(coll.values())
@@ -80,7 +79,7 @@ class ManParm(Opp):
             values,
             self.defaul,
             direction,
-            vis
+            [vis[0]] + [min(va, vb) for va, vb in zip(vis[:-1], vis[1:])]
         )
 
         keys, errors, dgs = self.criteria(list(coll.keys()), list(coll.values())) 

{flightanalysis-0.2.11 → flightanalysis-0.2.12}/flightanalysis/scoring/criteria/intra/continuous.py

@@ -58,17 +58,23 @@ class Continuous(Criteria):
         outd[:ldf] = np.linspace(np.mean(data[:ldf]), conv[0],ldf+1)[:-1]
         outd[-ldc:] = np.linspace(conv[-1], np.mean(data[-ldc:]), ldc+1)[1:]
         return outd
-
-
+    
+    @staticmethod
+    def convolve_wind(data, window_ratio, max_window):
+        window = min(len(data)//window_ratio, max_window)
+        sample = Continuous.convolve(data, window)
+        _mean = np.mean(sample)
+        sample = (sample - _mean) * window / max_window + _mean
+        return sample 
+    
 class ContAbs(Continuous):
     def prepare(self, values: npt.NDArray, expected: float):
-#        window = 30
         sample = values - expected
         if len(sample) <= 8:
             return np.linspace(values[0],values[-1], len(sample))
         else:
-            return Continuous.convolve(sample, min(len(values)//3, 40))
-
+            return Continuous.convolve_wind(values, 3, 40)
+        
     @staticmethod
     def mistakes(data, peaks, troughs):
         '''All increases away from zero are downgraded (only peaks)'''
@@ -85,7 +91,6 @@ class ContAbs(Continuous):
 class ContRat(Continuous):
     
     def prepare(self, values: npt.NDArray, expected: float):
-        #window = 40
         if len(values) <= 8:
             return np.abs(np.linspace(
                 np.mean(values[:1+len(values)//3]), 
@@ -93,8 +98,8 @@ class ContRat(Continuous):
                 len(values)
             ))
         else:
-            return np.abs(Continuous.convolve(values, min(len(values)//3, 40)))
-            
+            return np.abs(Continuous.convolve_wind(values, 3, 40))
+
     @staticmethod
     def mistakes(data, peaks, troughs):
         '''All changes are downgraded (peaks and troughs)'''

{flightanalysis-0.2.11 → flightanalysis-0.2.12}/flightanalysis/scripts/batch_analyse.py

@@ -51,4 +51,8 @@ def main():
                 dump(sa.to_fcscore(file.stem), 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}')
+            logger.error(f'Error processing {file}: {e}')
+
+
+if __name__ == '__main__':
+    main()

{flightanalysis-0.2.11 → flightanalysis-0.2.12}/flightanalysis/scripts/collect_scores.py

@@ -5,7 +5,7 @@ import argparse
 import pandas as pd 
 from flightanalysis import ScheduleAnalysis
 from datetime import datetime
-
+from flightanalysis.scripts.plot_scores import plot_logs
 
 def main():
     logger.remove()
@@ -46,3 +46,8 @@ def main():
 
         res.to_csv(args.outfile.replace('_scores.csv', f'_{sch}_scores.csv'))
 
+    plot_logs([args.outfile.replace('_scores.csv', f'_{sch}_scores.csv') for sch in dfs.keys()])
+
+
+if __name__ == "__main__":
+    main()

flightanalysis-0.2.12/flightanalysis/scripts/plot_scores.py

@@ -0,0 +1,46 @@
+import pandas as pd
+from pathlib import Path
+import plotly.express as px
+import re
+from datetime import date
+from plotly_templates.aiaa import aiaa_template
+import argparse
+
+
+def parse_name(file):
+    data = re.findall(r"\w\d\d_\d\d_\d\d_\d\d+_\S+_",file)[0].split('_')
+    return data[0], date(int(data[1]) + 2000, int(data[2]), int(data[3])) , data[4]
+
+def plot_logs(files):
+    
+    data = pd.concat([pd.read_csv(file).assign(csv=file) for file in files], axis=0).reset_index(drop=True)
+    index_df = pd.DataFrame(list(data.source_file.apply(parse_name)), columns=['schedule', 'date', 'name'])
+
+    data = pd.concat([
+        index_df, 
+        data], axis=1)
+    px.scatter(
+        data, 
+        x='date', 
+        y='total',
+        color = 'csv',
+    ).update_layout(
+        template=aiaa_template,
+        yaxis=dict(range=(0,500), title='Total Score'), 
+        xaxis=dict(title='date'), 
+        title=f'Scores from a Set of {data.schedule.unique()} Flights',
+        width=1000, height=600
+    ).update_traces(
+        marker=dict(size=10)
+    ).show()
+
+def main():
+    parser = argparse.ArgumentParser(description='Collect scores for all analysis jsons in a directory')
+    parser.add_argument('-f', '--files', default=list(Path('.').glob('*.csv')), help='Source files, defaults to None for all csvs in current directory')
+    args = parser.parse_args()
+
+    return plot_logs(args.files)
+
+
+if __name__ == "__main__":
+    main()

{flightanalysis-0.2.11 → flightanalysis-0.2.12}/flightanalysis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightanalysis
-Version: 0.2.11
+Version: 0.2.12
 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.12}/flightanalysis.egg-info/SOURCES.txt

@@ -92,6 +92,7 @@ flightanalysis/scoring/criteria/intra/continuous.py
 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

{flightanalysis-0.2.11 → flightanalysis-0.2.12}/flightanalysis.egg-info/entry_points.txt

@@ -1,3 +1,4 @@
 [console_scripts]
 batch_analyse = flightanalysis.scripts.batch_analyse:main
 collect_scores = flightanalysis.scripts.collect_scores:main
+plot_scores = flightanalysis.scripts.plot_scores:main

{flightanalysis-0.2.11 → flightanalysis-0.2.12}/flightanalysis.egg-info/requires.txt

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

{flightanalysis-0.2.11 → flightanalysis-0.2.12}/pyproject.toml

@@ -18,6 +18,7 @@ dynamic = ["version", "dependencies", "optional-dependencies"]
 [project.scripts]
 batch_analyse = "flightanalysis.scripts.batch_analyse:main"
 collect_scores = "flightanalysis.scripts.collect_scores:main"
+plot_scores = "flightanalysis.scripts.plot_scores:main"
 
 [tool.setuptools.dynamic]
 dependencies = {file = ["requirements.txt"]}

{flightanalysis-0.2.11 → flightanalysis-0.2.12}/requirements-dev.txt

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

{flightanalysis-0.2.11 → flightanalysis-0.2.12}/requirements.txt

@@ -6,4 +6,4 @@ simplejson
 loguru
 joblib
 pfc-geometry>=0.2.6
-flightdata>=0.2.10
+flightdata>=0.2.11