add Fleet.getDefaultImpl() and use it in Makefile

[fleet.git] / src / edu / berkeley / fleet / dataflow / MergeSort.java

diff --git a/src/edu/berkeley/fleet/dataflow/MergeSort.java b/src/edu/berkeley/fleet/dataflow/MergeSort.java
index 459bab5..36f4624 100644 (file)
--- a/src/edu/berkeley/fleet/dataflow/MergeSort.java
+++ b/src/edu/berkeley/fleet/dataflow/MergeSort.java
@@ -158,20 +158,15 @@ public class MergeSort {
     }
 
     public static void main(String[] s) throws Exception {
-        if (s.length != 4) {
-            System.err.println("usage: java " + MergeSort.class.getName() + " <target> <shipname> <base> <length>");
+        if (s.length != 3) {
+            System.err.println("usage: java " + MergeSort.class.getName() + " <shipname> <base> <length>");
             System.exit(-1);
         }
-        Fleet fleet = null;
-        if (s[0].equals("fpga"))             fleet = new Fpga();
-        else if (s[0].equals("interpreter")) {
-            fleet = new Interpreter();
-            Log.log = null;
-        }
+        Fleet fleet = Fleet.getDefaultImpl();
         ShipPool pool = new ShipPool(fleet);
-        Ship memory = pool.allocateShip(s[1]);
-        int base = Integer.parseInt(s[2]);
-        int length = Integer.parseInt(s[3]);
+        Ship memory = pool.allocateShip(s[0]);
+        int base = Integer.parseInt(s[1]);
+        int length = Integer.parseInt(s[2]);
 
         Random random = new Random(System.currentTimeMillis());        
         BitVector[] vals  = new BitVector[length];