*
* 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
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_11;
import java.io.*;
import java.util.*;
}
class AltosTelemetryOrderedIterator implements Iterator<AltosTelemetry> {
- TreeSet<AltosTelemetryOrdered> olist;
- Iterator<AltosTelemetryOrdered> oiterator;
-
- public AltosTelemetryOrderedIterator(Iterable<AltosTelemetry> telems) {
- olist = new TreeSet<AltosTelemetryOrdered>();
-
- int tick = 0;
- int index = 0;
- boolean first = true;
-
- for (AltosTelemetry e : telems) {
- int t = e.tick;
- if (first)
- tick = t;
- else {
- while (t < tick - 32767)
- t += 65536;
- tick = t;
- }
- olist.add(new AltosTelemetryOrdered(e, index++, tick));
- first = false;
- }
+ Iterator<AltosTelemetryOrdered> iterator;
- oiterator = olist.iterator();
+ public AltosTelemetryOrderedIterator(TreeSet<AltosTelemetryOrdered> telems) {
+ iterator = telems.iterator();
}
public boolean hasNext() {
- return oiterator.hasNext();
+ return iterator.hasNext();
}
public AltosTelemetry next() {
- return oiterator.next().telem;
+ 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 () {
- if (telems == null)
- telems = new LinkedList<AltosTelemetry>();
return new AltosTelemetryOrderedIterator(telems);
}
public AltosTelemetryIterable (FileInputStream input) {
- telems = new LinkedList<AltosTelemetry> ();
+ telems = new TreeSet<AltosTelemetryOrdered> ();
+ tick = 0;
+ index = 0;
try {
for (;;) {
AltosTelemetry telem = AltosTelemetry.parse(line);
if (telem == null)
break;
- telems.add(telem);
+ add(telem);
} catch (ParseException pe) {
System.out.printf("parse exception %s\n", pe.getMessage());
} catch (AltosCRCException ce) {