X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosFlightStats.java;h=7c8ed85e589d7f89623c116b7f32d2830d0d070e;hp=2b6530c8d0c04458d0751dd181b24c7fc85dcca7;hb=378ebab2e70917b4182cbd840a3fa66e4e42fd92;hpb=0da4e201041a4420f273c2e0cda77eea78099518 diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java index 2b6530c8..7c8ed85e 100644 --- a/altoslib/AltosFlightStats.java +++ b/altoslib/AltosFlightStats.java @@ -16,7 +16,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_12; +package org.altusmetrum.altoslib_13; import java.io.*; @@ -26,9 +26,11 @@ public class AltosFlightStats { public double max_speed; public double max_acceleration; public double[] state_speed = new double[AltosLib.ao_flight_invalid + 1]; + public double[] state_enter_speed = new double[AltosLib.ao_flight_invalid + 1]; + public double[] state_enter_height = new double[AltosLib.ao_flight_invalid + 1]; + public double[] state_enter_gps_height = new double[AltosLib.ao_flight_invalid + 1]; public double[] state_accel = new double[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_time = new double[AltosLib.ao_flight_invalid + 1]; public String product; public String firmware_version; public int serial; @@ -54,11 +56,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; } } } @@ -96,7 +101,7 @@ public class AltosFlightStats { } } - if (landed_time == AltosLib.MISSING) + if (landed_time == AltosLib.MISSING || (prev_state_time != AltosLib.MISSING && landed_time < prev_state_time)) landed_time = landed_state_time; return landed_time; } @@ -126,6 +131,35 @@ public class AltosFlightStats { 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) { + if (state_enter_speed[state] == AltosLib.MISSING) + state_enter_speed[state] = series.speed_series.value(start_time); + if (state_enter_height[state] == AltosLib.MISSING) + state_enter_height[state] = series.height_series.value(start_time); + if (state_enter_gps_height[state] == AltosLib.MISSING) + if (series.gps_height != null) + state_enter_gps_height[state] = series.gps_height.value(start_time); + 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(); @@ -140,12 +174,12 @@ public class AltosFlightStats { boolean fixed_landed = false; for (AltosTimeValue state : series.state_series) { if ((int) state.value == AltosLib.ao_flight_boost) - if (boost_time != AltosLib.MISSING) { + 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) { + if (landed_time != AltosLib.MISSING && !fixed_landed) { state.time = landed_time; fixed_landed = true; } @@ -166,34 +200,39 @@ public class AltosFlightStats { has_mag = false; has_orient = false; - for (int s = 0; s < AltosLib.ao_flight_invalid + 1; s++) - state_speed[s] = state_accel[s] = state_start[s] = state_end[s] = AltosLib.MISSING; + for (int s = 0; s < AltosLib.ao_flight_invalid + 1; s++) { + state_speed[s] = AltosLib.MISSING; + state_enter_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) { - int s = (int) state.value; - - if (s < AltosLib.ao_flight_startup && AltosLib.ao_flight_landed < s) - continue; - - if (s == AltosLib.ao_flight_boost) - state_start[s] = boost_time; - else - state_start[s] = series.state_series.time_of(s); - - if (s == AltosLib.ao_flight_main) - state_end[s] = landed_time; - else - state_end[s] = series.state_series.time_of(s+1); - - 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]); + if (prev != null) + add_times(series, (int) prev.value, prev.time, state.time); + prev = state; + } + if (prev != null) { + AltosTimeValue last_accel = series.accel_series.last(); + if (last_accel != null) + add_times(series, (int) prev.value, prev.time, last_accel.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; @@ -216,35 +255,20 @@ public class AltosFlightStats { has_gps = true; lat = pad_lat = gps.lat; lon = pad_lon = gps.lon; - for (AltosGPSTimeValue gtv : series.gps_series) { - gps = gtv.gps; - if (gps.locked && gps.nsat >= 4) { - lat = gps.lat; - lon = gps.lon; + if (series.gps_series != null) { + for (AltosGPSTimeValue gtv : series.gps_series) { + gps = gtv.gps; + if (gps.locked && gps.nsat >= 4) { + lat = gps.lat; + lon = gps.lon; + } } } - } - max_height = AltosLib.MISSING; - if (series.height_series != null) + max_height = series.max_height; + if (max_height == AltosLib.MISSING && series.height_series != null) max_height = series.height_series.max().value; - max_speed = AltosLib.MISSING; - if (series.speed_series != null) { - 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) { - 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) { AltosTimeValue tv = series.gps_height.max();