svn commit: r825523 - in /lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol: canopy/InputDriver.java meanshift/Job.java

[is...@apache.org]

Author: isabel
Date: Thu Oct 15 15:35:18 2009
New Revision: 825523

URL: http://svn.apache.org/viewvc?rev=825523&view=rev
Log:
MAHOUT-138 - marked optional options as optional.

Modified:
    lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java
    lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java

Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java?rev=825523&r1=825522&r2=825523&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/InputDriver.java Thu Oct 15 15:35:18 2009
@@ -73,7 +73,7 @@
 
       String input = cmdLine.getValue(inputOpt, "testdata").toString();
       String output = cmdLine.getValue(outputOpt, "output").toString();
-      String vectorClassName = cmdLine.getValue(vectorOpt).toString();
+      String vectorClassName = cmdLine.getValue(vectorOpt, "org.apache.mahout.matrix.SparseVector").toString();
       Class<? extends Vector> vectorClass = (Class<? extends Vector>) Class.forName(vectorClassName);
       runJob(input, output, vectorClass);
     } catch (OptionException e) {

Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java?rev=825523&r1=825522&r2=825523&view=diff
==============================================================================
--- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java (original)
+++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java Thu Oct 15 15:35:18 2009
@@ -53,22 +53,22 @@
     ArgumentBuilder abuilder = new ArgumentBuilder();
     GroupBuilder gbuilder = new GroupBuilder();
 
-    Option inputOpt = DefaultOptionCreator.inputOption(obuilder, abuilder).create();
-    Option outputOpt = DefaultOptionCreator.outputOption(obuilder, abuilder).create();
-    Option convergenceDeltaOpt = DefaultOptionCreator.convergenceOption(obuilder, abuilder).create();
-    Option maxIterOpt = DefaultOptionCreator.maxIterOption(obuilder, abuilder).create();
+    Option inputOpt = DefaultOptionCreator.inputOption(obuilder, abuilder).withRequired(false).create();
+    Option outputOpt = DefaultOptionCreator.outputOption(obuilder, abuilder).withRequired(false).create();
+    Option convergenceDeltaOpt = DefaultOptionCreator.convergenceOption(obuilder, abuilder).withRequired(false).create();
+    Option maxIterOpt = DefaultOptionCreator.maxIterOption(obuilder, abuilder).withRequired(false).create();
     Option helpOpt = DefaultOptionCreator.helpOption(obuilder);    
 
-    Option modelOpt = obuilder.withLongName("distanceClass").withRequired(true).withShortName("d").
+    Option modelOpt = obuilder.withLongName("distanceClass").withRequired(false).withShortName("d").
         withArgument(abuilder.withName("distanceClass").withMinimum(1).withMaximum(1).create()).
         withDescription("The distance measure class name.").create();
 
 
-    Option threshold1Opt = obuilder.withLongName("threshold_1").withRequired(true).withShortName("t1").
+    Option threshold1Opt = obuilder.withLongName("threshold_1").withRequired(false).withShortName("t1").
         withArgument(abuilder.withName("threshold_1").withMinimum(1).withMaximum(1).create()).
         withDescription("The T1 distance threshold.").create();
 
-    Option threshold2Opt = obuilder.withLongName("threshold_2").withRequired(true).withShortName("t2").
+    Option threshold2Opt = obuilder.withLongName("threshold_2").withRequired(false).withShortName("t2").
         withArgument(abuilder.withName("threshold_2").withMinimum(1).withMaximum(1).create()).
         withDescription("The T1 distance threshold.").create();