From 8dd134a495ff44237c409a677cf162d3586371c4 Mon Sep 17 00:00:00 2001 From: megacz Date: Thu, 12 Mar 2009 15:21:46 -0700 Subject: [PATCH] Fpga.java: update ship collections --- src/edu/berkeley/fleet/fpga/Fpga.java | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/edu/berkeley/fleet/fpga/Fpga.java b/src/edu/berkeley/fleet/fpga/Fpga.java index d2b960c..d323c56 100644 --- 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 -- 1.7.10.4