X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTimeSeries.java;h=b5d831be0b6fff843684ff7949fcfa109f3e0d7c;hb=a61217f0a6d0ef48b6471f632c4600255867e831;hp=142c30ef2d794818b455b17ca59533b28cdf6533;hpb=2e82051a6aaaccf1e8a242f9c8141e4167e652d2;p=fw%2Faltos

diff --git a/altoslib/AltosTimeSeries.java b/altoslib/AltosTimeSeries.java
index 142c30ef..b5d831be 100644
--- a/altoslib/AltosTimeSeries.java
+++ b/altoslib/AltosTimeSeries.java
@@ -12,15 +12,19 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.util.*;
 
-public class AltosTimeSeries implements Iterable<AltosTimeValue> {
+public class AltosTimeSeries implements Iterable<AltosTimeValue>, Comparable<AltosTimeSeries> {
 	public String			label;
 	public AltosUnits		units;
 	ArrayList<AltosTimeValue>	values;
 
+	public int compareTo(AltosTimeSeries other) {
+		return label.compareTo(other.label);
+	}
+
 	public void add(AltosTimeValue tv) {
 		values.add(tv);
 	}
@@ -38,7 +42,7 @@ public class AltosTimeSeries implements Iterable<AltosTimeValue> {
 		if (v0.time == v1.time)
 			return (v0.value + v1.value) / 2;
 
-		return (v0.value * (v1.time - t) + v1.value * (t - v0.time)) / v1.time - v0.time;
+		return (v0.value * (v1.time - t) + v1.value * (t - v0.time)) / (v1.time - v0.time);
 	}
 
 	private int after_index(double time) {
@@ -59,12 +63,18 @@ public class AltosTimeSeries implements Iterable<AltosTimeValue> {
 	/* Compute a value for an arbitrary time */
 	public double value(double time) {
 		int after = after_index(time);
-		if (after == 0)
-			return values.get(0).value;
-		if (after == values.size())
-			return values.get(after - 1).value;
+		double ret;
 
-		return lerp(values.get(after-1), values.get(after), time);
+		if (after == 0)
+			ret = values.get(0).value;
+		else if (after == values.size())
+			ret = values.get(after - 1).value;
+		else {
+			AltosTimeValue b = values.get(after-1);
+			AltosTimeValue a = values.get(after);
+			ret = lerp(b, a, time);
+		}
+		return ret;
 	}
 
 	/* Find the value just before an arbitrary time */
@@ -103,40 +113,39 @@ public class AltosTimeSeries implements Iterable<AltosTimeValue> {
 		return values.iterator();
 	}
 
-	public double max() {
-		double max = AltosLib.MISSING;
-		for (AltosTimeValue tv : values) {
-			if (max == AltosLib.MISSING || tv.value > max)
-				max = tv.value;
-		}
+	public AltosTimeValue max() {
+		AltosTimeValue max = null;
+		for (AltosTimeValue tv : values)
+			if (max == null || tv.value > max.value)
+				max = tv;
 		return max;
 	}
 
-	public double max(double start_time, double end_time) {
-		double max = AltosLib.MISSING;
+	public AltosTimeValue max(double start_time, double end_time) {
+		AltosTimeValue max = null;
 		for (AltosTimeValue tv : values) {
 			if (start_time <= tv.time && tv.time <= end_time)
-				if (max == AltosLib.MISSING || tv.value > max)
-					max = tv.value;
+				if (max == null || tv.value > max.value)
+					max = tv;
 		}
 		return max;
 	}
 
-	public double min() {
-		double min = AltosLib.MISSING;
+	public AltosTimeValue min() {
+		AltosTimeValue min = null;
 		for (AltosTimeValue tv : values) {
-			if (min == AltosLib.MISSING || tv.value < min)
-				min = tv.value;
+			if (min == null || tv.value < min.value)
+				min = tv;
 		}
 		return min;
 	}
 
-	public double min(double start_time, double end_time) {
-		double min = AltosLib.MISSING;
+	public AltosTimeValue min(double start_time, double end_time) {
+		AltosTimeValue min = null;
 		for (AltosTimeValue tv : values) {
 			if (start_time <= tv.time && tv.time <= end_time)
-				if (min == AltosLib.MISSING || tv.value < min)
-					min = tv.value;
+				if (min == null || tv.value < min.value)
+					min = tv;
 		}
 		return min;
 	}
@@ -182,7 +191,6 @@ public class AltosTimeSeries implements Iterable<AltosTimeValue> {
 			}
 			pvalue = v.value;
 			time = v.time;
-//			System.out.printf("%g %g %g\n", time, v.value, value);
 			integral.add(time, value);
 
 		}
@@ -261,9 +269,11 @@ public class AltosTimeSeries implements Iterable<AltosTimeValue> {
 					double	j_right = j == right ? right_time : values.get(j+1).time;
 					double	interval = (j_right - j_left) / 2.0;
 					double	coeff = filter_coeff(j_time - center_time, width) * interval;
+					double	value = values.get(j).value;
+					double	partial = value * coeff;
 
 					total_coeff += coeff;
-					total_value += coeff * values.get(j).value;
+					total_value += partial;
 				}
 			}
 			if (total_coeff != 0.0)