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 2009/09/18 11:21:21 UTC
svn commit: r816555 [1/2] - in /lucene/mahout/trunk:
core/src/main/java/org/apache/mahout/classifier/
core/src/main/java/org/apache/mahout/classifier/bayes/datastore/
core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/
core/src/main/...
Author: srowen
Date: Fri Sep 18 09:21:18 2009
New Revision: 816555
URL: http://svn.apache.org/viewvc?rev=816555&view=rev
Log:
MAHOUT-178
Added:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/CommandLineUtil.java
- copied, changed from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/CommandLineUtil.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/HadoopUtil.java
- copied, changed from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/HadoopUtil.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/StringUtils.java (contents, props changed)
- copied, changed from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/StringUtils.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/TimingStatistics.java
- copied, changed from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/TimingStatistics.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/
- copied from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/cache/
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/Cache.java
- copied, changed from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/Cache.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/CosineDistanceMeasure.java
- copied, changed from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/CosineDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/DistanceMeasure.java (contents, props changed)
- copied, changed from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/DistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/EuclideanDistanceMeasure.java (contents, props changed)
- copied, changed from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/EuclideanDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/ManhattanDistanceMeasure.java (contents, props changed)
- copied, changed from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/ManhattanDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/SquaredEuclideanDistanceMeasure.java
- copied, changed from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/SquaredEuclideanDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/TanimotoDistanceMeasure.java
- copied, changed from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/TanimotoDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedDistanceMeasure.java
- copied, changed from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedEuclideanDistanceMeasure.java
- copied, changed from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedEuclideanDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedManhattanDistanceMeasure.java
- copied, changed from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedManhattanDistanceMeasure.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/nlp/
- copied from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/nlp/
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/
- copied from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/parameters/
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/
- copied from r815239, lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/CosineDistanceMeasureTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultWeightedDistanceMeasureTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestEuclideanDistanceMeasure.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestManhattanDistanceMeasure.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestTanimotoDistanceMeasure.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestWeightedEuclideanDistanceMeasureTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestWeightedManhattanDistanceMeasure.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/UserDefinedDistanceMeasure.java (with props)
Removed:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/CosineDistanceMeasureTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/DefaultDistanceMeasureTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/DefaultWeightedDistanceMeasureTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/TestEuclideanDistanceMeasure.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/TestManhattanDistanceMeasure.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/TestTanimotoDistanceMeasure.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/TestWeightedEuclideanDistanceMeasureTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/TestWeightedManhattanDistanceMeasure.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/UserDefinedDistanceMeasure.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/utils/
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/datastore/HBaseBayesDatastore.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesFeatureMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusteringJob.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletJob.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansJob.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/SoftCluster.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAPrintTopics.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Parameters.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/HybridCache.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LFUCache.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LRUCache.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/nlp/NGrams.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/AbstractParameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/ClassParameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/CompositeParameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/DoubleParameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/FileParameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/IntegerParameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parametered.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/PathParameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/StringParameter.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/EvalMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFeatureMapperTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/DummyOutputCollector.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/StringUtilsTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/EvalMapperTest.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/MahoutEvaluatorTest.java
lucene/mahout/trunk/examples/bin/build-reuters.sh
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/canopy/DisplayCanopy.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/fuzzykmeans/DisplayFuzzyKMeans.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/kmeans/DisplayKMeans.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/meanshift/DisplayMeanShift.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluator.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMapper.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplit.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombiner.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapper.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducer.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMapperTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDReducerTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapperTest.java
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/arff/Driver.java
lucene/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/vectors/lucene/Driver.java
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java Fri Sep 18 09:21:18 2009
@@ -38,7 +38,7 @@
import org.apache.mahout.classifier.bayes.interfaces.Algorithm;
import org.apache.mahout.classifier.bayes.interfaces.Datastore;
import org.apache.mahout.classifier.bayes.model.ClassifierContext;
-import org.apache.mahout.utils.nlp.NGrams;
+import org.apache.mahout.common.nlp.NGrams;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/datastore/HBaseBayesDatastore.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/datastore/HBaseBayesDatastore.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/datastore/HBaseBayesDatastore.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/datastore/HBaseBayesDatastore.java Fri Sep 18 09:21:18 2009
@@ -33,8 +33,8 @@
import org.apache.mahout.common.Parameters;
import org.apache.mahout.classifier.bayes.exceptions.InvalidDatastoreException;
import org.apache.mahout.classifier.bayes.interfaces.Datastore;
-import org.apache.mahout.utils.Cache;
-import org.apache.mahout.utils.cache.HybridCache;
+import org.apache.mahout.common.cache.Cache;
+import org.apache.mahout.common.cache.HybridCache;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierMapper.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierMapper.java Fri Sep 18 09:21:18 2009
@@ -36,7 +36,7 @@
import org.apache.mahout.classifier.bayes.interfaces.Datastore;
import org.apache.mahout.classifier.bayes.model.ClassifierContext;
import org.apache.mahout.common.Parameters;
-import org.apache.mahout.utils.nlp.NGrams;
+import org.apache.mahout.common.nlp.NGrams;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesFeatureMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesFeatureMapper.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesFeatureMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesFeatureMapper.java Fri Sep 18 09:21:18 2009
@@ -26,7 +26,7 @@
import org.apache.hadoop.mapred.Reporter;
import org.apache.mahout.classifier.BayesFileFormatter;
import org.apache.mahout.common.Parameters;
-import org.apache.mahout.utils.nlp.NGrams;
+import org.apache.mahout.common.nlp.NGrams;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java Fri Sep 18 09:21:18 2009
@@ -24,7 +24,7 @@
import org.apache.mahout.clustering.ClusterBase;
import org.apache.mahout.matrix.AbstractVector;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.DistanceMeasure;
+import org.apache.mahout.common.distance.DistanceMeasure;
import java.io.DataInput;
import java.io.DataOutput;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusteringJob.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusteringJob.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusteringJob.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyClusteringJob.java Fri Sep 18 09:21:18 2009
@@ -27,8 +27,8 @@
import org.apache.commons.cli2.commandline.Parser;
import org.apache.mahout.matrix.SparseVector;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.CommandLineUtil;
-import org.apache.mahout.utils.SquaredEuclideanDistanceMeasure;
+import org.apache.mahout.common.CommandLineUtil;
+import org.apache.mahout.common.distance.SquaredEuclideanDistanceMeasure;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java Fri Sep 18 09:21:18 2009
@@ -36,8 +36,8 @@
import org.apache.hadoop.mapred.SequenceFileOutputFormat;
import org.apache.mahout.matrix.SparseVector;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.CommandLineUtil;
-import org.apache.mahout.utils.SquaredEuclideanDistanceMeasure;
+import org.apache.mahout.common.CommandLineUtil;
+import org.apache.mahout.common.distance.SquaredEuclideanDistanceMeasure;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterDriver.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterDriver.java Fri Sep 18 09:21:18 2009
@@ -37,8 +37,8 @@
import org.apache.hadoop.mapred.lib.IdentityReducer;
import org.apache.mahout.matrix.SparseVector;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.CommandLineUtil;
-import org.apache.mahout.utils.SquaredEuclideanDistanceMeasure;
+import org.apache.mahout.common.CommandLineUtil;
+import org.apache.mahout.common.distance.SquaredEuclideanDistanceMeasure;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletJob.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletJob.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletJob.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletJob.java Fri Sep 18 09:21:18 2009
@@ -29,7 +29,7 @@
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.JobConf;
import org.apache.log4j.Logger;
-import org.apache.mahout.utils.CommandLineUtil;
+import org.apache.mahout.common.CommandLineUtil;
import java.io.IOException;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java Fri Sep 18 09:21:18 2009
@@ -42,9 +42,9 @@
import org.apache.mahout.clustering.kmeans.RandomSeedGenerator;
import org.apache.mahout.matrix.SparseVector;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.CommandLineUtil;
-import org.apache.mahout.utils.HadoopUtil;
-import org.apache.mahout.utils.SquaredEuclideanDistanceMeasure;
+import org.apache.mahout.common.CommandLineUtil;
+import org.apache.mahout.common.HadoopUtil;
+import org.apache.mahout.common.distance.SquaredEuclideanDistanceMeasure;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansJob.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansJob.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansJob.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansJob.java Fri Sep 18 09:21:18 2009
@@ -27,8 +27,8 @@
import org.apache.commons.cli2.commandline.Parser;
import org.apache.mahout.clustering.canopy.CanopyDriver;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.CommandLineUtil;
-import org.apache.mahout.utils.ManhattanDistanceMeasure;
+import org.apache.mahout.common.distance.ManhattanDistanceMeasure;
+import org.apache.mahout.common.CommandLineUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/SoftCluster.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/SoftCluster.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/SoftCluster.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/SoftCluster.java Fri Sep 18 09:21:18 2009
@@ -25,7 +25,7 @@
import org.apache.mahout.matrix.SparseVector;
import org.apache.mahout.matrix.SquareRootFunction;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.DistanceMeasure;
+import org.apache.mahout.common.distance.DistanceMeasure;
import java.io.DataInput;
import java.io.DataOutput;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java Fri Sep 18 09:21:18 2009
@@ -24,7 +24,7 @@
import org.apache.mahout.matrix.AbstractVector;
import org.apache.mahout.matrix.SquareRootFunction;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.DistanceMeasure;
+import org.apache.mahout.common.distance.DistanceMeasure;
import java.io.DataInput;
import java.io.DataOutput;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java Fri Sep 18 09:21:18 2009
@@ -38,9 +38,9 @@
import org.apache.hadoop.mapred.SequenceFileOutputFormat;
import org.apache.mahout.matrix.SparseVector;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.CommandLineUtil;
-import org.apache.mahout.utils.HadoopUtil;
-import org.apache.mahout.utils.SquaredEuclideanDistanceMeasure;
+import org.apache.mahout.common.CommandLineUtil;
+import org.apache.mahout.common.HadoopUtil;
+import org.apache.mahout.common.distance.SquaredEuclideanDistanceMeasure;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDADriver.java Fri Sep 18 09:21:18 2009
@@ -40,8 +40,8 @@
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
import org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat;
import org.apache.mahout.matrix.DenseMatrix;
-import org.apache.mahout.utils.CommandLineUtil;
-import org.apache.mahout.utils.HadoopUtil;
+import org.apache.mahout.common.CommandLineUtil;
+import org.apache.mahout.common.HadoopUtil;
import org.apache.mahout.common.RandomUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAPrintTopics.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAPrintTopics.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAPrintTopics.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/lda/LDAPrintTopics.java Fri Sep 18 09:21:18 2009
@@ -42,7 +42,7 @@
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.SequenceFile;
-import org.apache.mahout.utils.CommandLineUtil;
+import org.apache.mahout.common.CommandLineUtil;
import org.apache.mahout.common.FileLineIterator;
/**
@@ -170,7 +170,7 @@
Option dictOpt = obuilder.withLongName("dict").withRequired(true).withArgument(
abuilder.withName("dict").withMinimum(1).withMaximum(1).create()).withDescription(
- "Dictionary to read in, created by utils.vector.Driver").withShortName("d").create();
+ "Dictionary to read in, created by common.vector.Driver").withShortName("d").create();
Option outOpt = obuilder.withLongName("output").withRequired(true).withArgument(
abuilder.withName("output").withMinimum(1).withMaximum(1).create()).withDescription(
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java Fri Sep 18 09:21:18 2009
@@ -31,8 +31,8 @@
import org.apache.mahout.matrix.JsonVectorAdapter;
import org.apache.mahout.matrix.PlusFunction;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.DistanceMeasure;
-import org.apache.mahout.utils.EuclideanDistanceMeasure;
+import org.apache.mahout.common.distance.DistanceMeasure;
+import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
import java.io.DataInput;
import java.io.DataOutput;
Copied: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/CommandLineUtil.java (from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/CommandLineUtil.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/CommandLineUtil.java?p2=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/CommandLineUtil.java&p1=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/CommandLineUtil.java&r1=815239&r2=816555&rev=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/CommandLineUtil.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/CommandLineUtil.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils;
+package org.apache.mahout.common;
import org.apache.commons.cli2.Group;
import org.apache.commons.cli2.util.HelpFormatter;
Copied: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/HadoopUtil.java (from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/HadoopUtil.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/HadoopUtil.java?p2=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/HadoopUtil.java&p1=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/HadoopUtil.java&r1=815239&r2=816555&rev=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/HadoopUtil.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/HadoopUtil.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils;
+package org.apache.mahout.common;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Parameters.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Parameters.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Parameters.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Parameters.java Fri Sep 18 09:21:18 2009
@@ -1,3 +1,20 @@
+/**
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.mahout.common;
import java.io.IOException;
@@ -32,9 +49,7 @@
public String get(String key, String defaultValue) {
String ret = params.get(key);
- if (ret == null)
- return defaultValue;
- return ret;
+ return ret == null ? defaultValue : ret;
}
public void set(String key, String value) {
Copied: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/StringUtils.java (from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/StringUtils.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/StringUtils.java?p2=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/StringUtils.java&p1=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/StringUtils.java&r1=815239&r2=816555&rev=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/StringUtils.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/StringUtils.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils;
+package org.apache.mahout.common;
import com.thoughtworks.xstream.XStream;
@@ -29,6 +29,7 @@
private static final XStream xstream = new XStream();
private static final Pattern NEWLINE_PATTERN = Pattern.compile("\n");
+ public static final String LINE_SEP = System.getProperty("line.separator");
private StringUtils() {
// do nothing
Propchange: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/StringUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/TimingStatistics.java (from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/TimingStatistics.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/TimingStatistics.java?p2=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/TimingStatistics.java&p1=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/TimingStatistics.java&r1=815239&r2=816555&rev=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/TimingStatistics.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/TimingStatistics.java Fri Sep 18 09:21:18 2009
@@ -1,5 +1,22 @@
-package org.apache.mahout.utils;
-import java.beans.ConstructorProperties;
+/**
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.mahout.common;
+
import java.io.Serializable;
public class TimingStatistics implements Serializable {
@@ -12,9 +29,7 @@
/** Creates a new instance of CallStats */
public TimingStatistics() {
}
-
- @ConstructorProperties({"nCalls", "minTime", "maxTime", "sumTime",
- "sumSquaredTime"})
+
public TimingStatistics(int nCalls, long minTime, long maxTime, long sumTime,
double sumSquaredTime) {
this.nCalls = nCalls;
Copied: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/Cache.java (from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/Cache.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/Cache.java?p2=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/Cache.java&p1=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/Cache.java&r1=815239&r2=816555&rev=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/Cache.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/Cache.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils;
+package org.apache.mahout.common.cache;
public interface Cache<K, V> {
/**
@@ -25,31 +25,31 @@
* @param key
* @return V
*/
- public V get(K key);
+ V get(K key);
/**
* returns true if the Cache contains the key
* @param key
* @return boolean
*/
- public boolean contains(K key);
+ boolean contains(K key);
/**
* puts the key and its value into the cache
* @param key
* @param value
*/
- public void set(K key, V value);
+ void set(K key, V value);
/**
* returns the current size of the cache
* @return long
*/
- public long size();
+ long size();
/**
* returns the total capacity of the cache defined at contruction time
* @return long
*/
- public long capacity();
+ long capacity();
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/HybridCache.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/HybridCache.java?rev=816555&r1=815239&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/HybridCache.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/HybridCache.java Fri Sep 18 09:21:18 2009
@@ -15,9 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.cache;
-
-import org.apache.mahout.utils.Cache;
+package org.apache.mahout.common.cache;
public class HybridCache<K, V> implements Cache<K, V> {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LFUCache.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LFUCache.java?rev=816555&r1=815239&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LFUCache.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LFUCache.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.cache;
+package org.apache.mahout.common.cache;
import java.util.ConcurrentModificationException;
import java.util.HashMap;
@@ -28,7 +28,6 @@
import java.util.concurrent.atomic.AtomicLong;
import org.apache.mahout.common.Pair;
-import org.apache.mahout.utils.Cache;
public class LFUCache<K, V> implements Cache<K, V> {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LRUCache.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LRUCache.java?rev=816555&r1=815239&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LRUCache.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/cache/LRUCache.java Fri Sep 18 09:21:18 2009
@@ -15,14 +15,11 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.cache;
-
-import org.apache.mahout.utils.Cache;
+package org.apache.mahout.common.cache;
import java.util.LinkedHashMap;
import java.util.Map;
-
public class LRUCache<K, V> implements Cache<K, V> {
int capacity = 0;
Copied: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/CosineDistanceMeasure.java (from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/CosineDistanceMeasure.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/CosineDistanceMeasure.java?p2=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/CosineDistanceMeasure.java&p1=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/CosineDistanceMeasure.java&r1=815239&r2=816555&rev=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/CosineDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/CosineDistanceMeasure.java Fri Sep 18 09:21:18 2009
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.mahout.utils;
+package org.apache.mahout.common.distance;
import org.apache.hadoop.mapred.JobConf;
import org.apache.mahout.matrix.CardinalityException;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.parameters.Parameter;
+import org.apache.mahout.common.parameters.Parameter;
import java.util.Collection;
import java.util.Collections;
Copied: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/DistanceMeasure.java (from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/DistanceMeasure.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/DistanceMeasure.java?p2=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/DistanceMeasure.java&p1=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/DistanceMeasure.java&r1=815239&r2=816555&rev=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/DistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/DistanceMeasure.java Fri Sep 18 09:21:18 2009
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.mahout.utils;
+package org.apache.mahout.common.distance;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.parameters.Parametered;
+import org.apache.mahout.common.parameters.Parametered;
/** This interface is used for objects which can determine a distance metric between two points */
public interface DistanceMeasure extends Parametered {
Propchange: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/DistanceMeasure.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/EuclideanDistanceMeasure.java (from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/EuclideanDistanceMeasure.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/EuclideanDistanceMeasure.java?p2=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/EuclideanDistanceMeasure.java&p1=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/EuclideanDistanceMeasure.java&r1=815239&r2=816555&rev=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/EuclideanDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/EuclideanDistanceMeasure.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils;
+package org.apache.mahout.common.distance;
import org.apache.mahout.matrix.Vector;
Propchange: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/EuclideanDistanceMeasure.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/ManhattanDistanceMeasure.java (from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/ManhattanDistanceMeasure.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/ManhattanDistanceMeasure.java?p2=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/ManhattanDistanceMeasure.java&p1=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/ManhattanDistanceMeasure.java&r1=815239&r2=816555&rev=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/ManhattanDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/ManhattanDistanceMeasure.java Fri Sep 18 09:21:18 2009
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.mahout.utils;
+package org.apache.mahout.common.distance;
import org.apache.hadoop.mapred.JobConf;
import org.apache.mahout.matrix.CardinalityException;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.parameters.Parameter;
+import org.apache.mahout.common.parameters.Parameter;
import java.util.Collection;
import java.util.Collections;
Propchange: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/ManhattanDistanceMeasure.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/SquaredEuclideanDistanceMeasure.java (from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/SquaredEuclideanDistanceMeasure.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/SquaredEuclideanDistanceMeasure.java?p2=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/SquaredEuclideanDistanceMeasure.java&p1=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/SquaredEuclideanDistanceMeasure.java&r1=815239&r2=816555&rev=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/SquaredEuclideanDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/SquaredEuclideanDistanceMeasure.java Fri Sep 18 09:21:18 2009
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package org.apache.mahout.utils;
+package org.apache.mahout.common.distance;
import org.apache.hadoop.mapred.JobConf;
import org.apache.mahout.matrix.CardinalityException;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.parameters.Parameter;
+import org.apache.mahout.common.parameters.Parameter;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
/**
- * Like {@link org.apache.mahout.utils.EuclideanDistanceMeasure} but it does not take the square root. <p/> Thus, it is
+ * Like {@link EuclideanDistanceMeasure} but it does not take the square root. <p/> Thus, it is
* not actually the Euclidean Distance, but it is saves on computation when you only need the distance for comparison
* and don't care about the actual value as a distance.
*/
Copied: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/TanimotoDistanceMeasure.java (from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/TanimotoDistanceMeasure.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/TanimotoDistanceMeasure.java?p2=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/TanimotoDistanceMeasure.java&p1=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/TanimotoDistanceMeasure.java&r1=815239&r2=816555&rev=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/TanimotoDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/TanimotoDistanceMeasure.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils;
+package org.apache.mahout.common.distance;
import org.apache.mahout.matrix.Vector;
Copied: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedDistanceMeasure.java (from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedDistanceMeasure.java?p2=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedDistanceMeasure.java&p1=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java&r1=815239&r2=816555&rev=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedDistanceMeasure.java Fri Sep 18 09:21:18 2009
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.mahout.utils;
+package org.apache.mahout.common.distance;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.JobConf;
import org.apache.mahout.matrix.DenseVector;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.parameters.ClassParameter;
-import org.apache.mahout.utils.parameters.Parameter;
-import org.apache.mahout.utils.parameters.PathParameter;
+import org.apache.mahout.common.parameters.ClassParameter;
+import org.apache.mahout.common.parameters.Parameter;
+import org.apache.mahout.common.parameters.PathParameter;
import java.io.DataInputStream;
import java.io.FileNotFoundException;
Copied: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedEuclideanDistanceMeasure.java (from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedEuclideanDistanceMeasure.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedEuclideanDistanceMeasure.java?p2=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedEuclideanDistanceMeasure.java&p1=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedEuclideanDistanceMeasure.java&r1=815239&r2=816555&rev=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedEuclideanDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedEuclideanDistanceMeasure.java Fri Sep 18 09:21:18 2009
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.mahout.utils;
+package org.apache.mahout.common.distance;
import org.apache.mahout.matrix.Vector;
import java.util.Iterator;
/**
- * This class implements a Euclidian distance metric by summing the square root of the squared differences between each
+ * This class implements a Euclidean distance metric by summing the square root of the squared differences between each
* coordinate, optionally adding weights.
*/
public class WeightedEuclideanDistanceMeasure extends WeightedDistanceMeasure {
Copied: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedManhattanDistanceMeasure.java (from r815239, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedManhattanDistanceMeasure.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedManhattanDistanceMeasure.java?p2=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedManhattanDistanceMeasure.java&p1=lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedManhattanDistanceMeasure.java&r1=815239&r2=816555&rev=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedManhattanDistanceMeasure.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/distance/WeightedManhattanDistanceMeasure.java Fri Sep 18 09:21:18 2009
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.mahout.utils;
+package org.apache.mahout.common.distance;
import org.apache.mahout.matrix.Vector;
import java.util.Iterator;
/**
- * This class implements a "manhattan distance" metric by summing the absolute values of the difference between each
+ * This class implements a "Manhattan distance" metric by summing the absolute values of the difference between each
* coordinate, optionally with weights.
*/
public class WeightedManhattanDistanceMeasure extends WeightedDistanceMeasure {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/nlp/NGrams.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/nlp/NGrams.java?rev=816555&r1=815239&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/nlp/NGrams.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/nlp/NGrams.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.nlp;
+package org.apache.mahout.common.nlp;
import java.util.ArrayList;
import java.util.HashMap;
@@ -25,9 +25,9 @@
public class NGrams {
- private String line;
+ private final String line;
- private int gramSize;
+ private final int gramSize;
public NGrams(String line, int gramSize) {
this.line = line;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/AbstractParameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/AbstractParameter.java?rev=816555&r1=815239&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/AbstractParameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/AbstractParameter.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.parameters;
+package org.apache.mahout.common.parameters;
import org.apache.hadoop.mapred.JobConf;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/ClassParameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/ClassParameter.java?rev=816555&r1=815239&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/ClassParameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/ClassParameter.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.parameters;
+package org.apache.mahout.common.parameters;
import org.apache.hadoop.mapred.JobConf;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/CompositeParameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/CompositeParameter.java?rev=816555&r1=815239&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/CompositeParameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/CompositeParameter.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.parameters;
+package org.apache.mahout.common.parameters;
import org.apache.hadoop.mapred.JobConf;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/DoubleParameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/DoubleParameter.java?rev=816555&r1=815239&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/DoubleParameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/DoubleParameter.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.parameters;
+package org.apache.mahout.common.parameters;
import org.apache.hadoop.mapred.JobConf;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/FileParameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/FileParameter.java?rev=816555&r1=815239&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/FileParameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/FileParameter.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.parameters;
+package org.apache.mahout.common.parameters;
import org.apache.hadoop.mapred.JobConf;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/IntegerParameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/IntegerParameter.java?rev=816555&r1=815239&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/IntegerParameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/IntegerParameter.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.parameters;
+package org.apache.mahout.common.parameters;
import org.apache.hadoop.mapred.JobConf;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parameter.java?rev=816555&r1=815239&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parameter.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.parameters;
+package org.apache.mahout.common.parameters;
/**
* An accessor to a parameters in the job.
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parametered.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parametered.java?rev=816555&r1=815239&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parametered.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/Parametered.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.parameters;
+package org.apache.mahout.common.parameters;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.JobConfigurable;
@@ -64,9 +64,9 @@
}
/**
- * Calls {@link org.apache.mahout.utils.parameters.Parametered#createParameters(String,org.apache.hadoop.mapred.JobConf)}
+ * Calls {@link org.apache.mahout.common.parameters.Parametered#createParameters(String,org.apache.hadoop.mapred.JobConf)}
* on parameter parmetered, and then recurse down its composite tree to invoke {@link
- * org.apache.mahout.utils.parameters.Parametered#createParameters(String,org.apache.hadoop.mapred.JobConf)} and
+ * org.apache.mahout.common.parameters.Parametered#createParameters(String,org.apache.hadoop.mapred.JobConf)} and
* {@link org.apache.hadoop.mapred.JobConfigurable#configure(org.apache.hadoop.mapred.JobConf)} on each composite
* part.
*
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/PathParameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/PathParameter.java?rev=816555&r1=815239&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/PathParameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/PathParameter.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.parameters;
+package org.apache.mahout.common.parameters;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.JobConf;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/StringParameter.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/StringParameter.java?rev=816555&r1=815239&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/StringParameter.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/StringParameter.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils.parameters;
+package org.apache.mahout.common.parameters;
import org.apache.hadoop.mapred.JobConf;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/EvalMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/EvalMapper.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/EvalMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/EvalMapper.java Fri Sep 18 09:21:18 2009
@@ -25,7 +25,7 @@
import org.apache.hadoop.mapred.Mapper;
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reporter;
-import org.apache.mahout.utils.StringUtils;
+import org.apache.mahout.common.StringUtils;
import org.uncommons.watchmaker.framework.FitnessEvaluator;
import java.io.IOException;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java Fri Sep 18 09:21:18 2009
@@ -28,7 +28,7 @@
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.SequenceFileOutputFormat;
import org.apache.hadoop.mapred.TextInputFormat;
-import org.apache.mahout.utils.StringUtils;
+import org.apache.mahout.common.StringUtils;
import org.uncommons.watchmaker.framework.FitnessEvaluator;
import java.io.BufferedWriter;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFeatureMapperTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFeatureMapperTest.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFeatureMapperTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/BayesFeatureMapperTest.java Fri Sep 18 09:21:18 2009
@@ -18,16 +18,13 @@
package org.apache.mahout.classifier.bayes;
import junit.framework.TestCase;
-import org.apache.hadoop.io.DefaultStringifier;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.Reporter;
-import org.apache.hadoop.mapred.TaskReport;
-import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.mahout.classifier.bayes.mapreduce.common.BayesFeatureMapper;
import org.apache.mahout.classifier.bayes.common.BayesParameters;
-import org.apache.mahout.utils.DummyOutputCollector;
+import org.apache.mahout.common.DummyOutputCollector;
import java.util.List;
import java.util.Map;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java Fri Sep 18 09:21:18 2009
@@ -29,11 +29,11 @@
import org.apache.mahout.clustering.ClusteringTestUtils;
import org.apache.mahout.matrix.SparseVector;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.DistanceMeasure;
-import org.apache.mahout.utils.DummyOutputCollector;
-import org.apache.mahout.utils.EuclideanDistanceMeasure;
-import org.apache.mahout.utils.ManhattanDistanceMeasure;
-import org.apache.mahout.utils.UserDefinedDistanceMeasure;
+import org.apache.mahout.common.distance.DistanceMeasure;
+import org.apache.mahout.common.DummyOutputCollector;
+import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
+import org.apache.mahout.common.distance.ManhattanDistanceMeasure;
+import org.apache.mahout.common.distance.UserDefinedDistanceMeasure;
import java.io.File;
import java.util.ArrayList;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/TestMapReduce.java Fri Sep 18 09:21:18 2009
@@ -36,7 +36,7 @@
import org.apache.mahout.matrix.JsonVectorAdapter;
import org.apache.mahout.matrix.SparseVector;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.DummyOutputCollector;
+import org.apache.mahout.common.DummyOutputCollector;
import org.apache.mahout.common.RandomUtils;
import java.io.File;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java Fri Sep 18 09:21:18 2009
@@ -28,9 +28,9 @@
import org.apache.mahout.clustering.kmeans.TestKmeansClustering;
import org.apache.mahout.matrix.SparseVector;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.DistanceMeasure;
-import org.apache.mahout.utils.DummyOutputCollector;
-import org.apache.mahout.utils.EuclideanDistanceMeasure;
+import org.apache.mahout.common.distance.DistanceMeasure;
+import org.apache.mahout.common.DummyOutputCollector;
+import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
import java.io.File;
import java.util.ArrayList;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java Fri Sep 18 09:21:18 2009
@@ -31,11 +31,11 @@
import org.apache.mahout.matrix.DenseVector;
import org.apache.mahout.matrix.SparseVector;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.DistanceMeasure;
-import org.apache.mahout.utils.DummyOutputCollector;
-import org.apache.mahout.utils.EuclideanDistanceMeasure;
-import org.apache.mahout.utils.HadoopUtil;
-import org.apache.mahout.utils.ManhattanDistanceMeasure;
+import org.apache.mahout.common.distance.DistanceMeasure;
+import org.apache.mahout.common.DummyOutputCollector;
+import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
+import org.apache.mahout.common.HadoopUtil;
+import org.apache.mahout.common.distance.ManhattanDistanceMeasure;
import org.apache.mahout.common.FileLineIterable;
import java.io.File;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java?rev=816555&r1=816554&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java Fri Sep 18 09:21:18 2009
@@ -27,9 +27,9 @@
import org.apache.hadoop.mapred.JobConf;
import org.apache.mahout.matrix.DenseVector;
import org.apache.mahout.matrix.Vector;
-import org.apache.mahout.utils.DistanceMeasure;
-import org.apache.mahout.utils.DummyOutputCollector;
-import org.apache.mahout.utils.EuclideanDistanceMeasure;
+import org.apache.mahout.common.distance.DistanceMeasure;
+import org.apache.mahout.common.DummyOutputCollector;
+import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
import java.io.File;
import java.io.IOException;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/DummyOutputCollector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/DummyOutputCollector.java?rev=816555&r1=815239&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/DummyOutputCollector.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/DummyOutputCollector.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils;
+package org.apache.mahout.common;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/StringUtilsTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/StringUtilsTest.java?rev=816555&r1=815239&r2=816555&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/StringUtilsTest.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/StringUtilsTest.java Fri Sep 18 09:21:18 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.utils;
+package org.apache.mahout.common;
import junit.framework.TestCase;
Added: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/CosineDistanceMeasureTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/CosineDistanceMeasureTest.java?rev=816555&view=auto
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/CosineDistanceMeasureTest.java (added)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/CosineDistanceMeasureTest.java Fri Sep 18 09:21:18 2009
@@ -0,0 +1,59 @@
+/**
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.mahout.common.distance;
+
+import junit.framework.TestCase;
+import org.apache.mahout.matrix.DenseVector;
+import org.apache.mahout.matrix.Vector;
+
+public class CosineDistanceMeasureTest extends TestCase {
+
+ public void testMeasure() {
+
+ DistanceMeasure distanceMeasure = new CosineDistanceMeasure();
+
+ Vector[] vectors = {
+ new DenseVector(new double[]{1, 0, 0, 0, 0, 0}),
+ new DenseVector(new double[]{1, 1, 1, 0, 0, 0}),
+ new DenseVector(new double[]{1, 1, 1, 1, 1, 1})
+ };
+
+ double[][] distanceMatrix = new double[3][3];
+
+ for (int a = 0; a < 3; a++) {
+ for (int b = 0; b < 3; b++) {
+ distanceMatrix[a][b] = distanceMeasure.distance(vectors[a], vectors[b]);
+ }
+ }
+
+ assertEquals(0.0, distanceMatrix[0][0]);
+ assertTrue(distanceMatrix[0][0] < distanceMatrix[0][1]);
+ assertTrue(distanceMatrix[0][1] < distanceMatrix[0][2]);
+
+ assertEquals(0.0, distanceMatrix[1][1]);
+ assertTrue(distanceMatrix[1][0] > distanceMatrix[1][1]);
+ assertTrue(distanceMatrix[1][2] < distanceMatrix[1][0]);
+
+ assertEquals(0.0, distanceMatrix[2][2]);
+ assertTrue(distanceMatrix[2][0] > distanceMatrix[2][1]);
+ assertTrue(distanceMatrix[2][1] > distanceMatrix[2][2]);
+
+
+ }
+
+}
Added: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java?rev=816555&view=auto
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java (added)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultDistanceMeasureTest.java Fri Sep 18 09:21:18 2009
@@ -0,0 +1,82 @@
+/**
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.mahout.common.distance;
+
+import junit.framework.TestCase;
+import org.apache.mahout.matrix.DenseVector;
+import org.apache.mahout.matrix.SparseVector;
+import org.apache.mahout.matrix.Vector;
+
+public abstract class DefaultDistanceMeasureTest extends TestCase {
+
+ public abstract DistanceMeasure distanceMeasureFactory();
+
+ public void testMeasure() {
+
+ DistanceMeasure distanceMeasure = distanceMeasureFactory();
+
+ Vector[] vectors = {
+ new DenseVector(new double[]{1, 1, 1, 1, 1, 1}),
+ new DenseVector(new double[]{2, 2, 2, 2, 2, 2}),
+ new DenseVector(new double[]{6, 6, 6, 6, 6, 6})
+ };
+
+ compare(distanceMeasure, vectors);
+
+ vectors = new Vector[3];
+ vectors[0] = new SparseVector(5);
+ vectors[0].setQuick(0, 1);
+ vectors[0].setQuick(3, 1);
+ vectors[0].setQuick(4, 1);
+
+ vectors[1] = new SparseVector(5);
+ vectors[1].setQuick(0, 2);
+ vectors[1].setQuick(3, 2);
+ vectors[1].setQuick(4, 2);
+
+ vectors[2] = new SparseVector(5);
+ vectors[2].setQuick(0, 6);
+ vectors[2].setQuick(3, 6);
+ vectors[2].setQuick(4, 6);
+
+ compare(distanceMeasure, vectors);
+ }
+
+ private void compare(DistanceMeasure distanceMeasure, Vector[] vectors) {
+ double[][] distanceMatrix = new double[3][3];
+
+ for (int a = 0; a < 3; a++) {
+ for (int b = 0; b < 3; b++) {
+ distanceMatrix[a][b] = distanceMeasure.distance(vectors[a], vectors[b]);
+ }
+ }
+
+ assertEquals(0.0, distanceMatrix[0][0]);
+ assertTrue(distanceMatrix[0][0] < distanceMatrix[0][1]);
+ assertTrue(distanceMatrix[0][1] < distanceMatrix[0][2]);
+
+ assertEquals(0.0, distanceMatrix[1][1]);
+ assertTrue(distanceMatrix[1][0] > distanceMatrix[1][1]);
+ assertTrue(distanceMatrix[1][2] > distanceMatrix[1][0]);
+
+ assertEquals(0.0, distanceMatrix[2][2]);
+ assertTrue(distanceMatrix[2][0] > distanceMatrix[2][1]);
+ assertTrue(distanceMatrix[2][1] > distanceMatrix[2][2]);
+ }
+
+}
Added: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultWeightedDistanceMeasureTest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultWeightedDistanceMeasureTest.java?rev=816555&view=auto
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultWeightedDistanceMeasureTest.java (added)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/DefaultWeightedDistanceMeasureTest.java Fri Sep 18 09:21:18 2009
@@ -0,0 +1,54 @@
+/**
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.mahout.common.distance;
+
+import org.apache.mahout.matrix.DenseVector;
+import org.apache.mahout.matrix.Vector;
+
+public abstract class DefaultWeightedDistanceMeasureTest extends DefaultDistanceMeasureTest {
+
+ @Override
+ public abstract WeightedDistanceMeasure distanceMeasureFactory();
+
+ public void testMeasureWeighted() {
+
+ WeightedDistanceMeasure distanceMeasure = distanceMeasureFactory();
+
+ Vector[] vectors = {
+ new DenseVector(new double[]{9, 9, 1}),
+ new DenseVector(new double[]{1, 9, 9}),
+ new DenseVector(new double[]{9, 1, 9}),
+ };
+ distanceMeasure.setWeights(new DenseVector(new double[]{1, 1000, 1}));
+
+ double[][] distanceMatrix = new double[3][3];
+
+ for (int a = 0; a < 3; a++) {
+ for (int b = 0; b < 3; b++) {
+ distanceMatrix[a][b] = distanceMeasure.distance(vectors[a], vectors[b]);
+ }
+ }
+
+ assertEquals(0.0, distanceMatrix[0][0]);
+ assertTrue(distanceMatrix[0][1] < distanceMatrix[0][2]);
+
+
+ }
+
+
+}
Added: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestEuclideanDistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestEuclideanDistanceMeasure.java?rev=816555&view=auto
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestEuclideanDistanceMeasure.java (added)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestEuclideanDistanceMeasure.java Fri Sep 18 09:21:18 2009
@@ -0,0 +1,26 @@
+/**
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.mahout.common.distance;
+
+public class TestEuclideanDistanceMeasure extends DefaultDistanceMeasureTest {
+
+ @Override
+ public DistanceMeasure distanceMeasureFactory() {
+ return new EuclideanDistanceMeasure();
+ }
+}
Added: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestManhattanDistanceMeasure.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestManhattanDistanceMeasure.java?rev=816555&view=auto
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestManhattanDistanceMeasure.java (added)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/common/distance/TestManhattanDistanceMeasure.java Fri Sep 18 09:21:18 2009
@@ -0,0 +1,26 @@
+/**
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.mahout.common.distance;
+
+public class TestManhattanDistanceMeasure extends DefaultDistanceMeasureTest {
+
+ @Override
+ public DistanceMeasure distanceMeasureFactory() {
+ return new ManhattanDistanceMeasure();
+ }
+}