get rid of ChainControls

[fleet.git] / src / edu / berkeley / fleet / marina / MergeExperiment.java

diff --git a/src/edu/berkeley/fleet/marina/MergeExperiment.java b/src/edu/berkeley/fleet/marina/MergeExperiment.java
index c41de62..64809d1 100644 (file)
--- a/src/edu/berkeley/fleet/marina/MergeExperiment.java
+++ b/src/edu/berkeley/fleet/marina/MergeExperiment.java
@@ -9,11 +9,11 @@ public class MergeExperiment {
     ProperStopper bottomRing;
     ProperStopper topRing;
 
-    public MergeExperiment(ChainControls cc, ChipModel model, boolean clockHack, Indenter indenter) {
+    public MergeExperiment(ChipModel model, boolean clockHack, Indenter indenter) {
         bottomRing =
             new ProperStopper("bottom ring",
                               "marinaGu@0.outDockW@.compareW@1.marinaCo@0.bottomFI@0.tapPropS@1.properSt@1",
-                              cc,
+
                               model,
                               clockHack,
                               indenter,
@@ -22,7 +22,7 @@ public class MergeExperiment {
         topRing =
             new ProperStopper("top ring",
                               "marinaGu@0.outDockW@.compareW@1.marinaCo@0.topFIFO0@.tapPropS@1.properSt@1",
-                              cc,
+
                               model,
                               clockHack,
                               indenter,