X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosFlightStats.java;h=2b6530c8d0c04458d0751dd181b24c7fc85dcca7;hp=f48e6be6077d8cb5a85b935624c92aa955362195;hb=0da4e201041a4420f273c2e0cda77eea78099518;hpb=b6b5c64f93fa56bcb22ea1c4279e4f754e6e6f1c diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java index f48e6be6..2b6530c8 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_11; +package org.altusmetrum.altoslib_12; import java.io.*; @@ -25,15 +25,18 @@ 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_start = new double[AltosLib.ao_flight_invalid + 1]; + public double[] state_end = 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; @@ -67,10 +70,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 +95,9 @@ public class AltosFlightStats { } } } + + if (landed_time == AltosLib.MISSING) + landed_time = landed_state_time; return landed_time; } @@ -116,18 +121,37 @@ public class AltosFlightStats { break; } } + if (boost_time == AltosLib.MISSING) + boost_time = boost_state_time; return boost_time; } 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) { + state.time = boost_time; + fixed_boost = true; + } + if ((int) state.value == AltosLib.ao_flight_landed) + if (landed_time != AltosLib.MISSING) { + state.time = landed_time; + fixed_landed = true; + } + } + } + year = month = day = AltosLib.MISSING; hour = minute = second = AltosLib.MISSING; serial = flight = AltosLib.MISSING; @@ -142,29 +166,36 @@ 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] = state_accel[s] = state_start[s] = state_end[s] = AltosLib.MISSING; + + if (series.state_series != 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]); + } } + product = cal_data.product; + firmware_version = cal_data.firmware_version; serial = cal_data.serial; flight = cal_data.flight; @@ -173,7 +204,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 +228,28 @@ 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(); - + if (series.gps_height != null) { + AltosTimeValue tv = series.gps_height.max(); + if (tv != null) + max_gps_height = tv.value; + } } }