projects
/
fleet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mild overhaul of Interpreter; now capable of performing MergeSort
[fleet.git]
/
src
/
edu
/
berkeley
/
fleet
/
interpreter
/
InterpreterShip.java
diff --git
a/src/edu/berkeley/fleet/interpreter/InterpreterShip.java
b/src/edu/berkeley/fleet/interpreter/InterpreterShip.java
index
811c02b
..
85358fa
100644
(file)
--- a/
src/edu/berkeley/fleet/interpreter/InterpreterShip.java
+++ b/
src/edu/berkeley/fleet/interpreter/InterpreterShip.java
@@
-1,3
+1,4
@@
+
package edu.berkeley.fleet.interpreter;
import edu.berkeley.fleet.api.*;
import edu.berkeley.fleet.two.*;
package edu.berkeley.fleet.interpreter;
import edu.berkeley.fleet.api.*;
import edu.berkeley.fleet.two.*;
@@
-47,10
+48,8
@@
abstract class InterpreterShip extends FleetTwoShip {
return;
} else if (someflushing && !someempty) {
for(InterpreterDock d : docks.values())
return;
} else if (someflushing && !someempty) {
for(InterpreterDock d : docks.values())
- if (d.isInputDock() && !d.flushing && d.dataReadyForShip) {
- System.out.println("FLUSH AT " + this);
+ if (d.isInputDock() && !d.flushing && d.dataReadyForShip)
d.dataReadyForShip = false;
d.dataReadyForShip = false;
- }
}
// now pass control to the subclass
}
// now pass control to the subclass