- 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 (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]);
-
- 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]);
+ }