Fpga.java: update ship collections

[fleet.git] / src / edu / berkeley / fleet / fpga / Fpga.java

diff --git a/src/edu/berkeley/fleet/fpga/Fpga.java b/src/edu/berkeley/fleet/fpga/Fpga.java
index d2b960c..d323c56 100644 (file)
--- a/src/edu/berkeley/fleet/fpga/Fpga.java
+++ b/src/edu/berkeley/fleet/fpga/Fpga.java
@@ -78,22 +78,29 @@ public class Fpga extends FleetTwoFleet {
         this.top = top;
         debugShip = createShip("Debug");
 
-        boolean small = true;
-        //boolean small = false;
+        //boolean small = true;
+        boolean small = false;
 
         if (small) {
-            /*
+            for(int i=0; i<2; i++) createShip("Alu");
             for(int i=0; i<1; i++) createShip("Memory");
             for(int i=0; i<2; i++) createShip("Fifo");
-            for(int i=0; i<2; i++) createShip("Alu");
             createShip("Counter");
             createShip("CarrySaveAdder");
             createShip("Rotator");
             createShip("Lut3");
-            */
+            createShip("Timer");
             createShip("DDR2");
             createShip("Dvi");
+
         } else {
+
+            for(int i=0; i<2; i++)  createShip("Memory");
+            for(int i=0; i<3; i++)  createShip("Alu");
+            for(int i=0; i<2; i++)  createShip("Fifo");
+            for(int i=0; i<11; i++) createShip("Counter");
+
+            /*
             for(int i=0; i<3; i++)  createShip("Memory");
             for(int i=0; i<3; i++)  createShip("Alu");
             for(int i=0; i<2; i++)  createShip("Fifo");
@@ -101,12 +108,15 @@ public class Fpga extends FleetTwoFleet {
 
             // "really big" configuration: 138 docks
             for(int i=0; i<4; i++)  createShip("Alu");
+            */
+
             //createShip("CarrySaveAdder");
             //createShip("Rotator");
             //createShip("Lut3");
 
-            //createShip("DDR2");
-            //createShip("Video");
+            createShip("Timer");
+            createShip("DDR2");
+            createShip("Dvi");
         }
 
         // for FifoShip