Added parser.setHelpOption(helpOpt);

to clustering drivers to resolve help-only exception git-svn-id: https://svn.apache.org/repos/asf/mahout/trunk@948494 13f79535-47bb-0310-9956-ffa450edef68
ogrisel · May 26, 2010 · aac7851 · aac7851
1 parent a18b658
commit aac7851
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java b/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
@@ -23,10 +23,9 @@
 import org.apache.commons.cli2.Group;
 import org.apache.commons.cli2.Option;
 import org.apache.commons.cli2.OptionException;
-import org.apache.commons.cli2.builder.ArgumentBuilder;
-import org.apache.commons.cli2.builder.DefaultOptionBuilder;
 import org.apache.commons.cli2.builder.GroupBuilder;
 import org.apache.commons.cli2.commandline.Parser;
+import org.apache.commons.cli2.util.HelpFormatter;
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.IntWritable;
@@ -43,7 +42,6 @@
 import org.apache.mahout.common.CommandLineUtil;
 import org.apache.mahout.common.HadoopUtil;
 import org.apache.mahout.common.commandline.DefaultOptionCreator;
-import org.apache.mahout.common.distance.SquaredEuclideanDistanceMeasure;
 import org.apache.mahout.math.VectorWritable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -74,6 +72,7 @@ public static void main(String[] args) throws IOException {
     try {
       Parser parser = new Parser();
       parser.setGroup(group);
+      parser.setHelpOption(helpOpt);
       CommandLine cmdLine = parser.parse(args);
 
       if (cmdLine.hasOption(helpOpt)) {

diff --git a/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletDriver.java b/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletDriver.java
@@ -100,6 +100,7 @@ public static void main(String[] args) throws Exception {
     try {
       Parser parser = new Parser();
       parser.setGroup(group);
+      parser.setHelpOption(helpOpt);
       CommandLine cmdLine = parser.parse(args);
       if (cmdLine.hasOption(helpOpt)) {
         CommandLineUtil.printHelp(group);

diff --git a/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java b/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
@@ -91,6 +91,7 @@ public static void main(String[] args) throws Exception {
     try {
       Parser parser = new Parser();
       parser.setGroup(group);
+      parser.setHelpOption(helpOpt);
       CommandLine cmdLine = parser.parse(args);
       if (cmdLine.hasOption(helpOpt)) {
         CommandLineUtil.printHelp(group);

diff --git a/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java b/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
@@ -79,6 +79,7 @@ public static void main(String[] args) throws Exception {
     try {
       Parser parser = new Parser();
       parser.setGroup(group);
+      parser.setHelpOption(helpOpt);
       CommandLine cmdLine = parser.parse(args);
 
       if (cmdLine.hasOption(helpOpt)) {

diff --git a/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.java b/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.java
@@ -24,8 +24,6 @@
 import org.apache.commons.cli2.Group;
 import org.apache.commons.cli2.Option;
 import org.apache.commons.cli2.OptionException;
-import org.apache.commons.cli2.builder.ArgumentBuilder;
-import org.apache.commons.cli2.builder.DefaultOptionBuilder;
 import org.apache.commons.cli2.builder.GroupBuilder;
 import org.apache.commons.cli2.commandline.Parser;
 import org.apache.hadoop.conf.Configuration;
@@ -90,6 +88,7 @@ public static void main(String[] args) throws ClassNotFoundException, IOExceptio
     try {
       Parser parser = new Parser();
       parser.setGroup(group);
+      parser.setHelpOption(helpOpt);
       CommandLine cmdLine = parser.parse(args);
 
       if (cmdLine.hasOption(helpOpt)) {

diff --git a/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java b/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
@@ -80,6 +80,7 @@ public static void main(String[] args) throws IOException {
     try {
       Parser parser = new Parser();
       parser.setGroup(group);
+      parser.setHelpOption(helpOpt);
       CommandLine cmdLine = parser.parse(args);
       if (cmdLine.hasOption(helpOpt)) {
         CommandLineUtil.printHelp(group);