X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosTelemetryIterable.java;h=8cd0c9c7a274c94dfc50672dc972d44b59154023;hp=b7489f77c64d4f4c7efe22a0f24fdac48ff484c2;hb=eaf2ee0f498b519d64e1664a2b8c66c52ac1497c;hpb=f07f6d55edf5b97020680b3ce1d9e00bb3df64a6

diff --git a/altoslib/AltosTelemetryIterable.java b/altoslib/AltosTelemetryIterable.java
index b7489f77..8cd0c9c7 100644
--- a/altoslib/AltosTelemetryIterable.java
+++ b/altoslib/AltosTelemetryIterable.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,40 +16,89 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 import java.util.*;
 import java.text.*;
 
+class AltosTelemetryOrdered implements Comparable<AltosTelemetryOrdered> {
+	AltosTelemetry	telem;
+	int		index;
+	int		tick;
+
+	public int compareTo(AltosTelemetryOrdered o) {
+		int	tick_diff = tick - o.tick;
+
+		if (tick_diff != 0)
+			return tick_diff;
+		return index - o.index;
+	}
+
+	AltosTelemetryOrdered (AltosTelemetry telem, int index, int tick) {
+		this.telem = telem;
+		this.index = index;
+		this.tick = tick;
+	}
+}
+
+class AltosTelemetryOrderedIterator implements Iterator<AltosTelemetry> {
+	Iterator<AltosTelemetryOrdered> iterator;
+
+	public AltosTelemetryOrderedIterator(TreeSet<AltosTelemetryOrdered> telems) {
+		iterator = telems.iterator();
+	}
+
+	public boolean hasNext() {
+		return iterator.hasNext();
+	}
+
+	public AltosTelemetry next() {
+		return iterator.next().telem;
+	}
+
+	public void remove () {
+	}
+}
+
 public class AltosTelemetryIterable implements Iterable<AltosTelemetry> {
-	LinkedList<AltosTelemetry>	telems;
+	TreeSet<AltosTelemetryOrdered>	telems;
+	int tick;
+	int index;
+
+	public void add (AltosTelemetry telem) {
+		int	t = telem.tick();
+		if (!telems.isEmpty()) {
+			while (t < tick - 1000)
+				t += 65536;
+		}
+		tick = t;
+		telems.add(new AltosTelemetryOrdered(telem, index++, tick));
+	}
 
 	public Iterator<AltosTelemetry> iterator () {
-		return telems.iterator();
+		return new AltosTelemetryOrderedIterator(telems);
 	}
 
-	public AltosTelemetryIterable (FileInputStream input) {
-		telems = new LinkedList<AltosTelemetry> ();
+	public AltosTelemetryIterable (FileInputStream input) throws IOException {
+		telems = new TreeSet<AltosTelemetryOrdered> ();
+		tick = 0;
+		index = 0;
 
-		try {
-			for (;;) {
-				String line = AltosLib.gets(input);
-				if (line == null) {
+		for (;;) {
+			String line = AltosLib.gets(input);
+			if (line == null) {
+				break;
+			}
+			try {
+				AltosTelemetry telem = AltosTelemetry.parse(line);
+				if (telem == null)
 					break;
-				}
-				try {
-					AltosTelemetry telem = AltosTelemetry.parse(line);
-					if (telem == null)
-						break;
-					telems.add(telem);
-				} catch (ParseException pe) {
-					System.out.printf("parse exception %s\n", pe.getMessage());
-				} catch (AltosCRCException ce) {
-				}
+				add(telem);
+			} catch (ParseException pe) {
+				System.out.printf("parse exception %s\n", pe.getMessage());
+			} catch (AltosCRCException ce) {
 			}
-		} catch (IOException io) {
-			System.out.printf("io exception\n");
 		}
 	}
 }