projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/lisp: have 'while' return the last body value
[fw/altos]
/
altoslib
/
AltosTelemetryFile.java
diff --git
a/altoslib/AltosTelemetryFile.java
b/altoslib/AltosTelemetryFile.java
index 338726887f76c06533d206ddd6c08008d6f83088..9c5f8dae92bc529266e1ca002a4e0d970397a5a9 100644
(file)
--- a/
altoslib/AltosTelemetryFile.java
+++ b/
altoslib/AltosTelemetryFile.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
*
* 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
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,7
+16,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_1
1
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-62,7
+63,7
@@
public class AltosTelemetryFile extends AltosStateIterable {
}
public void write(PrintStream out) {
}
public void write(PrintStream out) {
-
+
}
public AltosTelemetryFile(FileInputStream input) {
}
public AltosTelemetryFile(FileInputStream input) {
@@
-72,16
+73,14
@@
public class AltosTelemetryFile extends AltosStateIterable {
/* Find boost tick */
AltosState state = start.clone();
/* Find boost tick */
AltosState state = start.clone();
- System.out.printf ("Searching for boost\n");
for (AltosTelemetry telem : telems) {
telem.update_state(state);
for (AltosTelemetry telem : telems) {
telem.update_state(state);
- if (state.state != AltosLib.ao_flight_invalid && state.state >= AltosLib.ao_flight_boost) {
- System.out.printf ("boost tick %d\n", state.tick);
+ state.finish_update();
+ if (state.state() != AltosLib.ao_flight_invalid && state.state() >= AltosLib.ao_flight_boost) {
start.set_boost_tick(state.tick);
break;
}
}
start.set_boost_tick(state.tick);
break;
}
}
- System.out.printf ("Found boost %d\n", start.boost_tick);
}
public Iterator<AltosState> iterator() {
}
public Iterator<AltosState> iterator() {
@@
-91,7
+90,8
@@
public class AltosTelemetryFile extends AltosStateIterable {
while (i.hasNext() && !state.valid()) {
AltosTelemetry t = i.next();
t.update_state(state);
while (i.hasNext() && !state.valid()) {
AltosTelemetry t = i.next();
t.update_state(state);
+ state.finish_update();
}
return new AltosTelemetryIterator(state, i);
}
}
return new AltosTelemetryIterator(state, i);
}
-}
\ No newline at end of file
+}