update everything to naming conventions agreed upon in class last week

[fleet.git] / ships / Alu2.ship

diff --git a/ships/Alu2.ship b/ships/Alu2.ship
index 607a16e..1c567c9 100644 (file)
--- a/ships/Alu2.ship
+++ b/ships/Alu2.ship
@@ -1,9 +1,9 @@
 ship: Alu2
 
 == Ports ===========================================================
-data  in:   a
-data  in:   b
-data  in:   op
+data  in:   in1
+data  in:   in2
+data  in:   inOp
 
 data  out:  out
 
@@ -18,13 +18,13 @@ niftycool.
 
 == Fleeterpreter ====================================================
 public void service() {
-  if (box_a.dataReadyForShip() &&
-      box_b.dataReadyForShip() &&
-      box_op.dataReadyForShip() &&
+  if (box_in1.dataReadyForShip() &&
+      box_in2.dataReadyForShip() &&
+      box_inOp.dataReadyForShip() &&
       box_out.readyForItemFromShip()) {
-      int a      = box_a.removeDataForShip();
-      int b      = box_b.removeDataForShip();
-      int op     = box_op.removeDataForShip();
+      int a      = box_in1.removeDataForShip();
+      int b      = box_in2.removeDataForShip();
+      int op     = box_inOp.removeDataForShip();
       switch(op) {
           case 0: box_out.addDataFromShip(a+b); // ADD
               break;