X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosFlightStats.java;h=744c58483b9b692e2e610f72e993a3bb7318099a;hb=8d6376c673af4648d494c1be71ad40380667bd25;hp=32beb8b563c5c552459ec7b3ccc962af8daa9e7d;hpb=fd738d47bbc46d36698350d5450abe1125d990a3;p=fw%2Faltos

diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java
index 32beb8b5..744c5848 100644
--- a/altoslib/AltosFlightStats.java
+++ b/altoslib/AltosFlightStats.java
@@ -30,10 +30,14 @@ public class AltosFlightStats {
 	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 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,21 +55,25 @@ public class AltosFlightStats {
 	double landed_time(AltosFlightSeries series) {
 		double	landed_state_time = AltosLib.MISSING;
 
-		for (AltosTimeValue state : series.state_series) {
-			if (state.value == AltosLib.ao_flight_landed) {
-				landed_state_time = state.time;
-				break;
+		if (series.state_series != null) {
+			for (AltosTimeValue state : series.state_series) {
+				if (state.value == AltosLib.ao_flight_landed) {
+					landed_state_time = state.time;
+					break;
+				}
 			}
 		}
 
-		if (landed_state_time == AltosLib.MISSING)
+		if (landed_state_time == AltosLib.MISSING && series.height_series != null)
 			landed_state_time = series.height_series.get(series.height_series.size()-1).time;
 
 		double landed_height = AltosLib.MISSING;
-		for (AltosTimeValue height : series.height_series) {
-			if (height.time >= landed_state_time) {
+
+		if (series.height_series != null) {
+			for (AltosTimeValue height : series.height_series) {
 				landed_height = height.value;
-				break;
+				if (height.time >= landed_state_time)
+					break;
 			}
 		}
 
@@ -76,16 +84,21 @@ public class AltosFlightStats {
 
 		double	landed_time = AltosLib.MISSING;
 
-		for (AltosTimeValue height : series.height_series) {
-			if (height.value > landed_height + 10) {
-				above = true;
-			} else {
-				if (above && Math.abs(height.value - landed_height) < 2) {
-					above = false;
-					landed_time = height.time;
+		if (series.height_series != null) {
+			for (AltosTimeValue height : series.height_series) {
+				if (height.value > landed_height + 10) {
+					above = true;
+				} else {
+					if (above && Math.abs(height.value - landed_height) < 2) {
+						above = false;
+						landed_time = height.time;
+					}
 				}
 			}
 		}
+
+		if (landed_time == AltosLib.MISSING)
+			landed_time = landed_state_time;
 		return landed_time;
 	}
 
@@ -93,30 +106,57 @@ public class AltosFlightStats {
 		double 		boost_time = AltosLib.MISSING;
 		double		boost_state_time = AltosLib.MISSING;
 
-		for (AltosTimeValue state : series.state_series) {
-			if (state.value >= AltosLib.ao_flight_boost && state.value <= AltosLib.ao_flight_landed) {
-				boost_state_time = state.time;
-				break;
+		if (series.state_series != null) {
+			for (AltosTimeValue state : series.state_series) {
+				if (state.value >= AltosLib.ao_flight_boost && state.value <= AltosLib.ao_flight_landed) {
+					boost_state_time = state.time;
+					break;
+				}
 			}
 		}
-		for (AltosTimeValue accel : series.accel_series) {
-			if (accel.value < 1)
-				boost_time = accel.time;
-			if (boost_state_time != AltosLib.MISSING && accel.time >= boost_state_time)
-				break;
+		if (series.accel_series != null) {
+			for (AltosTimeValue accel : series.accel_series) {
+				if (accel.value < 1)
+					boost_time = accel.time;
+				if (boost_state_time != AltosLib.MISSING && accel.time >= boost_state_time)
+					break;
+			}
 		}
+		if (boost_time == AltosLib.MISSING)
+			boost_time = boost_state_time;
 		return boost_time;
 	}
 
 
-	public AltosFlightStats(AltosFlightSeries series) throws InterruptedException, IOException {
+	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);
 
 		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;
+					}
+			}
+			if (!fixed_boost && boost_time != AltosLib.MISSING)
+				series.state_series.add(boost_time, AltosLib.ao_flight_boost);
+			if (!fixed_landed && landed_time != AltosLib.MISSING)
+				series.state_series.add(landed_time, AltosLib.ao_flight_landed);
+		}
+
 		year = month = day = AltosLib.MISSING;
 		hour = minute = second = AltosLib.MISSING;
 		serial = flight = AltosLib.MISSING;
@@ -136,12 +176,22 @@ public class AltosFlightStats {
 
 			if (s == AltosLib.ao_flight_boost)
 				state_start[s] = boost_time;
-			else
+			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
+			else if (series.state_series != null)
 				state_end[s] = series.state_series.time_of(s+1);
+			else
+				state_end[s] = AltosLib.MISSING;
+
+			System.out.printf("state %s start %g end %g\n", AltosLib.state_name(s), state_start[s], state_end[s]);
+
+			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]);
@@ -150,6 +200,8 @@ public class AltosFlightStats {
 				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;
 
@@ -182,22 +234,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;
+		}
 	}
 }