svn commit: r1554183 - in /mahout/trunk: CHANGELOG core/src/main/java/org/apache/mahout/classifier/naivebayes/test/TestNaiveBayesDriver.java core/src/main/java/org/apache/mahout/classifier/naivebayes/training/TrainNaiveBayesJob.java

[smarthi]

Author: smarthi
Date: Mon Dec 30 10:55:05 2013
New Revision: 1554183

URL: http://svn.apache.org/r1554183
Log:
MAHOUT-1389: Complementary Naive Bayes Classifier not getting called when "-c" 
option is activated

Modified:
    mahout/trunk/CHANGELOG
    
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/test/TestNaiveBayesDriver.java
    
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/training/TrainNaiveBayesJob.java

Modified: mahout/trunk/CHANGELOG
URL: 
http://svn.apache.org/viewvc/mahout/trunk/CHANGELOG?rev=1554183&r1=1554182&r2=1554183&view=diff
==============================================================================
--- mahout/trunk/CHANGELOG (original)
+++ mahout/trunk/CHANGELOG Mon Dec 30 10:55:05 2013
@@ -2,6 +2,8 @@ Mahout Change Log
 
 Release 0.9 - unreleased
 
+  MAHOUT-1389: Complementary Naive Bayes Classifier not getting called when 
"-c" option is activated (Gouri Shankar Majumdar via smarthi)
+
   MAHOUT-1384: Executing the MR version of Naive Bayes/CNB of 
classify_20newgroups.sh fails in seqdirectory step (smarthi)
 
   MAHOUT-1382: Upgrade Mahout third party jars for 0.9 Release (smarthi)

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/test/TestNaiveBayesDriver.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/test/TestNaiveBayesDriver.java?rev=1554183&r1=1554182&r2=1554183&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/test/TestNaiveBayesDriver.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/test/TestNaiveBayesDriver.java
 Mon Dec 30 10:55:05 2013
@@ -136,7 +136,9 @@ public class TestNaiveBayesDriver extend
     Job testJob = prepareJob(getInputPath(), getOutputPath(), 
SequenceFileInputFormat.class, BayesTestMapper.class,
             Text.class, VectorWritable.class, SequenceFileOutputFormat.class);
     //testJob.getConfiguration().set(LABEL_KEY, getOption("--labels"));
-    boolean complementary = parsedArgs.containsKey("testComplementary");
+    
+    //boolean complementary = parsedArgs.containsKey("testComplementary"); 
//always result to false as key in hash map is "--testComplementary"
+    boolean complementary = hasOption("testComplementary"); //or  
complementary = parsedArgs.containsKey("--testComplementary");
     testJob.getConfiguration().set(COMPLEMENTARY, 
String.valueOf(complementary));
     return testJob.waitForCompletion(true);
   }

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/training/TrainNaiveBayesJob.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/training/TrainNaiveBayesJob.java?rev=1554183&r1=1554182&r2=1554183&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/training/TrainNaiveBayesJob.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/naivebayes/training/TrainNaiveBayesJob.java
 Mon Dec 30 10:55:05 2013
@@ -93,8 +93,8 @@ public final class TrainNaiveBayesJob ex
     }
     long labelSize = createLabelIndex(labPath);
     float alphaI = Float.parseFloat(getOption(ALPHA_I));
-    boolean trainComplementary = 
Boolean.parseBoolean(getOption(TRAIN_COMPLEMENTARY));
-
+    //boolean trainComplementary = 
Boolean.parseBoolean(getOption(TRAIN_COMPLEMENTARY)); //always result to false
+    boolean trainComplementary = hasOption(TRAIN_COMPLEMENTARY);
 
     HadoopUtil.setSerializations(getConf());
     HadoopUtil.cacheFiles(labPath, getConf());