X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altoslib%2FAltosTimeSeries.java;h=5cf46c9ab888038ca2dd937aafdbcb1d340b2839;hb=5c4e473ef5d13da9c2f356702cb8767b55aa2137;hp=64fb399e8a23974797f01f94e2327840be4e8bcd;hpb=3d29882f5c70e627b0bbfe42c0a31d6cb5f6b6bf;p=fw%2Faltos

diff --git a/altoslib/AltosTimeSeries.java b/altoslib/AltosTimeSeries.java
index 64fb399e..5cf46c9a 100644
--- a/altoslib/AltosTimeSeries.java
+++ b/altoslib/AltosTimeSeries.java
@@ -16,11 +16,15 @@ package org.altusmetrum.altoslib_11;
 
 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);
 	}
@@ -109,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;
 	}
@@ -266,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)