projects / fw / altos / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
altoslib: Create data file open helper in AltosLib
[fw/altos] / altoslib / AltosFlightStats.java
diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java
index 32beb8b563c5c552459ec7b3ccc962af8daa9e7d..a6c149080171c3087e9e08a5627a6a1fbba578ab 100644 (file)
--- a/altoslib/AltosFlightStats.java
+++ b/altoslib/AltosFlightStats.java
@@ -34,6 +34,8 @@ public class AltosFlightStats {
        public int              flight;
        public int              year, month, day;
        public int              hour, minute, second;
+       public double           boost_time;
+       public double           landed_time;
        public double           lat, lon;
        public double           pad_lat, pad_lon;
        public boolean          has_flight_data;
@@ -51,21 +53,26 @@ public class AltosFlightStats {
        double landed_time(AltosFlightSeries series) {
                double  landed_state_time = AltosLib.MISSING;
 
-               for (AltosTimeValue state : series.state_series) {
-                       if (state.value == AltosLib.ao_flight_landed) {
-                               landed_state_time = state.time;
-                               break;
+               if (series.state_series != null) {
+                       for (AltosTimeValue state : series.state_series) {
+                               if (state.value == AltosLib.ao_flight_landed) {
+                                       landed_state_time = state.time;
+                                       break;
+                               }
                        }
                }
 
-               if (landed_state_time == AltosLib.MISSING)
+               if (landed_state_time == AltosLib.MISSING && series.height_series != null)
                        landed_state_time = series.height_series.get(series.height_series.size()-1).time;
 
                double landed_height = AltosLib.MISSING;
-               for (AltosTimeValue height : series.height_series) {
-                       if (height.time >= landed_state_time) {
-                               landed_height = height.value;
-                               break;
+
+               if (series.height_series != null) {
+                       for (AltosTimeValue height : series.height_series) {
+                               if (height.time >= landed_state_time) {
+                                       landed_height = height.value;
+                                       break;
+                               }
                        }
                }
 
@@ -76,13 +83,15 @@ public class AltosFlightStats {
 
                double  landed_time = AltosLib.MISSING;
 
-               for (AltosTimeValue height : series.height_series) {
-                       if (height.value > landed_height + 10) {
-                               above = true;
-                       } else {
-                               if (above && Math.abs(height.value - landed_height) < 2) {
-                                       above = false;
-                                       landed_time = height.time;
+               if (series.height_series != null) {
+                       for (AltosTimeValue height : series.height_series) {
+                               if (height.value > landed_height + 10) {
+                                       above = true;
+                               } else {
+                                       if (above && Math.abs(height.value - landed_height) < 2) {
+                                               above = false;
+                                               landed_time = height.time;
+                                       }
                                }
                        }
                }
@@ -93,30 +102,36 @@ public class AltosFlightStats {
                double          boost_time = AltosLib.MISSING;
                double          boost_state_time = AltosLib.MISSING;
 
-               for (AltosTimeValue state : series.state_series) {
-                       if (state.value >= AltosLib.ao_flight_boost && state.value <= AltosLib.ao_flight_landed) {
-                               boost_state_time = state.time;
-                               break;
+               if (series.state_series != null) {
+                       for (AltosTimeValue state : series.state_series) {
+                               if (state.value >= AltosLib.ao_flight_boost && state.value <= AltosLib.ao_flight_landed) {
+                                       boost_state_time = state.time;
+                                       break;
+                               }
                        }
                }
-               for (AltosTimeValue accel : series.accel_series) {
-                       if (accel.value < 1)
-                               boost_time = accel.time;
-                       if (boost_state_time != AltosLib.MISSING && accel.time >= boost_state_time)
-                               break;
+               if (series.accel_series != null) {
+                       for (AltosTimeValue accel : series.accel_series) {
+                               if (accel.value < 1)
+                                       boost_time = accel.time;
+                               if (boost_state_time != AltosLib.MISSING && accel.time >= boost_state_time)
+                                       break;
+                       }
                }
+               if (boost_time == AltosLib.MISSING)
+                       boost_time = boost_state_time;
                return boost_time;
        }
 
 
-       public AltosFlightStats(AltosFlightSeries series) throws InterruptedException, IOException {
+       public AltosFlightStats(AltosFlightSeries series) {
                AltosCalData    cal_data = series.cal_data;
-               double          boost_time = boost_time(series);
-               double          end_time = 0;
-               double          landed_time = landed_time(series);
 
                series.finish();
 
+               boost_time = boost_time(series);
+               landed_time = landed_time(series);
+
                year = month = day = AltosLib.MISSING;
                hour = minute = second = AltosLib.MISSING;
                serial = flight = AltosLib.MISSING;
@@ -136,12 +151,19 @@ public class AltosFlightStats {
 
                        if (s == AltosLib.ao_flight_boost)
                                state_start[s] = boost_time;
-                       else
+                       else if (series.state_series != null)
                                state_start[s] = series.state_series.time_of(s);
+                       else
+                               state_start[s] = AltosLib.MISSING;
                        if (s == AltosLib.ao_flight_main)
                                state_end[s] = landed_time;
-                       else
+                       else if (series.state_series != null)
                                state_end[s] = series.state_series.time_of(s+1);
+                       else
+                               state_end[s] = AltosLib.MISSING;
+
+                       if (state_end[s] > landed_time)
+                               state_end[s] = landed_time;
 
                        if (series.speed_series != null)
                                state_speed[s] = series.speed_series.average(state_start[s], state_end[s]);
@@ -182,22 +204,26 @@ public class AltosFlightStats {
 
                max_height = AltosLib.MISSING;
                if (series.height_series != null)
-                       max_height = series.height_series.max();
+                       max_height = series.height_series.max().value;
                max_speed = AltosLib.MISSING;
                if (series.speed_series != null) {
-                       max_speed = series.speed_series.max(state_start[AltosLib.ao_flight_boost], state_start[AltosLib.ao_flight_drogue]);
-                       if (max_speed == AltosLib.MISSING)
-                               max_speed = series.speed_series.max();
+                       AltosTimeValue tv = series.speed_series.max(state_start[AltosLib.ao_flight_boost], state_start[AltosLib.ao_flight_drogue]);
+                       if (tv == null)
+                               tv = series.speed_series.max();
+                       if (tv != null)
+                               max_speed = tv.value;
                }
                max_acceleration = AltosLib.MISSING;
                if (series.accel_series != null) {
-                       max_acceleration = series.accel_series.max(state_start[AltosLib.ao_flight_boost], state_start[AltosLib.ao_flight_drogue]);
-                       if (max_acceleration == AltosLib.MISSING)
-                               max_acceleration = series.accel_series.max();
+                       AltosTimeValue tv = series.accel_series.max(state_start[AltosLib.ao_flight_boost], state_start[AltosLib.ao_flight_drogue]);
+                       if (tv == null)
+                               tv = series.accel_series.max();
+                       if (tv != null)
+                               max_acceleration = tv.value;
                }
                max_gps_height = AltosLib.MISSING;
                if (series.gps_height != null)
-                       max_gps_height = series.gps_height.max();
+                       max_gps_height = series.gps_height.max().value;
 
        }
 }
AltOS - the operating system for Altus Metrum products