svn commit: r1196658 - in /mahout/trunk/core/src: main/java/org/apache/mahout/clustering/minhash/ main/java/org/apache/mahout/common/commandline/ test/java/org/apache/mahout/clustering/minhash/

[gsingers]

Author: gsingers
Date: Wed Nov  2 16:02:03 2011
New Revision: 1196658

URL: http://svn.apache.org/viewvc?rev=1196658&view=rev
Log:
make debugOutput a simple option for MinHash instead of passing in an argument

Modified:
    
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashDriver.java
    
mahout/trunk/core/src/main/java/org/apache/mahout/common/commandline/MinhashOptionCreator.java
    
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/minhash/TestMinHashClustering.java

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashDriver.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashDriver.java?rev=1196658&r1=1196657&r2=1196658&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashDriver.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashDriver.java
 Wed Nov  2 16:02:03 2011
@@ -110,7 +110,7 @@ public final class MinHashDriver extends
     int numHashFunctions = 
Integer.valueOf(getOption(MinhashOptionCreator.NUM_HASH_FUNCTIONS));
     int keyGroups = 
Integer.valueOf(getOption(MinhashOptionCreator.KEY_GROUPS));
     int numReduceTasks = 
Integer.parseInt(getOption(MinhashOptionCreator.NUM_REDUCERS));
-    boolean debugOutput = 
Boolean.parseBoolean(getOption(MinhashOptionCreator.DEBUG_OUTPUT));
+    boolean debugOutput = hasOption(MinhashOptionCreator.DEBUG_OUTPUT);
 
     runJob(input,
            output,

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/common/commandline/MinhashOptionCreator.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/common/commandline/MinhashOptionCreator.java?rev=1196658&r1=1196657&r2=1196658&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/common/commandline/MinhashOptionCreator.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/common/commandline/MinhashOptionCreator.java
 Wed Nov  2 16:02:03 2011
@@ -36,10 +36,7 @@ public final class MinhashOptionCreator 
     return new DefaultOptionBuilder()
         .withLongName(DEBUG_OUTPUT)
         .withShortName("debug")
-        .withArgument(
-            new ArgumentBuilder().withName(DEBUG_OUTPUT).withDefault("false")
-                .withMinimum(1).withMaximum(1).create())
-        .withDescription("Cluster the whole vectors for debugging");
+        .withDescription("Output the whole vectors for debugging");
   }
 
   public static DefaultOptionBuilder numReducersOption() {

Modified: 
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/minhash/TestMinHashClustering.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/minhash/TestMinHashClustering.java?rev=1196658&r1=1196657&r2=1196658&view=diff
==============================================================================
--- 
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/minhash/TestMinHashClustering.java
 (original)
+++ 
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/minhash/TestMinHashClustering.java
 Wed Nov  2 16:02:03 2011
@@ -95,7 +95,7 @@ public class TestMinHashClustering exten
                          optKey(MinhashOptionCreator.NUM_HASH_FUNCTIONS), 
String.valueOf(numHashFunctions),
                          optKey(MinhashOptionCreator.KEY_GROUPS), 
String.valueOf(keyGroups),
                          optKey(MinhashOptionCreator.NUM_REDUCERS), "1",
-                         optKey(MinhashOptionCreator.DEBUG_OUTPUT), "true"};
+                         optKey(MinhashOptionCreator.DEBUG_OUTPUT)};
   }
   
   private static Set<Integer> getValues(Vector vector) {