You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2010/06/02 14:37:38 UTC
svn commit: r950537 [1/2] - in /mahout/trunk: buildtools/src/main/resources/
core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/
core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/
core/src/main/java/org/apache/mahout/cf/taste/i...
Author: srowen
Date: Wed Jun 2 12:37:36 2010
New Revision: 950537
URL: http://svn.apache.org/viewvc?rev=950537&view=rev
Log:
More checkstyle/findbugs
Modified:
mahout/trunk/buildtools/src/main/resources/mahout-checkstyle.xml
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/DistributedTanimotoCoefficientSimilarity.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ByValueRecommendedItemComparator.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NullRescorer.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearModel.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearTrainer.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/PerceptronTrainer.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/WinnowTrainer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterBase.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/JsonClusterAdapter.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/JsonModelAdapter.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/UncommonDistributions.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/DecisionForest.java
mahout/trunk/core/src/main/java/org/apache/mahout/df/ErrorEstimate.java
mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/TestClusterInterface.java
mahout/trunk/examples/src/main/java/org/apache/mahout/analysis/WikipediaAnalyzer.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/TransposeToByUser.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/Job.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluator.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtils.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducer.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/TravellingSalesman.java
mahout/trunk/examples/src/main/java/org/apache/mahout/text/WikipediaMapper.java
mahout/trunk/examples/src/main/java/org/apache/mahout/text/WikipediaToSequenceFile.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java
mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtilsTest.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractMatrix.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractVector.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/JsonMatrixAdapter.java
mahout/trunk/maven/src/main/resources/findbugs-exclude.xml
mahout/trunk/maven/src/main/resources/mahout-checkstyle.xml
mahout/trunk/utils/src/main/java/org/apache/mahout/clustering/cdbw/CDbwDriver.java
mahout/trunk/utils/src/main/java/org/apache/mahout/clustering/cdbw/CDbwEvaluator.java
mahout/trunk/utils/src/main/java/org/apache/mahout/clustering/cdbw/CDbwMapper.java
mahout/trunk/utils/src/main/java/org/apache/mahout/text/DefaultAnalyzer.java
mahout/trunk/utils/src/main/java/org/apache/mahout/text/SparseVectorsFromSequenceFiles.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/nlp/collocations/llr/CollocMapper.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/nlp/collocations/llr/Gram.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/nlp/collocations/llr/GramKeyPartitioner.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/SequenceFileVectorIterable.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/arff/ARFFModel.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/arff/ARFFVectorIterable.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/arff/Driver.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/arff/MapBackedARFFModel.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/CachedTermInfo.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/LuceneIterable.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/term/TFPartialVectorReducer.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/text/term/TermCountMapper.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/tfidf/TFIDFPartialVectorReducer.java
Modified: mahout/trunk/buildtools/src/main/resources/mahout-checkstyle.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/buildtools/src/main/resources/mahout-checkstyle.xml?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/buildtools/src/main/resources/mahout-checkstyle.xml (original)
+++ mahout/trunk/buildtools/src/main/resources/mahout-checkstyle.xml Wed Jun 2 12:37:36 2010
@@ -164,11 +164,11 @@
<module name="IllegalInstantiation" />
<!--<module name="IllegalToken"/>-->
<!--<module name="IllegalTokenText"/>-->
- <module name="InnerAssignment" />
+ <!--<module name="InnerAssignment"/>-->
<!--<module name="MagicNumber"/>-->
<module name="MissingSwitchDefault" />
<!--module name="ModifiedControlVariable"/-->
- <!--<module name="SimplifyBooleanExpression" /> -->
+ <module name="SimplifyBooleanExpression" />
<module name="SimplifyBooleanReturn" />
<module name="StringLiteralEquality" />
<module name="NestedIfDepth">
@@ -184,7 +184,7 @@
<property name="illegalClassNames"
value="java.lang.Error,java.lang.RuntimeException" />
</module>
- <!--<module name="RedundantThrows"/>-->
+ <module name="RedundantThrows"/>
<module name="PackageDeclaration" />
<!--module name="JUnitTestCase" /-->
<module name="ReturnCount">
@@ -196,7 +196,7 @@
<property name="illegalClassNames"
value="java.util.GregorianCalendar, java.util.Hashtable, java.util.HashSet, java.util.HashMap, java.util.ArrayList, java.util.LinkedList, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeSet, java.util.TreeMap" />
</module>
- <module name="DeclarationOrder" />
+ <!--module name="DeclarationOrder" /-->
<!--<module name="ParameterAssignment"/>-->
<module name="ExplicitInitialization" />
<module name="DefaultComesLast" />
@@ -215,7 +215,7 @@
<module name="FinalClass" />
<module name="HideUtilityClassConstructor" />
<module name="InterfaceIsType" />
- <!--<module name="MutableException"/>-->
+ <module name="MutableException"/>
<module name="ThrowsCount">
<property name="max" value="5" />
</module>
@@ -246,8 +246,8 @@
<!-- Miscellaneous other checks. -->
<!-- See http://checkstyle.sf.net/config_misc.html -->
+ <module name="ArrayTypeStyle"/>
<!--
- <module name="ArrayTypeStyle"/>
<module name="FinalParameters"/>
-->
<!--
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/DistributedTanimotoCoefficientSimilarity.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/DistributedTanimotoCoefficientSimilarity.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/DistributedTanimotoCoefficientSimilarity.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/DistributedTanimotoCoefficientSimilarity.java Wed Jun 2 12:37:36 2010
@@ -35,10 +35,10 @@ public class DistributedTanimotoCoeffici
return Double.NaN;
}
return preferringXAndY / (weightOfItemVectorX + weightOfItemVectorY - preferringXAndY);
- }
+ }
- @Override
- public double weightOfItemVector(Iterable<Float> prefValues) {
+ @Override
+ public double weightOfItemVector(Iterable<Float> prefValues) {
int nonZeroEntries = 0;
for (Float prefValue : prefValues) {
nonZeroEntries++;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/AbstractJDBCDataModel.java Wed Jun 2 12:37:36 2010
@@ -748,9 +748,9 @@ public abstract class AbstractJDBCDataMo
}
try {
- long ID = getLongColumn(resultSet, 1);
+ long id = getLongColumn(resultSet, 1);
resultSet.next();
- return ID;
+ return id;
} catch (SQLException sqle) {
// No good way to handle this since we can't throw an exception
log.warn("Exception while iterating", sqle);
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ByValueRecommendedItemComparator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ByValueRecommendedItemComparator.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ByValueRecommendedItemComparator.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ByValueRecommendedItemComparator.java Wed Jun 2 12:37:36 2010
@@ -27,10 +27,10 @@ import org.apache.mahout.cf.taste.recomm
*/
public final class ByValueRecommendedItemComparator implements Comparator<RecommendedItem>, Serializable {
- private static final Comparator<RecommendedItem> instance = new ByValueRecommendedItemComparator();
+ private static final Comparator<RecommendedItem> INSTANCE = new ByValueRecommendedItemComparator();
public static Comparator<RecommendedItem> getInstance() {
- return instance;
+ return INSTANCE;
}
@Override
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NullRescorer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NullRescorer.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NullRescorer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NullRescorer.java Wed Jun 2 12:37:36 2010
@@ -31,7 +31,10 @@ public final class NullRescorer<T> imple
private static final IDRescorer USER_OR_ITEM_INSTANCE = new NullRescorer<Long>();
private static final Rescorer<LongPair> ITEM_ITEM_PAIR_INSTANCE = new NullRescorer<LongPair>();
private static final Rescorer<LongPair> USER_USER_PAIR_INSTANCE = new NullRescorer<LongPair>();
-
+
+ private NullRescorer() {
+ }
+
public static IDRescorer getItemInstance() {
return USER_OR_ITEM_INSTANCE;
}
@@ -48,10 +51,6 @@ public final class NullRescorer<T> imple
return USER_USER_PAIR_INSTANCE;
}
- private NullRescorer() {
- // do nothing
- }
-
/**
* @param thing
* to rescore
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/ConfusionMatrix.java Wed Jun 2 12:37:36 2010
@@ -93,8 +93,8 @@ public class ConfusionMatrix implements
}
public int getCount(String correctLabel, String classifiedLabel) {
- if (labels.contains(correctLabel) && (labels.contains(classifiedLabel) == false)
- && (defaultLabel.equals(classifiedLabel) == false)) {
+ if (labels.contains(correctLabel) &&
+ !(labels.contains(classifiedLabel) || defaultLabel.equals(classifiedLabel))) {
throw new IllegalArgumentException("Label not found " + correctLabel + ' ' + classifiedLabel);
}
int correctId = labelMap.get(correctLabel);
@@ -103,9 +103,9 @@ public class ConfusionMatrix implements
}
public void putCount(String correctLabel, String classifiedLabel, int count) {
- if (labels.contains(correctLabel) && (labels.contains(classifiedLabel) == false)
- && (defaultLabel.equals(classifiedLabel) == false)) {
- throw new IllegalArgumentException("Label not found");
+ if (labels.contains(correctLabel) &&
+ !(labels.contains(classifiedLabel) || defaultLabel.equals(classifiedLabel))) {
+ throw new IllegalArgumentException("Label not found " + correctLabel + ' ' + classifiedLabel);
}
int correctId = labelMap.get(correctLabel);
int classifiedId = labelMap.get(classifiedLabel);
@@ -137,7 +137,7 @@ public class ConfusionMatrix implements
@Override
public String summarize() {
- StringBuilder returnString = new StringBuilder();
+ StringBuilder returnString = new StringBuilder(200);
returnString.append("=======================================================").append('\n');
returnString.append("Confusion Matrix\n");
returnString.append("-------------------------------------------------------").append('\n');
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearModel.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearModel.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearModel.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearModel.java Wed Jun 2 12:37:36 2010
@@ -16,8 +16,6 @@
*/
package org.apache.mahout.classifier.discriminative;
-import org.apache.mahout.math.CardinalityException;
-import org.apache.mahout.math.IndexException;
import org.apache.mahout.math.Vector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,8 +24,9 @@ import org.slf4j.LoggerFactory;
* Classifies a data point using a hyperplane.
*/
public class LinearModel {
- /** Logger for this class. */
- private static final Logger LOG = LoggerFactory.getLogger(LinearModel.class);
+
+ private static final Logger log = LoggerFactory.getLogger(LinearModel.class);
+
/** Represents the direction of the hyperplane found during training.*/
private Vector hyperplane;
/** Displacement of hyperplane from origin.*/
@@ -37,7 +36,7 @@ public class LinearModel {
/**
* Init a linear model with a hyperplane, distance and displacement.
- * */
+ */
public LinearModel(Vector hyperplane, double displacement, double threshold) {
this.hyperplane = hyperplane;
this.bias = displacement;
@@ -46,7 +45,7 @@ public class LinearModel {
/**
* Init a linear model with zero displacement and a threshold of 0.5.
- * */
+ */
public LinearModel(Vector hyperplane) {
this(hyperplane, 0, 0.5);
}
@@ -55,12 +54,12 @@ public class LinearModel {
* Classify a point to either belong to the class modeled by this linear model or not.
* @param dataPoint the data point to classify.
* @return returns true if data point should be classified as belonging to this model.
- * */
- public boolean classify(Vector dataPoint) throws CardinalityException, IndexException {
+ */
+ public boolean classify(Vector dataPoint) {
double product = this.hyperplane.dot(dataPoint);
- if (LinearModel.LOG.isDebugEnabled()) {
- LinearModel.LOG.debug("model: " + this + " product: " + product + " Bias: " + this.bias
- + " threshold: " + this.threshold);
+ if (log.isDebugEnabled()) {
+ log.debug("model: {} product: {} Bias: {} threshold: {}",
+ new Object[] {this, product, bias, threshold});
}
return product + this.bias > this.threshold;
}
@@ -68,7 +67,7 @@ public class LinearModel {
/**
* Update the hyperplane by adding delta.
* @param delta the delta to add to the hyperplane vector.
- * */
+ */
public void addDelta(Vector delta) {
this.hyperplane = this.hyperplane.plus(delta);
}
@@ -86,7 +85,7 @@ public class LinearModel {
/**
* Shift the bias of the model.
* @param factor factor to multiply the bias by.
- * */
+ */
public synchronized void shiftBias(double factor) {
this.bias += factor;
}
@@ -95,7 +94,7 @@ public class LinearModel {
* Multiply the weight at index by delta.
* @param index the index of the element to update.
* @param delta the delta to multiply the element with.
- * */
+ */
public void timesDelta(int index, double delta) {
double element = this.hyperplane.get(index);
element *= delta;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearTrainer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearTrainer.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearTrainer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/LinearTrainer.java Wed Jun 2 12:37:36 2010
@@ -18,7 +18,6 @@ package org.apache.mahout.classifier.dis
import org.apache.mahout.math.CardinalityException;
import org.apache.mahout.math.DenseVector;
-import org.apache.mahout.math.IndexException;
import org.apache.mahout.math.Matrix;
import org.apache.mahout.math.Vector;
import org.slf4j.Logger;
@@ -34,8 +33,8 @@ import org.slf4j.LoggerFactory;
*/
public abstract class LinearTrainer {
- /** Logger for this class. */
- private static final Logger LOG = LoggerFactory.getLogger(LinearTrainer.class);
+ private static final Logger log = LoggerFactory.getLogger(LinearTrainer.class);
+
/** The model to train. */
private final LinearModel model;
@@ -52,9 +51,9 @@ public abstract class LinearTrainer {
* initial value of weight vector.
* @param initBias
* initial classification bias.
- * */
+ */
protected LinearTrainer(int dimension, double threshold,
- double init, double initBias) throws CardinalityException {
+ double init, double initBias) {
DenseVector initialWeights = new DenseVector(dimension);
initialWeights.assign(init);
this.model = new LinearModel(initialWeights, initBias, threshold);
@@ -72,10 +71,8 @@ public abstract class LinearTrainer {
* the set of labels, one for each data point. If the cardinalities
* of data- and labelset do not match, a CardinalityException is
* thrown
- * */
- public void train(Vector labelset, Matrix dataset) throws IndexException,
- CardinalityException,
- TrainingException {
+ */
+ public void train(Vector labelset, Matrix dataset) throws TrainingException {
if (labelset.size() != dataset.size()[1]) {
throw new CardinalityException(labelset.size(), dataset.size()[1]);
}
@@ -91,13 +88,13 @@ public abstract class LinearTrainer {
int columnCount = dataset.size()[1];
for (int i = 0; i < columnCount; i++) {
Vector dataPoint = dataset.getColumn(i);
- LinearTrainer.LOG.debug("Training point: " + dataPoint);
+ log.debug("Training point: " + dataPoint);
synchronized (this.model) {
boolean prediction = model.classify(dataPoint);
double label = labelset.get(i);
if (label <= 0 && prediction || label > 0 && !prediction) {
- LinearTrainer.LOG.debug("updating");
+ log.debug("updating");
converged = false;
update(label, dataPoint, this.model);
}
@@ -108,7 +105,7 @@ public abstract class LinearTrainer {
/**
* Retrieves the trained model if called after train, otherwise the raw model.
- * */
+ */
public LinearModel getModel() {
return this.model;
}
@@ -122,7 +119,7 @@ public abstract class LinearTrainer {
* the target label of the wrongly classified data point.
* @param dataPoint
* the data point that was classified incorrectly.
- * */
+ */
protected abstract void update(double label, Vector dataPoint, LinearModel model);
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/PerceptronTrainer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/PerceptronTrainer.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/PerceptronTrainer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/PerceptronTrainer.java Wed Jun 2 12:37:36 2010
@@ -16,24 +16,22 @@
*/
package org.apache.mahout.classifier.discriminative;
-import org.apache.mahout.math.CardinalityException;
import org.apache.mahout.math.Vector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Implements training accoring to the perceptron update rule.
- * */
+ * Implements training according to the perceptron update rule.
+ */
public class PerceptronTrainer extends LinearTrainer {
- /** Logger for this class. */
- private static final Logger LOG = LoggerFactory
- .getLogger(PerceptronTrainer.class);
+ private static final Logger log = LoggerFactory.getLogger(PerceptronTrainer.class);
+
/** Rate the model is to be updated with at each step. */
private final double learningRate;
public PerceptronTrainer(int dimension, double threshold,
- double learningRate, double init, double initBias) throws CardinalityException {
+ double learningRate, double init, double initBias) {
super(dimension, threshold, init, initBias);
this.learningRate = learningRate;
}
@@ -46,20 +44,19 @@ public class PerceptronTrainer extends L
*
* In case the prediction was negative but should have been positive, the example
* vector (multiplied by the learning rate) is subtracted from the weight vector.
- * */
+ */
@Override
- protected void update(double label, Vector dataPoint,
- LinearModel model) {
+ protected void update(double label, Vector dataPoint, LinearModel model) {
double factor = 1.0;
if (label == 0.0) {
factor = -1.0;
}
Vector updateVector = dataPoint.times(factor).times(this.learningRate);
- PerceptronTrainer.LOG.debug("Updatevec: " + updateVector);
+ log.debug("Updatevec: {}", updateVector);
model.addDelta(updateVector);
model.shiftBias(factor * this.learningRate);
- PerceptronTrainer.LOG.debug(model.toString());
+ log.debug("{}", model);
}
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/WinnowTrainer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/WinnowTrainer.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/WinnowTrainer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/WinnowTrainer.java Wed Jun 2 12:37:36 2010
@@ -18,7 +18,6 @@ package org.apache.mahout.classifier.dis
import java.util.Iterator;
-import org.apache.mahout.math.CardinalityException;
import org.apache.mahout.math.Vector;
import org.apache.mahout.math.Vector.Element;
import org.slf4j.Logger;
@@ -40,7 +39,7 @@ public class WinnowTrainer extends Linea
this.promotionStep = promotionStep;
}
- public WinnowTrainer(int dimension, double promotionStep) throws CardinalityException {
+ public WinnowTrainer(int dimension, double promotionStep) {
this(dimension, promotionStep, 0.5, 1, 0);
}
@@ -49,7 +48,7 @@ public class WinnowTrainer extends Linea
*
* @param dimension
* number of features.
- * */
+ */
public WinnowTrainer(int dimension) {
this(dimension, 2);
}
@@ -64,7 +63,7 @@ public class WinnowTrainer extends Linea
* In case the prediction was negative but should have been positive, all
* entries in the weight vector that correspond to non null features in the
* example are halfed.
- * */
+ */
@Override
protected void update(double label, Vector dataPoint, LinearModel model) {
if (label > 0) {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterBase.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterBase.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterBase.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterBase.java Wed Jun 2 12:37:36 2010
@@ -24,6 +24,7 @@ import java.lang.reflect.Type;
import java.util.Iterator;
import java.util.Locale;
+import com.google.gson.reflect.TypeToken;
import org.apache.hadoop.io.Writable;
import org.apache.mahout.math.JsonVectorAdapter;
import org.apache.mahout.math.NamedVector;
@@ -32,7 +33,6 @@ import org.apache.mahout.math.Vector.Ele
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
/**
* ClusterBase is an abstract base class class for several clustering implementations
@@ -41,6 +41,8 @@ import com.google.gson.reflect.TypeToken
*/
public abstract class ClusterBase implements Writable, Cluster {
+ private static final Type VECTOR_TYPE = new TypeToken<Vector>() {}.getType();
+
// this cluster's clusterId
private int id;
@@ -108,9 +110,8 @@ public abstract class ClusterBase implem
@Override
public String asJsonString() {
- Type vectorType = new TypeToken<Vector>() {}.getType();
GsonBuilder gBuilder = new GsonBuilder();
- gBuilder.registerTypeAdapter(vectorType, new JsonVectorAdapter());
+ gBuilder.registerTypeAdapter(VECTOR_TYPE, new JsonVectorAdapter());
Gson gson = gBuilder.create();
return gson.toJson(this, this.getClass());
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterMapper.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterMapper.java Wed Jun 2 12:37:36 2010
@@ -18,7 +18,6 @@
package org.apache.mahout.clustering.dirichlet;
import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
@@ -36,14 +35,13 @@ import org.apache.hadoop.mapred.OutputCo
import org.apache.hadoop.mapred.OutputLogFilter;
import org.apache.hadoop.mapred.Reporter;
import org.apache.mahout.clustering.WeightedVectorWritable;
-import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
public class DirichletClusterMapper extends MapReduceBase implements
Mapper<WritableComparable<?>, VectorWritable, IntWritable, WeightedVectorWritable> {
- private List<DirichletCluster> clusters;
- private DirichletClusterer clusterer;
+ private List<DirichletCluster<VectorWritable>> clusters;
+ private DirichletClusterer<VectorWritable> clusterer;
@Override
public void map(WritableComparable<?> key,
@@ -60,22 +58,18 @@ public class DirichletClusterMapper exte
clusters = getClusters(job);
String emitMostLikely = job.get(DirichletDriver.EMIT_MOST_LIKELY_KEY);
String threshold = job.get(DirichletDriver.THRESHOLD_KEY);
- clusterer = new DirichletClusterer<Vector>(Boolean.parseBoolean(emitMostLikely), Double.parseDouble(threshold));
+ clusterer = new DirichletClusterer<VectorWritable>(Boolean.parseBoolean(emitMostLikely),
+ Double.parseDouble(threshold));
} catch (SecurityException e) {
throw new IllegalStateException(e);
} catch (IllegalArgumentException e) {
throw new IllegalStateException(e);
- } catch (NoSuchMethodException e) {
- throw new IllegalStateException(e);
- } catch (InvocationTargetException e) {
- throw new IllegalStateException(e);
}
}
- public static List<DirichletCluster> getClusters(JobConf job) throws SecurityException, IllegalArgumentException,
- NoSuchMethodException, InvocationTargetException {
+ public static List<DirichletCluster<VectorWritable>> getClusters(JobConf job) {
String statePath = job.get(DirichletDriver.STATE_IN_KEY);
- List<DirichletCluster> clusters = new ArrayList<DirichletCluster>();
+ List<DirichletCluster<VectorWritable>> clusters = new ArrayList<DirichletCluster<VectorWritable>>();
try {
Path path = new Path(statePath);
FileSystem fs = FileSystem.get(path.toUri(), job);
@@ -84,10 +78,10 @@ public class DirichletClusterMapper exte
SequenceFile.Reader reader = new SequenceFile.Reader(fs, s.getPath(), job);
try {
Text key = new Text();
- DirichletCluster cluster = new DirichletCluster();
+ DirichletCluster<VectorWritable> cluster = new DirichletCluster<VectorWritable>();
while (reader.next(key, cluster)) {
clusters.add(cluster);
- cluster = new DirichletCluster();
+ cluster = new DirichletCluster<VectorWritable>();
}
} finally {
reader.close();
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterer.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletClusterer.java Wed Jun 2 12:37:36 2010
@@ -223,7 +223,7 @@ public class DirichletClusterer<O> {
return pi;
}
- public void emitPointToClusters(VectorWritable point, List<DirichletCluster> clusters,
+ public void emitPointToClusters(VectorWritable point, List<DirichletCluster<VectorWritable>> clusters,
OutputCollector<IntWritable, WeightedVectorWritable> output) throws IOException {
Vector pi = new DenseVector(clusters.size());
for (int i = 0; i < clusters.size(); i++) {
@@ -244,7 +244,7 @@ public class DirichletClusterer<O> {
* @param output
* @throws IOException
*/
- static void emitMostLikelyCluster(VectorWritable point, List<DirichletCluster> clusters, Vector pi,
+ void emitMostLikelyCluster(VectorWritable point, List<DirichletCluster<VectorWritable>> clusters, Vector pi,
OutputCollector<IntWritable, WeightedVectorWritable> output) throws IOException {
int clusterId = -1;
double clusterPdf = 0;
@@ -259,7 +259,7 @@ public class DirichletClusterer<O> {
output.collect(new IntWritable(clusterId), new WeightedVectorWritable(clusterPdf, point));
}
- void emitAllClusters(VectorWritable point, List<DirichletCluster> clusters, Vector pi,
+ void emitAllClusters(VectorWritable point, List<DirichletCluster<VectorWritable>> clusters, Vector pi,
OutputCollector<IntWritable, WeightedVectorWritable> output) throws IOException {
for (int i = 0; i < clusters.size(); i++) {
double pdf = pi.get(i);
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletMapper.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletMapper.java Wed Jun 2 12:37:36 2010
@@ -78,7 +78,7 @@ public class DirichletMapper extends Map
}
public static DirichletState<VectorWritable> getDirichletState(JobConf job)
- throws SecurityException, IllegalArgumentException, NoSuchMethodException, InvocationTargetException {
+ throws NoSuchMethodException, InvocationTargetException {
String statePath = job.get(DirichletDriver.STATE_IN_KEY);
String modelFactory = job.get(DirichletDriver.MODEL_FACTORY_KEY);
String modelPrototype = job.get(DirichletDriver.MODEL_PROTOTYPE_KEY);
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/JsonClusterAdapter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/JsonClusterAdapter.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/JsonClusterAdapter.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/JsonClusterAdapter.java Wed Jun 2 12:37:36 2010
@@ -30,7 +30,6 @@ import com.google.gson.JsonDeserializati
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
@@ -55,7 +54,7 @@ public class JsonClusterAdapter implemen
@Override
public DirichletCluster<?> deserialize(JsonElement json,
Type typeOfT,
- JsonDeserializationContext context) throws JsonParseException {
+ JsonDeserializationContext context) {
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(Vector.class, new JsonVectorAdapter());
Gson gson = builder.create();
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/JsonModelAdapter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/JsonModelAdapter.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/JsonModelAdapter.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/JsonModelAdapter.java Wed Jun 2 12:37:36 2010
@@ -30,7 +30,6 @@ import com.google.gson.JsonDeserializati
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
@@ -52,7 +51,7 @@ public class JsonModelAdapter implements
@Override
public Model<?> deserialize(JsonElement json, Type typeOfT,
- JsonDeserializationContext context) throws JsonParseException {
+ JsonDeserializationContext context) {
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(Vector.class, new JsonVectorAdapter());
Gson gson = builder.create();
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/UncommonDistributions.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/UncommonDistributions.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/UncommonDistributions.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/UncommonDistributions.java Wed Jun 2 12:37:36 2010
@@ -26,11 +26,12 @@ import org.uncommons.maths.random.Gaussi
public final class UncommonDistributions {
- private static final double sqrt2pi = Math.sqrt(2.0 * Math.PI);
+ private static final double SQRT2PI = Math.sqrt(2.0 * Math.PI);
- private static final Random random = RandomUtils.getRandom();
+ private static final Random RANDOM = RandomUtils.getRandom();
- private UncommonDistributions() { }
+ private UncommonDistributions() {
+ }
// =============== start of BSD licensed code. See LICENSE.txt
/**
@@ -40,17 +41,17 @@ public final class UncommonDistributions
*/
public static double rGamma(double k, double lambda) {
boolean accept = false;
- if (k >= 1) {
+ if (k >= 1.0) {
// Cheng's algorithm
- double b = k - Math.log(4);
- double c = k + Math.sqrt(2 * k - 1);
- double lam = Math.sqrt(2 * k - 1);
- double cheng = 1 + Math.log(4.5);
+ double b = k - Math.log(4.0);
+ double c = k + Math.sqrt(2.0 * k - 1.0);
+ double lam = Math.sqrt(2.0 * k - 1.0);
+ double cheng = 1.0 + Math.log(4.5);
double x;
do {
- double u = UncommonDistributions.random.nextDouble();
- double v = UncommonDistributions.random.nextDouble();
- double y = 1 / lam * Math.log(v / (1 - v));
+ double u = UncommonDistributions.RANDOM.nextDouble();
+ double v = UncommonDistributions.RANDOM.nextDouble();
+ double y = 1.0 / lam * Math.log(v / (1.0 - v));
x = k * Math.exp(y);
double z = u * v * v;
double r = b + c * y - x;
@@ -61,12 +62,12 @@ public final class UncommonDistributions
return x / lambda;
} else {
// Weibull algorithm
- double c = 1 / k;
- double d = (1 - k) * Math.pow(k, (k / (1 - k)));
+ double c = 1.0 / k;
+ double d = (1.0 - k) * Math.pow(k, k / (1.0 - k));
double x;
do {
- double u = UncommonDistributions.random.nextDouble();
- double v = UncommonDistributions.random.nextDouble();
+ double u = UncommonDistributions.RANDOM.nextDouble();
+ double v = UncommonDistributions.RANDOM.nextDouble();
double z = -Math.log(u);
double e = -Math.log(v);
x = Math.pow(z, c);
@@ -90,8 +91,8 @@ public final class UncommonDistributions
* @return a Vector of samples
*/
public static double rBeta(double shape1, double shape2) {
- double gam1 = rGamma(shape1, 1);
- double gam2 = rGamma(shape2, 1);
+ double gam1 = rGamma(shape1, 1.0);
+ double gam2 = rGamma(shape2, 1.0);
return gam1 / (gam1 + gam2);
}
@@ -126,7 +127,7 @@ public final class UncommonDistributions
public static double rChisq(double df) {
double result = 0.0;
for (int i = 0; i < df; i++) {
- double sample = rNorm(0, 1);
+ double sample = rNorm(0.0, 1.0);
result += sample * sample;
}
return result;
@@ -142,7 +143,7 @@ public final class UncommonDistributions
* @return a double sample
*/
public static double rNorm(double mean, double sd) {
- GaussianGenerator dist = new GaussianGenerator(mean, sd, random);
+ GaussianGenerator dist = new GaussianGenerator(mean, sd, RANDOM);
return dist.nextValue();
}
@@ -161,16 +162,16 @@ public final class UncommonDistributions
*/
public static double dNorm(double x, double m, double s) {
double xms = (x - m) / s;
- double ex = xms * xms / 2;
+ double ex = xms * xms / 2.0;
double exp = Math.exp(-ex);
- return exp / (sqrt2pi * s);
+ return exp / (SQRT2PI * s);
}
/** Returns one sample from a multinomial. */
public static int rMultinom(Vector probabilities) {
// our probability argument are not normalized.
double total = probabilities.zSum();
- double nextDouble = UncommonDistributions.random.nextDouble();
+ double nextDouble = UncommonDistributions.RANDOM.nextDouble();
double p = nextDouble * total;
for (int i = 0; i < probabilities.size(); i++) {
double p_i = probabilities.get(i);
@@ -220,17 +221,17 @@ public final class UncommonDistributions
* time-waiting algorithm.
*/
public static int rBinomial(int n, double p) {
- if (p >= 1) {
+ if (p >= 1.0) {
return n; // needed to avoid infinite loops and negative results
}
- double q = -Math.log(1 - p);
- double sum = 0;
+ double q = -Math.log(1.0 - p);
+ double sum = 0.0;
int x = 0;
while (sum <= q) {
- double u = UncommonDistributions.random.nextDouble();
+ double u = UncommonDistributions.RANDOM.nextDouble();
double e = -Math.log(u);
sum += e / (n - x);
- x += 1;
+ x++;
}
if (x == 0) {
return 0;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansClusterer.java Wed Jun 2 12:37:36 2010
@@ -272,9 +272,10 @@ public class FuzzyKMeansClusterer {
* the List<Vector> having the input points
* @param clusterList
* the List<Cluster> clusters
- * @return
*/
- public static boolean runFuzzyKMeansIteration(List<Vector> points, List<SoftCluster> clusterList, FuzzyKMeansClusterer clusterer) {
+ public static boolean runFuzzyKMeansIteration(List<Vector> points,
+ List<SoftCluster> clusterList,
+ FuzzyKMeansClusterer clusterer) {
for (Vector point : points) {
List<Double> clusterDistanceList = new ArrayList<Double>();
for (SoftCluster cluster : clusterList) {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java Wed Jun 2 12:37:36 2010
@@ -22,6 +22,7 @@ import java.io.DataOutput;
import java.io.IOException;
import java.lang.reflect.Type;
+import com.google.gson.reflect.TypeToken;
import org.apache.mahout.clustering.ClusterBase;
import org.apache.mahout.math.JsonVectorAdapter;
import org.apache.mahout.math.RandomAccessSparseVector;
@@ -31,7 +32,6 @@ import org.apache.mahout.math.list.IntAr
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
/**
* This class models a canopy as a center point, the number of points that are contained within it according
@@ -39,6 +39,8 @@ import com.google.gson.reflect.TypeToken
* used to compute the centroid when needed.
*/
public class MeanShiftCanopy extends ClusterBase {
+
+ private static final Type VECTOR_TYPE = new TypeToken<Vector>() { }.getType();
// TODO: this is problematic, but how else to encode membership?
private IntArrayList boundPoints = new IntArrayList();
@@ -233,9 +235,8 @@ public class MeanShiftCanopy extends Clu
/** Format the canopy for output */
public static String formatCanopy(MeanShiftCanopy canopy) {
- Type vectorType = new TypeToken<Vector>() { }.getType();
GsonBuilder gBuilder = new GsonBuilder();
- gBuilder.registerTypeAdapter(vectorType, new JsonVectorAdapter());
+ gBuilder.registerTypeAdapter(VECTOR_TYPE, new JsonVectorAdapter());
Gson gson = gBuilder.create();
return gson.toJson(canopy, MeanShiftCanopy.class);
}
@@ -248,9 +249,8 @@ public class MeanShiftCanopy extends Clu
* @return a new Canopy
*/
public static MeanShiftCanopy decodeCanopy(String formattedString) {
- Type vectorType = new TypeToken<Vector>() { }.getType();
GsonBuilder gBuilder = new GsonBuilder();
- gBuilder.registerTypeAdapter(vectorType, new JsonVectorAdapter());
+ gBuilder.registerTypeAdapter(VECTOR_TYPE, new JsonVectorAdapter());
Gson gson = gBuilder.create();
return gson.fromJson(formattedString, MeanShiftCanopy.class);
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterMapper.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterMapper.java Wed Jun 2 12:37:36 2010
@@ -71,7 +71,7 @@ public class MeanShiftCanopyClusterMappe
}
}
- public static List<MeanShiftCanopy> getCanopies(JobConf job) throws SecurityException, IllegalArgumentException {
+ public static List<MeanShiftCanopy> getCanopies(JobConf job) {
String statePath = job.get(MeanShiftCanopyDriver.STATE_IN_KEY);
List<MeanShiftCanopy> canopies = new ArrayList<MeanShiftCanopy>();
try {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/df/DecisionForest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/df/DecisionForest.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/df/DecisionForest.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/df/DecisionForest.java Wed Jun 2 12:37:36 2010
@@ -200,7 +200,7 @@ public class DecisionForest implements W
}
/**
- * Load the forest from a single file or a directrory of files
+ * Load the forest from a single file or a directory of files
* @param conf
* @param forestPath
* @return
@@ -208,8 +208,7 @@ public class DecisionForest implements W
*/
public static DecisionForest load(Configuration conf, Path forestPath) throws IOException {
FileSystem fs = forestPath.getFileSystem(conf);
- Path[] files = null;
-
+ Path[] files;
if (fs.getFileStatus(forestPath).isDir()) {
files = DFUtils.listOutputFiles(fs, forestPath);
} else {
@@ -219,13 +218,15 @@ public class DecisionForest implements W
DecisionForest forest = null;
for (Path path : files) {
FSDataInputStream dataInput = new FSDataInputStream(fs.open(path));
- if (forest == null) {
- forest = read(dataInput);
- } else {
- forest.readFields(dataInput);
+ try {
+ if (forest == null) {
+ forest = read(dataInput);
+ } else {
+ forest.readFields(dataInput);
+ }
+ } finally {
+ dataInput.close();
}
-
- dataInput.close();
}
return forest;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/df/ErrorEstimate.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/df/ErrorEstimate.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/df/ErrorEstimate.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/df/ErrorEstimate.java Wed Jun 2 12:37:36 2010
@@ -18,10 +18,12 @@
package org.apache.mahout.df;
/**
- * various methods to compute from the output of a random forest
+ * Various methods to compute from the output of a random forest
*/
public final class ErrorEstimate {
- private ErrorEstimate() {}
+
+ private ErrorEstimate() {
+ }
public static double errorRate(int[] labels, int[] predictions) {
if (labels.length != predictions.length) {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java Wed Jun 2 12:37:36 2010
@@ -154,7 +154,7 @@ public final class MahoutDriver {
String[] argNamePair = key.split("\\|");
String shortArg = '-' + argNamePair[0].trim();
String longArg = argNamePair.length < 2 ? null : "--" + argNamePair[1].trim();
- if(!argMap.containsKey(shortArg) && (longArg == null || !argMap.containsKey(longArg))) {
+ if (!argMap.containsKey(shortArg) && (longArg == null || !argMap.containsKey(longArg))) {
argMap.put(longArg, new String[] {mainProps.getProperty(key)});
}
}
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/TestClusterInterface.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/TestClusterInterface.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/TestClusterInterface.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/TestClusterInterface.java Wed Jun 2 12:37:36 2010
@@ -40,11 +40,8 @@ import com.google.gson.reflect.TypeToken
public class TestClusterInterface extends MahoutTestCase {
- private static final Type modelType = new TypeToken<Model<Vector>>() {
- }.getType();
-
- private static final Type clusterType = new TypeToken<DirichletCluster<Vector>>() {
- }.getType();
+ private static final Type MODEL_TYPE = new TypeToken<Model<Vector>>() {}.getType();
+ private static final Type CLUSTER_TYPE = new TypeToken<DirichletCluster<Vector>>() {}.getType();
public void testDirichletNormalModel() {
double[] d = { 1.1, 2.2, 3.3 };
@@ -56,7 +53,7 @@ public class TestClusterInterface extend
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(Model.class, new JsonModelAdapter());
Gson gson = builder.create();
- NormalModel model2 = gson.fromJson(json, modelType);
+ NormalModel model2 = gson.fromJson(json, MODEL_TYPE);
assertEquals("Json", format, model2.asFormatString(null));
}
@@ -70,7 +67,7 @@ public class TestClusterInterface extend
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(Model.class, new JsonModelAdapter());
Gson gson = builder.create();
- SampledNormalModel model2 = gson.fromJson(json, modelType);
+ SampledNormalModel model2 = gson.fromJson(json, MODEL_TYPE);
assertEquals("Json", format, model2.asFormatString(null));
}
@@ -84,7 +81,7 @@ public class TestClusterInterface extend
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(Model.class, new JsonModelAdapter());
Gson gson = builder.create();
- AsymmetricSampledNormalModel model2 = gson.fromJson(json, modelType);
+ AsymmetricSampledNormalModel model2 = gson.fromJson(json, MODEL_TYPE);
assertEquals("Json", format, model2.asFormatString(null));
}
@@ -98,7 +95,7 @@ public class TestClusterInterface extend
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(Model.class, new JsonModelAdapter());
Gson gson = builder.create();
- L1Model model2 = gson.fromJson(json, modelType);
+ L1Model model2 = gson.fromJson(json, MODEL_TYPE);
assertEquals("Json", format, model2.asFormatString(null));
}
@@ -120,7 +117,7 @@ public class TestClusterInterface extend
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(Model.class, new JsonModelAdapter());
Gson gson = builder.create();
- DirichletCluster<VectorWritable> result = gson.fromJson(json, clusterType);
+ DirichletCluster<VectorWritable> result = gson.fromJson(json, CLUSTER_TYPE);
assertNotNull("result null", result);
assertEquals("model", cluster.asFormatString(null), result.asFormatString(null));
}
@@ -144,7 +141,7 @@ public class TestClusterInterface extend
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(Model.class, new JsonModelAdapter());
Gson gson = builder.create();
- DirichletCluster<VectorWritable> result = gson.fromJson(json, clusterType);
+ DirichletCluster<VectorWritable> result = gson.fromJson(json, CLUSTER_TYPE);
assertNotNull("result null", result);
assertEquals("model", cluster.asFormatString(null), result.asFormatString(null));
}
@@ -168,7 +165,7 @@ public class TestClusterInterface extend
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(Model.class, new JsonModelAdapter());
Gson gson = builder.create();
- DirichletCluster<VectorWritable> result = gson.fromJson(json, clusterType);
+ DirichletCluster<VectorWritable> result = gson.fromJson(json, CLUSTER_TYPE);
assertNotNull("result null", result);
assertEquals("model", cluster.asFormatString(null), result.asFormatString(null));
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/analysis/WikipediaAnalyzer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/analysis/WikipediaAnalyzer.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/analysis/WikipediaAnalyzer.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/analysis/WikipediaAnalyzer.java Wed Jun 2 12:37:36 2010
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -33,7 +33,8 @@ public class WikipediaAnalyzer extends A
private final CharArraySet stopSet;
public WikipediaAnalyzer() {
- stopSet = (CharArraySet) StopFilter.makeStopSet(StopAnalyzer.ENGLISH_STOP_WORDS_SET.toArray(new String[0]));
+ stopSet = (CharArraySet) StopFilter.makeStopSet(
+ StopAnalyzer.ENGLISH_STOP_WORDS_SET.toArray(new String[StopAnalyzer.ENGLISH_STOP_WORDS_SET.size()]));
}
public WikipediaAnalyzer(CharArraySet stopSet) {
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java Wed Jun 2 12:37:36 2010
@@ -58,7 +58,8 @@ public final class GroupLensDataModel ex
try {
writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(resultFile), Charset.forName("UTF-8")));
for (String line : new FileLineIterable(originalFile, false)) {
- String convertedLine = COLON_DELIMITER_PATTERN.matcher(line.substring(0, line.lastIndexOf(COLON_DELIMTER))).replaceAll(",");
+ String subLine = line.substring(0, line.lastIndexOf(COLON_DELIMTER));
+ String convertedLine = COLON_DELIMITER_PATTERN.matcher(subLine).replaceAll(",");
writer.println(convertedLine);
}
writer.flush();
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/TransposeToByUser.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/TransposeToByUser.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/TransposeToByUser.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/netflix/TransposeToByUser.java Wed Jun 2 12:37:36 2010
@@ -86,8 +86,8 @@ public final class TransposeToByUser {
}
- private static void maybeFlushCache(File byUserDirectory, Map<String, List<String>> byUserEntryCache)
- throws IOException {
+ private static void maybeFlushCache(File byUserDirectory,
+ Map<String, List<String>> byUserEntryCache) throws IOException {
if (byUserEntryCache.size() >= 100000) {
log.info("Flushing cache");
for (Map.Entry<String, List<String>> entry : byUserEntryCache.entrySet()) {
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java Wed Jun 2 12:37:36 2010
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -20,6 +20,7 @@ package org.apache.mahout.classifier.bay
import java.io.File;
import java.io.IOException;
import java.util.HashSet;
+import java.util.Locale;
import java.util.Set;
import org.apache.commons.cli2.CommandLine;
@@ -30,7 +31,6 @@ import org.apache.commons.cli2.builder.A
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.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.DefaultStringifier;
import org.apache.hadoop.io.Text;
@@ -62,9 +62,6 @@ public final class WikipediaDatasetCreat
* <li>The output {@link org.apache.hadoop.fs.Path} where to write the classifier as a
* {@link org.apache.hadoop.io.SequenceFile}</li>
* </ol>
- *
- * @param args
- * The args
*/
public static void main(String[] args) throws IOException {
DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
@@ -112,7 +109,7 @@ public final class WikipediaDatasetCreat
Class<? extends Analyzer> analyzerClass = WikipediaAnalyzer.class;
if (cmdLine.hasOption(analyzerOpt)) {
String className = cmdLine.getValue(analyzerOpt).toString();
- analyzerClass = (Class<? extends Analyzer>) Class.forName(className);
+ analyzerClass = Class.forName(className).asSubclass(Analyzer.class);
// try instantiating it, b/c there isn't any point in setting it if
// you can't instantiate it
analyzerClass.newInstance();
@@ -151,9 +148,8 @@ public final class WikipediaDatasetCreat
Class<? extends Analyzer> analyzerClass) throws IOException {
JobClient client = new JobClient();
JobConf conf = new JobConf(WikipediaDatasetCreatorDriver.class);
- if (WikipediaDatasetCreatorDriver.log.isInfoEnabled()) {
- log.info("Input: {} Out: {} Categories: {}", new Object[] {input, output,
- catFile});
+ if (log.isInfoEnabled()) {
+ log.info("Input: {} Out: {} Categories: {}", new Object[] {input, output, catFile});
}
conf.set("key.value.separator.in.input.line", " ");
conf.set("xmlinput.start", "<text xml:space=\"preserve\">");
@@ -171,9 +167,9 @@ public final class WikipediaDatasetCreat
// conf.setCombinerClass(WikipediaDatasetCreatorReducer.class);
conf.setReducerClass(WikipediaDatasetCreatorReducer.class);
conf.setOutputFormat(WikipediaDatasetCreatorOutputFormat.class);
- conf
- .set("io.serializations",
- "org.apache.hadoop.io.serializer.JavaSerialization,org.apache.hadoop.io.serializer.WritableSerialization");
+ conf.set("io.serializations",
+ "org.apache.hadoop.io.serializer.JavaSerialization,"
+ + "org.apache.hadoop.io.serializer.WritableSerialization");
// Dont ever forget this. People should keep track of how hadoop conf
// parameters and make or break a piece of code
@@ -181,11 +177,11 @@ public final class WikipediaDatasetCreat
Set<String> categories = new HashSet<String>();
for (String line : new FileLineIterable(new File(catFile))) {
- categories.add(line.trim().toLowerCase());
+ categories.add(line.trim().toLowerCase(Locale.ENGLISH));
}
- DefaultStringifier<Set<String>> setStringifier = new DefaultStringifier<Set<String>>(conf, GenericsUtil
- .getClass(categories));
+ DefaultStringifier<Set<String>> setStringifier =
+ new DefaultStringifier<Set<String>>(conf, GenericsUtil.getClass(categories));
String categoriesStr = setStringifier.toString(categories);
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/Job.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/Job.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/Job.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/Job.java Wed Jun 2 12:37:36 2010
@@ -139,8 +139,6 @@ public final class Job {
ClassNotFoundException,
InstantiationException,
IllegalAccessException,
- SecurityException,
- IllegalArgumentException,
NoSuchMethodException,
InvocationTargetException {
HadoopUtil.overwriteOutput(output);
@@ -178,8 +176,7 @@ public final class Job {
int prototypeSize,
int numIterations,
int numModels,
- double alpha0) throws SecurityException,
- NoSuchMethodException,
+ double alpha0) throws NoSuchMethodException,
InvocationTargetException {
List<List<DirichletCluster<VectorWritable>>> clusters = new ArrayList<List<DirichletCluster<VectorWritable>>>();
JobConf conf = new JobConf(KMeansDriver.class);
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java Wed Jun 2 12:37:36 2010
@@ -134,15 +134,19 @@ public final class CDGA {
String dataset = cmdLine.getValue(inputOpt).toString();
int target = Integer.parseInt(cmdLine.getValue(labelOpt).toString());
- double threshold = cmdLine.hasOption(thresholdOpt) ?
- Double.parseDouble(cmdLine.getValue(thresholdOpt).toString()) : 0.5;
- int crosspnts = cmdLine.hasOption(crosspntsOpt) ?
- Integer.parseInt(cmdLine.getValue(crosspntsOpt).toString()) : 1;
+ double threshold = cmdLine.hasOption(thresholdOpt)
+ ? Double.parseDouble(cmdLine.getValue(thresholdOpt).toString())
+ : 0.5;
+ int crosspnts = cmdLine.hasOption(crosspntsOpt)
+ ? Integer.parseInt(cmdLine.getValue(crosspntsOpt).toString())
+ : 1;
double mutrate = Double.parseDouble(cmdLine.getValue(mutrateOpt).toString());
- double mutrange = cmdLine.hasOption(mutrangeOpt) ?
- Double.parseDouble(cmdLine.getValue(mutrangeOpt).toString()) : 0.1;
- int mutprec = cmdLine.hasOption(mutprecOpt) ?
- Integer.parseInt(cmdLine.getValue(mutprecOpt).toString()) : 2;
+ double mutrange = cmdLine.hasOption(mutrangeOpt)
+ ? Double.parseDouble(cmdLine.getValue(mutrangeOpt).toString())
+ : 0.1;
+ int mutprec = cmdLine.hasOption(mutprecOpt)
+ ? Integer.parseInt(cmdLine.getValue(mutprecOpt).toString())
+ : 2;
int popSize = Integer.parseInt(cmdLine.getValue(popsizeOpt).toString());
int genCount = Integer.parseInt(cmdLine.getValue(gencntOpt).toString());
@@ -225,7 +229,7 @@ public final class CDGA {
long hours = minutes / 60;
minutes %= 60;
- log.info("Elapsed time (Hours:minutes:seconds:milli) : {}:{}:{}:{}", new Object[] {hours, minutes,
- seconds, milli});
+ log.info("Elapsed time (Hours:minutes:seconds:milli) : {}:{}:{}:{}",
+ new Object[] {hours, minutes, seconds, milli});
}
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluator.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluator.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluator.java Wed Jun 2 12:37:36 2010
@@ -45,7 +45,8 @@ import org.apache.mahout.ga.watchmaker.c
* input path and launch a Hadoop job to evaluate the fitness of each rule. At
* the end loads the evaluations from the job output.
*/
-public class CDMahoutEvaluator {
+public final class CDMahoutEvaluator {
+
private CDMahoutEvaluator() {
}
@@ -176,8 +177,10 @@ public class CDMahoutEvaluator {
* sorted in the same order as the candidates.
* @throws IOException
*/
- private static void importEvaluations(FileSystem fs, JobConf conf,
- Path outpath, List<CDFitness> evaluations) throws IOException {
+ private static void importEvaluations(FileSystem fs,
+ JobConf conf,
+ Path outpath,
+ List<CDFitness> evaluations) throws IOException {
Sorter sorter = new Sorter(fs, LongWritable.class, CDFitness.class, conf);
// merge and sort the outputs
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java Wed Jun 2 12:37:36 2010
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
import java.util.Scanner;
import org.apache.commons.cli2.CommandLine;
@@ -34,7 +35,6 @@ import org.apache.commons.cli2.builder.G
import org.apache.commons.cli2.commandline.Parser;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
-import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.LongWritable;
@@ -165,7 +165,7 @@ public final class CDInfosTool {
while (reader.hasNextLine()) {
String c = reader.nextLine();
- descriptors.add(c.toUpperCase().charAt(0));
+ descriptors.add(c.toUpperCase(Locale.ENGLISH).charAt(0));
}
if (descriptors.isEmpty()) {
@@ -186,28 +186,28 @@ public final class CDInfosTool {
Path infpath = FileInfoParser.getInfoFile(fs, inpath);
- FSDataOutputStream out = fs.create(infpath);
- BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out));
-
- int aindex = 0;
- for (int index = 0; index < descriptors.size(); index++) {
- if (descriptors.isLabel(index)) {
- writer.write(FileInfoParser.LABEL_TOKEN + ", ");
- writer.write(descriptions.get(aindex++));
- } else if (descriptors.isNumerical(index)) {
- writer.write(FileInfoParser.NUMERICAL_TOKEN + ", ");
- writer.write(descriptions.get(aindex++));
- } else if (descriptors.isNominal(index)) {
- writer.write(FileInfoParser.NOMINAL_TOKEN + ", ");
- writer.write(descriptions.get(aindex++));
- } else {
- writer.write(FileInfoParser.IGNORED_TOKEN);
+ BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(fs.create(infpath)));
+ try {
+ int aindex = 0;
+ for (int index = 0; index < descriptors.size(); index++) {
+ if (descriptors.isLabel(index)) {
+ writer.write(FileInfoParser.LABEL_TOKEN + ", ");
+ writer.write(descriptions.get(aindex++));
+ } else if (descriptors.isNumerical(index)) {
+ writer.write(FileInfoParser.NUMERICAL_TOKEN + ", ");
+ writer.write(descriptions.get(aindex++));
+ } else if (descriptors.isNominal(index)) {
+ writer.write(FileInfoParser.NOMINAL_TOKEN + ", ");
+ writer.write(descriptions.get(aindex++));
+ } else {
+ writer.write(FileInfoParser.IGNORED_TOKEN);
+ }
+
+ writer.newLine();
}
-
- writer.newLine();
+ } finally {
+ writer.close();
}
-
- writer.close();
}
public static void main(String[] args) throws IOException {
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtils.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtils.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtils.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtils.java Wed Jun 2 12:37:36 2010
@@ -24,19 +24,10 @@ import java.util.StringTokenizer;
* Utility functions to handle Attribute's description strings.
*/
public final class DescriptionUtils {
+
private DescriptionUtils() {
}
-
- public static class Range {
- public final double min;
- public final double max;
-
- public Range(double min, double max) {
- this.max = max;
- this.min = min;
- }
- }
-
+
/**
* Create a numerical attribute description.
*
@@ -66,12 +57,11 @@ public final class DescriptionUtils {
return buffer.toString();
}
- public static Range extractNumericalRange(String description) {
+ public static double[] extractNumericalRange(String description) {
StringTokenizer tokenizer = new StringTokenizer(description, ",");
double min = Double.parseDouble(tokenizer.nextToken());
double max = Double.parseDouble(tokenizer.nextToken());
-
- return new Range(min, max);
+ return new double[] {min,max};
}
/**
* Extract all available values from the description.
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducer.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducer.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducer.java Wed Jun 2 12:37:36 2010
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -30,7 +30,6 @@ import org.apache.hadoop.mapred.OutputCo
import org.apache.hadoop.mapred.Reducer;
import org.apache.hadoop.mapred.Reporter;
import org.apache.mahout.common.StringUtils;
-import org.apache.mahout.ga.watchmaker.cd.tool.DescriptionUtils.Range;
/**
* Combines attribute description strings into a String.<br>
@@ -100,9 +99,9 @@ public class ToolReducer extends MapRedu
double max = Double.NEGATIVE_INFINITY;
while (values.hasNext()) {
- Range range = DescriptionUtils.extractNumericalRange(values.next().toString());
- min = Math.min(min, range.min);
- max = Math.max(max, range.max);
+ double[] range = DescriptionUtils.extractNumericalRange(values.next().toString());
+ min = Math.min(min, range[0]);
+ max = Math.max(max, range[1]);
}
return DescriptionUtils.createNumericalDescription(min, max);
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/TravellingSalesman.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/TravellingSalesman.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/TravellingSalesman.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/travellingsalesman/TravellingSalesman.java Wed Jun 2 12:37:36 2010
@@ -95,7 +95,7 @@ public final class TravellingSalesman ex
private SwingBackgroundTask<List<String>> createTask(final Collection<String> cities) {
final TravellingSalesmanStrategy strategy = strategyPanel.getStrategy();
return new SwingBackgroundTask<List<String>>() {
- private long elapsedTime ;
+ private long elapsedTime;
@Override
protected List<String> performTask() {
@@ -121,7 +121,7 @@ public final class TravellingSalesman ex
List<String> shortestRoute,
double distance,
long elapsedTime) {
- StringBuilder buffer = new StringBuilder();
+ StringBuilder buffer = new StringBuilder(100);
buffer.append('[');
buffer.append(strategyDescription);
buffer.append("]\n");
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/text/WikipediaMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/text/WikipediaMapper.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/text/WikipediaMapper.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/text/WikipediaMapper.java Wed Jun 2 12:37:36 2010
@@ -19,6 +19,7 @@ package org.apache.mahout.text;
import java.io.IOException;
import java.util.HashSet;
+import java.util.Locale;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -76,7 +77,7 @@ public class WikipediaMapper extends Map
if (!all) {
String catMatch = findMatchingCategory(document);
- if (catMatch.equals("Unknown")) {
+ if ("Unknown".equals(catMatch)) {
return;
}
}
@@ -95,11 +96,7 @@ public class WikipediaMapper extends Map
private static String getTitle(String xml) {
Matcher m = TITLE.matcher(xml);
- String ret = "";
- if (m.find()) {
- ret = m.group(1);
- }
- return ret;
+ return m.find() ? m.group(1) : "";
}
private String findMatchingCategory(String document) {
@@ -111,8 +108,7 @@ public class WikipediaMapper extends Map
if (endIndex >= document.length() || endIndex < 0) {
break;
}
- String category = document.substring(categoryIndex, endIndex).toLowerCase().trim();
- // categories.add(category.toLowerCase());
+ String category = document.substring(categoryIndex, endIndex).toLowerCase(Locale.ENGLISH).trim();
if (exactMatchOnly && inputCategories.contains(category)) {
return category;
} else if (exactMatchOnly == false) {
@@ -133,8 +129,8 @@ public class WikipediaMapper extends Map
if (inputCategories == null) {
Set<String> newCategories = new HashSet<String>();
- DefaultStringifier<Set<String>> setStringifier = new DefaultStringifier<Set<String>>(job,
- GenericsUtil.getClass(newCategories));
+ DefaultStringifier<Set<String>> setStringifier =
+ new DefaultStringifier<Set<String>>(job, GenericsUtil.getClass(newCategories));
String categoriesStr = setStringifier.toString(newCategories);
categoriesStr = job.get("wikipedia.categories", categoriesStr);
@@ -146,7 +142,7 @@ public class WikipediaMapper extends Map
} catch (IOException ex) {
throw new IllegalStateException(ex);
}
- log.info("Configure: Input Categories size: " + inputCategories.size() + " All: " + all
- + " Exact Match: " + exactMatchOnly);
+ log.info("Configure: Input Categories size: {} All: {} Exact Match: {}",
+ new Object[] {inputCategories.size(), all, exactMatchOnly});
}
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/text/WikipediaToSequenceFile.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/text/WikipediaToSequenceFile.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/text/WikipediaToSequenceFile.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/text/WikipediaToSequenceFile.java Wed Jun 2 12:37:36 2010
@@ -20,6 +20,7 @@ package org.apache.mahout.text;
import java.io.File;
import java.io.IOException;
import java.util.HashSet;
+import java.util.Locale;
import java.util.Set;
import org.apache.commons.cli2.CommandLine;
@@ -51,6 +52,7 @@ import org.slf4j.LoggerFactory;
* Create and run the Wikipedia Dataset Creator.
*/
public final class WikipediaToSequenceFile {
+
private static final Logger log = LoggerFactory.getLogger(WikipediaToSequenceFile.class);
private WikipediaToSequenceFile() { }
@@ -62,9 +64,6 @@ public final class WikipediaToSequenceFi
* <li>The output {@link org.apache.hadoop.fs.Path} where to write the classifier as a
* {@link org.apache.hadoop.io.SequenceFile}</li>
* </ol>
- *
- * @param args
- * The args
*/
public static void main(String[] args) throws IOException {
DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
@@ -162,8 +161,9 @@ public final class WikipediaToSequenceFi
conf.setInputFormat(XmlInputFormat.class);
conf.setReducerClass(IdentityReducer.class);
conf.setOutputFormat(SequenceFileOutputFormat.class);
- conf.set("io.serializations", "org.apache.hadoop.io.serializer.JavaSerialization,"
- + "org.apache.hadoop.io.serializer.WritableSerialization");
+ conf.set("io.serializations",
+ "org.apache.hadoop.io.serializer.JavaSerialization,"
+ + "org.apache.hadoop.io.serializer.WritableSerialization");
/*
* conf.set("mapred.compress.map.output", "true"); conf.set("mapred.map.output.compression.type",
@@ -175,12 +175,12 @@ public final class WikipediaToSequenceFi
Set<String> categories = new HashSet<String>();
if (catFile.length() > 0) {
for (String line : new FileLineIterable(new File(catFile))) {
- categories.add(line.trim().toLowerCase());
+ categories.add(line.trim().toLowerCase(Locale.ENGLISH));
}
}
- DefaultStringifier<Set<String>> setStringifier = new DefaultStringifier<Set<String>>(conf, GenericsUtil
- .getClass(categories));
+ DefaultStringifier<Set<String>> setStringifier =
+ new DefaultStringifier<Set<String>>(conf, GenericsUtil.getClass(categories));
String categoriesStr = setStringifier.toString(categories);
Modified: mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java (original)
+++ mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java Wed Jun 2 12:37:36 2010
@@ -24,7 +24,6 @@ import org.apache.hadoop.fs.Path;
import org.apache.mahout.common.HadoopUtil;
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.RandomUtils;
-import org.apache.mahout.ga.watchmaker.cd.tool.DescriptionUtils.Range;
import org.apache.commons.lang.ArrayUtils;
import java.io.BufferedWriter;
@@ -237,12 +236,10 @@ public class CDInfosToolTest extends Mah
// numerical attribute
double min = (Double) descriptions[index][0];
double max = (Double) descriptions[index][1];
- Range range = DescriptionUtils.extractNumericalRange(description);
+ double[] range = DescriptionUtils.extractNumericalRange(description);
- assertTrue("bad min value for attribute (" + index + ')',
- min <= range.min);
- assertTrue("bad max value for attribute (" + index + ')',
- max >= range.max);
+ assertTrue("bad min value for attribute (" + index + ')', min <= range[0]);
+ assertTrue("bad max value for attribute (" + index + ')', max >= range[1]);
} else if (descriptors.isNominal(index)) {
// categorical attribute
Object[] values = descriptions[index];
Modified: mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtilsTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtilsTest.java?rev=950537&r1=950536&r2=950537&view=diff
==============================================================================
--- mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtilsTest.java (original)
+++ mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/DescriptionUtilsTest.java Wed Jun 2 12:37:36 2010
@@ -18,7 +18,6 @@
package org.apache.mahout.ga.watchmaker.cd.tool;
import org.apache.mahout.common.MahoutTestCase;
-import org.apache.mahout.ga.watchmaker.cd.tool.DescriptionUtils.Range;
import java.util.ArrayList;
import java.util.Arrays;
@@ -53,11 +52,9 @@ public class DescriptionUtilsTest extend
public void testExtractNumericalRange() {
String description = "-2.06,12.32";
-
- Range range = DescriptionUtils.extractNumericalRange(description);
-
- assertEquals(-2.06, range.min);
- assertEquals(12.32, range.max);
+ double[] range = DescriptionUtils.extractNumericalRange(description);
+ assertEquals(-2.06, range[0]);
+ assertEquals(12.32, range[1]);
}
}