rename com.sun.vlsi.chips.marina.test -> edu.berkeley.fleet.marina

[fleet.git] / src / com / sun / vlsi / chips / marina / test / MergeExperiment.java

diff --git a/src/com/sun/vlsi/chips/marina/test/MergeExperiment.java b/src/com/sun/vlsi/chips/marina/test/MergeExperiment.java
deleted file mode 100644 (file)
index 2b70406..0000000
--- a/src/com/sun/vlsi/chips/marina/test/MergeExperiment.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.sun.vlsi.chips.marina.test;
-import com.sun.electric.tool.simulation.test.*;
-import edu.berkeley.fleet.api.Instruction;
-import edu.berkeley.fleet.marina.MarinaPath;
-
-public class MergeExperiment {
-        /*
-
-    ProperStopper bottomRing;
-    ProperStopper topRing;
-
-    public MergeExperiment(ChainControls cc, 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,
-                              "marinaGu@0.outDockW@.compareW@1.marinaCo@0.bottomFI@0.tapPropS@1.instruct@0.cntScnTh@1.cntScnOn@1");
-        
-        topRing =
-            new ProperStopper("top ring",
-                              "marinaGu@0.outDockW@.compareW@1.marinaCo@0.topFIFO0@.tapPropS@1.properSt@1",
-                              cc,
-                              model,
-                              clockHack,
-                              indenter,
-                              "marinaGu@0.outDockW@.compareW@1.marinaCo@0.topFIFO0@.tapPropS@1.instruct@0.cntScnTh@1.cntScnOn@1");
-        countLess = "marinaGu@0.outDockW@.compareW@1.marinaCo@0.compareA@0.threeCou@0.instruct@0.cntScnTh@1.cntScnOn@1";
-        countEqual = "marinaGu@0.outDockW@.compareW@1.marinaCo@0.compareA@0.threeCou@0.instruct@1.cntScnTh@1.cntScnOn@1";
-        countGreater = "marinaGu@0.outDockW@.compareW@1.marinaCo@0.compareA@0.threeCou@0.instruct@2.cntScnTh@1.cntScnOn@1";
-
-        // fin->g->e->l->fout
-    }
-        */
-}