summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--altoslib/AltosFlightSeries.java6
-rw-r--r--altoslib/AltosTimeSeries.java6
2 files changed, 11 insertions, 1 deletions
diff --git a/altoslib/AltosFlightSeries.java b/altoslib/AltosFlightSeries.java
index 315e0a44..5223a5b4 100644
--- a/altoslib/AltosFlightSeries.java
+++ b/altoslib/AltosFlightSeries.java
@@ -118,6 +118,12 @@ public class AltosFlightSeries extends AltosDataListener {
}
public void add_series(AltosTimeSeries s) {
+ for (int e = 0; e < series.size(); e++) {
+ if (s.compareTo(series.get(e)) < 0){
+ series.add(e, s);
+ return;
+ }
+ }
series.add(s);
}
diff --git a/altoslib/AltosTimeSeries.java b/altoslib/AltosTimeSeries.java
index db33fafa..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);
}