X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightStats.java;h=967f094f3516322f3660416d0d09b9f636324ca5;hp=19471e9fa650847b8af2d5406e3036f8db19f4be;hb=5a3c5de6657d1c26e52015a8acec0cd05e294cef;hpb=4962bcf1ce15c21a946ea718bd676b901f0f2bd0 diff --git a/altosui/AltosFlightStats.java b/altosui/AltosFlightStats.java index 19471e9f..967f094f 100644 --- a/altosui/AltosFlightStats.java +++ b/altosui/AltosFlightStats.java @@ -17,82 +17,137 @@ package altosui; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.filechooser.FileNameExtensionFilter; -import javax.swing.table.*; import java.io.*; -import java.util.*; -import java.text.*; -import java.util.prefs.*; -import java.util.concurrent.*; +import org.altusmetrum.altoslib.*; public class AltosFlightStats { double max_height; double max_speed; double max_acceleration; - double[] state_speed = new double[Altos.ao_flight_invalid + 1]; + double[] state_accel_speed = new double[Altos.ao_flight_invalid + 1]; double[] state_baro_speed = new double[Altos.ao_flight_invalid + 1]; double[] state_accel = new double[Altos.ao_flight_invalid + 1]; int[] state_count = new int[Altos.ao_flight_invalid + 1]; double[] state_start = new double[Altos.ao_flight_invalid + 1]; double[] state_end = new double[Altos.ao_flight_invalid + 1]; + int serial; + int flight; + int year, month, day; + int hour, minute, second; - public AltosFlightStats(AltosFlightReader reader) throws InterruptedException, IOException { + double landed_time(AltosRecordIterable iterable) { AltosState state = null; - AltosState new_state = null; - double boost_time = -1; - double start_time; - - for (;;) { - try { - AltosRecord record = reader.read(); - if (record == null) - break; - new_state = new AltosState(record, state); - if (state == null) { - start_time = new_state.time; - } - state = new_state; - if (0 <= state.state && state.state < Altos.ao_flight_invalid) { - if (boost_time == -1 && state.state >= Altos.ao_flight_boost) - boost_time = state.time; - state_accel[state.state] += state.acceleration; - state_speed[state.state] += state.speed; - state_baro_speed[state.state] += state.baro_speed; - state_count[state.state]++; - if (state_start[state.state] == 0.0) - state_start[state.state] = state.time; - if (state_end[state.state] < state.time) - state_end[state.state] = state.time; - max_height = state.max_height; - if (state.max_speed != 0) - max_speed = state.max_speed; - else - max_speed = state.max_baro_speed; - max_acceleration = state.max_acceleration; + for (AltosRecord record : iterable) { + state = new AltosState(record, state); + + if (state.state == Altos.ao_flight_landed) + break; + } + + double landed_height = state.height; + + state = null; + + boolean above = true; + + double landed_time = -1000; + + for (AltosRecord record : iterable) { + state = new AltosState(record, state); + + if (state.height > landed_height + 10) { + above = true; + } else { + if (above && state.height < landed_height + 2) { + above = false; + landed_time = state.time; } - } catch (ParseException pp) { - System.out.printf("Parse error: %d \"%s\"\n", pp.getErrorOffset(), pp.getMessage()); - } catch (AltosCRCException ce) { + } + } + if (landed_time == -1000) + landed_time = state.time; + return landed_time; + } + + double boost_time(AltosRecordIterable iterable) { + double boost_time = -1000; + + AltosState state = null; + for (AltosRecord record : iterable) { + state = new AltosState(record, state); + + if (state.acceleration < 1) + boost_time = state.time; + if (state.state >= Altos.ao_flight_boost) + break; + } + if (boost_time == -1000) + boost_time = state.time; + return boost_time; + } + + + public AltosFlightStats(AltosRecordIterable iterable) throws InterruptedException, IOException { + AltosState state = null; + AltosState new_state = null; + double boost_time = boost_time(iterable); + double end_time = 0; + double landed_time = landed_time(iterable); + + year = month = day = -1; + hour = minute = second = -1; + serial = flight = -1; + for (AltosRecord record : iterable) { + if (serial < 0) + serial = record.serial; + if ((record.seen & AltosRecord.seen_flight) != 0 && flight < 0) + flight = record.flight; + new_state = new AltosState(record, state); + end_time = new_state.time; + state = new_state; + if (state.time >= boost_time && state.state < Altos.ao_flight_boost) + state.state = Altos.ao_flight_boost; + if (state.time >= landed_time && state.state < Altos.ao_flight_landed) + state.state = Altos.ao_flight_landed; + if (0 <= state.state && state.state < Altos.ao_flight_invalid) { + if (state.state >= Altos.ao_flight_boost) { + if (state.gps != null && state.gps.locked && + year < 0) { + year = state.gps.year; + month = state.gps.month; + day = state.gps.day; + hour = state.gps.hour; + minute = state.gps.minute; + second = state.gps.second; + } + } + state_accel[state.state] += state.acceleration; + state_accel_speed[state.state] += state.accel_speed; + state_baro_speed[state.state] += state.baro_speed; + state_count[state.state]++; + if (state_start[state.state] == 0.0) + state_start[state.state] = state.time; + if (state_end[state.state] < state.time) + state_end[state.state] = state.time; + max_height = state.max_height; + if (state.max_accel_speed != 0) + max_speed = state.max_accel_speed; + else + max_speed = state.max_baro_speed; + max_acceleration = state.max_acceleration; } } for (int s = Altos.ao_flight_startup; s <= Altos.ao_flight_landed; s++) { if (state_count[s] > 0) { - state_speed[s] /= state_count[s]; + state_accel_speed[s] /= state_count[s]; state_baro_speed[s] /= state_count[s]; state_accel[s] /= state_count[s]; } + if (state_start[s] == 0) + state_start[s] = end_time; + if (state_end[s] == 0) + state_end[s] = end_time; } } - - public AltosFlightStats(AltosRecordIterable iterable, File file) throws InterruptedException, IOException { - this(new AltosReplayReader(iterable.iterator(), file)); - } - - public AltosFlightStats(AltosRecordIterable iterable) throws InterruptedException, IOException { - this(iterable, new File("")); - } }