altoslib: fix adjustment of landed time
[fw/altos] / altoslib / AltosFlightStats.java
index f48e6be6077d8cb5a85b935624c92aa955362195..6f8732cf5c25af479793e670fb256b6dc3312cfe 100644 (file)
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 
@@ -25,15 +25,17 @@ public class AltosFlightStats {
        public double           max_gps_height;
        public double           max_speed;
        public double           max_acceleration;
-       public double[] state_speed = new double[AltosLib.ao_flight_invalid + 1];
-       public double[] state_accel = new double[AltosLib.ao_flight_invalid + 1];
-       public int[]            state_count = new int[AltosLib.ao_flight_invalid + 1];
-       public double[] state_start = new double[AltosLib.ao_flight_invalid + 1];
-       public double[] state_end = new double[AltosLib.ao_flight_invalid + 1];
+       public double[]         state_speed = new double[AltosLib.ao_flight_invalid + 1];
+       public double[]         state_accel = new double[AltosLib.ao_flight_invalid + 1];
+       public double[]         state_time = new double[AltosLib.ao_flight_invalid + 1];
+       public String           product;
+       public String           firmware_version;
        public int              serial;
        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,11 +53,14 @@ public class AltosFlightStats {
        double landed_time(AltosFlightSeries series) {
                double  landed_state_time = AltosLib.MISSING;
 
+               double  prev_state_time = AltosLib.MISSING;
                if (series.state_series != null) {
                        for (AltosTimeValue state : series.state_series) {
                                if (state.value == AltosLib.ao_flight_landed) {
                                        landed_state_time = state.time;
                                        break;
+                               } else {
+                                       prev_state_time = state.time;
                                }
                        }
                }
@@ -67,10 +72,9 @@ public class AltosFlightStats {
 
                if (series.height_series != null) {
                        for (AltosTimeValue height : series.height_series) {
-                               if (height.time >= landed_state_time) {
-                                       landed_height = height.value;
+                               landed_height = height.value;
+                               if (height.time >= landed_state_time)
                                        break;
-                               }
                        }
                }
 
@@ -93,6 +97,9 @@ public class AltosFlightStats {
                                }
                        }
                }
+
+               if (landed_time == AltosLib.MISSING || (prev_state_time != AltosLib.MISSING && landed_time < prev_state_time))
+                       landed_time = landed_state_time;
                return landed_time;
        }
 
@@ -116,18 +123,59 @@ public class AltosFlightStats {
                                        break;
                        }
                }
+               if (boost_time == AltosLib.MISSING)
+                       boost_time = boost_state_time;
                return boost_time;
        }
 
+       private void add_times(AltosFlightSeries series, int state, double start_time, double end_time) {
+               double delta_time = end_time - start_time;
+               if (0 <= state && state <= AltosLib.ao_flight_invalid && delta_time > 0) {
+                       speeds[state].value += series.speed_series.average(start_time, end_time) * delta_time;
+                       speeds[state].time += delta_time;
+                       accels[state].value += series.accel_series.average(start_time, end_time) * delta_time;
+                       accels[state].time += delta_time;
+                       state_time[state] += delta_time;
+
+                       if (state == AltosLib.ao_flight_boost) {
+                               AltosTimeValue tv_speed = series.speed_series.max(start_time, end_time);
+                               if (tv_speed != null && (max_speed == AltosLib.MISSING || tv_speed.value > max_speed))
+                                       max_speed = tv_speed.value;
+                               AltosTimeValue tv_accel = series.accel_series.max(start_time, end_time);
+                               if (tv_accel != null && (max_acceleration == AltosLib.MISSING || tv_accel.value > max_acceleration))
+                                       max_acceleration = tv_accel.value;
+                       }
+               }
+       }
+
+       AltosTimeValue[]        speeds = new AltosTimeValue[AltosLib.ao_flight_invalid + 1];
+       AltosTimeValue[]        accels = new AltosTimeValue[AltosLib.ao_flight_invalid + 1];
 
        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);
+               AltosCalData    cal_data = series.cal_data();
 
                series.finish();
 
