updates to get some of the shutdown code to execute via Program

[fleet.git] / src / edu / berkeley / fleet / dataflow / PunctuatorNode.java

diff --git a/src/edu/berkeley/fleet/dataflow/PunctuatorNode.java b/src/edu/berkeley/fleet/dataflow/PunctuatorNode.java
index aff99fd..cee58ae 100644 (file)
--- a/src/edu/berkeley/fleet/dataflow/PunctuatorNode.java
+++ b/src/edu/berkeley/fleet/dataflow/PunctuatorNode.java
@@ -6,15 +6,17 @@ import edu.berkeley.fleet.api.*;
 public class PunctuatorNode extends Node {
     private final long    punc;
     private final Ship    ship  = dfg.pool.allocateShip("Counter");
-    public  final OutPort out   = new DockOutPort("out", ship.getDock("out"));
-    public  final InPort  val   = new DockInPort("in1",  ship.getDock("in1"));
-    public  final InPort  op    = new DockInPort("inOp", ship.getDock("inOp"), 0, new BitVector[] {
+    private final InPort  op    = new DockInPort("inOp", ship.getDock("inOp"), 0, new BitVector[] {
             ship.getDock("inOp").getConstant("PASS_C2_V1"),
             ship.getDock("inOp").getConstant("PASS_C2_V2") } );
+
     public  final InPort  count;
+    public  final OutPort out   = new DockOutPort("out", ship.getDock("out"));
+    public  final InPort  val   = new DockInPort("val",  ship.getDock("in1"));
+
     public PunctuatorNode(DataFlowGraph dfg, long punc) {
         super(dfg);
         this.punc = punc;
-        this.count = new DockInPort("in2",  ship.getDock("in2"), 0, new BitVector[] { null, bv(1), bv(punc) });
+        this.count = new DockInPort("in2", ship.getDock("in2"), 0, new BitVector[] { null, bv(1), bv(punc) });
     }
 }