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

diff --git a/altoslib/AltosTimeSeries.java b/altoslib/AltosTimeSeries.java
index 30b24d82..142c30ef 100644
--- a/altoslib/AltosTimeSeries.java
+++ b/altoslib/AltosTimeSeries.java
@@ -85,6 +85,16 @@ public class AltosTimeSeries implements Iterable<AltosTimeValue> {
 		return values.get(after).value;
 	}
 
+	public double time_of(double value) {
+		double	last = AltosLib.MISSING;
+		for (AltosTimeValue v : values) {
+			if (v.value >= value)
+				return v.time;
+			last = v.time;
+		}
+		return last;
+	}
+
 	public int size() {
 		return values.size();
 	}
@@ -102,6 +112,16 @@ public class AltosTimeSeries implements Iterable<AltosTimeValue> {
 		return max;
 	}
 
+	public double max(double start_time, double end_time) {
+		double max = AltosLib.MISSING;
+		for (AltosTimeValue tv : values) {
+			if (start_time <= tv.time && tv.time <= end_time)
+				if (max == AltosLib.MISSING || tv.value > max)
+					max = tv.value;
+		}
+		return max;
+	}
+
 	public double min() {
 		double min = AltosLib.MISSING;
 		for (AltosTimeValue tv : values) {
@@ -111,6 +131,42 @@ public class AltosTimeSeries implements Iterable<AltosTimeValue> {
 		return min;
 	}
 
+	public double min(double start_time, double end_time) {
+		double min = AltosLib.MISSING;
+		for (AltosTimeValue tv : values) {
+			if (start_time <= tv.time && tv.time <= end_time)
+				if (min == AltosLib.MISSING || tv.value < min)
+					min = tv.value;
+		}
+		return min;
+	}
+
+	public double average() {
+		double total = 0;
+		int count = 0;
+		for (AltosTimeValue tv : values) {
+			total += tv.value;
+			count++;
+		}
+		if (count == 0)
+			return AltosLib.MISSING;
+		return total / count;
+	}
+
+	public double average(double start_time, double end_time) {
+		double total = 0;
+		int count = 0;
+		for (AltosTimeValue tv : values) {
+			if (start_time <= tv.time && tv.time <= end_time) {
+				total += tv.value;
+				count++;
+			}
+		}
+		if (count == 0)
+			return AltosLib.MISSING;
+		return total / count;
+	}
+
 	public AltosTimeSeries integrate(AltosTimeSeries integral) {
 		double	value = 0.0;
 		double	pvalue = 0.0;