+               boost_time = boost_time(series);
+               landed_time = landed_time(series);
+
+               if (series.state_series != null){
+                       boolean fixed_boost = false;
+                       boolean fixed_landed = false;
+                       for (AltosTimeValue state : series.state_series) {
+                               if ((int) state.value == AltosLib.ao_flight_boost)
+                                       if (boost_time != AltosLib.MISSING && !fixed_boost) {
+                                               state.time = boost_time;
+                                               fixed_boost = true;
+                                       }
+                               if ((int) state.value == AltosLib.ao_flight_landed)
+                                       if (landed_time != AltosLib.MISSING && !fixed_landed) {
+                                               state.time = landed_time;
+                                               fixed_landed = true;
+                                       }
+                       }
+               }
+
                year = month = day = AltosLib.MISSING;
                hour = minute = second = AltosLib.MISSING;
                serial = flight = AltosLib.MISSING;
@@ -142,29 +190,37 @@ public class AltosFlightStats {
                has_mag = false;
                has_orient = false;
 
-               for (int s = AltosLib.ao_flight_startup; s <= AltosLib.ao_flight_landed; s++) {
-                       state_count[s] = 0;
-
-                       if (s == AltosLib.ao_flight_boost)
-                               state_start[s] = boost_time;
-                       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 if (series.state_series != null)
-                               state_end[s] = series.state_series.time_of(s+1);
-                       else
-                               state_end[s] = AltosLib.MISSING;
-
-                       if (series.speed_series != null)
-                               state_speed[s] = series.speed_series.average(state_start[s], state_end[s]);
-
-                       if (series.accel_series != null)
-                               state_accel[s] = series.accel_series.average(state_start[s], state_end[s]);
+               for (int s = 0; s < AltosLib.ao_flight_invalid + 1; s++) {
+                       state_speed[s] = AltosLib.MISSING;
+                       state_accel[s] = AltosLib.MISSING;
+                       state_time[s] = 0;
+                       speeds[s] = new AltosTimeValue(0, 0);
+                       accels[s] = new AltosTimeValue(0, 0);
+               }
+
+               max_speed = AltosLib.MISSING;
+               max_acceleration = AltosLib.MISSING;
+
+               if (series.state_series != null) {
+                       AltosTimeValue prev = null;
+                       for (AltosTimeValue state : series.state_series) {
+                               if (prev != null)
+                                       add_times(series, (int) prev.value, prev.time, state.time);
+                               prev = state;
+                       }
+                       if (prev != null)
+                               add_times(series, (int) prev.value, prev.time, series.accel_series.last().time);
+               }
+
+               for (int s = 0; s <= AltosLib.ao_flight_invalid; s++) {
+                       if (speeds[s].time > 0)
+                               state_speed[s] = speeds[s].value / speeds[s].time;
+                       if (accels[s].time > 0)
+                               state_accel[s] = accels[s].value / accels[s].time;
                }
 
+               product = cal_data.product;
+               firmware_version = cal_data.firmware_version;
                serial = cal_data.serial;
                flight = cal_data.flight;
 
@@ -173,7 +229,7 @@ public class AltosFlightStats {
                has_rssi = series.rssi_series != null;
                has_flight_data = series.pressure_series != null;
 
-               AltosGPS gps = series.cal_data.gps_pad;
+               AltosGPS gps = series.cal_data().gps_pad;
 
                if (gps != null) {
                        year = gps.year;
@@ -197,22 +253,12 @@ public class AltosFlightStats {
 
                max_height = AltosLib.MISSING;
                if (series.height_series != null)
-                       max_height = series.height_series.max();
-               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();
-               }
-               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();
-               }
+                       max_height = series.height_series.max().value;
                max_gps_height = AltosLib.MISSING;
-               if (series.gps_height != null)
-                       max_gps_height = series.gps_height.max();
-
+               if (series.gps_height != null) {
+                       AltosTimeValue tv = series.gps_height.max();
+                       if (tv != null)
+                               max_gps_height = tv.value;
+               }
        }
 }