You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ss...@apache.org on 2013/07/29 09:39:55 UTC
svn commit: r1507960 [1/2] - in /mahout/trunk: ./
core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/
core/src/main/java/org/apache/mahout/cf/taste/hadoop/slopeone/
core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/
core/src/main/...
Author: ssc
Date: Mon Jul 29 07:39:53 2013
New Revision: 1507960
URL: http://svn.apache.org/r1507960
Log:
MAHOUT-1296 - Remove deprecated algorithms
Added:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/UncommonDistributions.java
- copied, changed from r1507892, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/UncommonDistributions.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/AffinityMatrixInputJob.java
- copied, changed from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/AffinityMatrixInputMapper.java
- copied, changed from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/AffinityMatrixInputReducer.java
- copied, changed from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/IntDoublePairWritable.java
- copied, changed from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/IntDoublePairWritable.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/Keys.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/MatrixDiagonalizeJob.java
- copied, changed from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/MatrixDiagonalizeJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/UnitVectorizerJob.java
- copied, changed from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/UnitVectorizerJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/VectorCache.java
- copied, changed from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorCache.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/VectorMatrixMultiplicationJob.java
- copied, changed from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorMatrixMultiplicationJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/VertexWritable.java
- copied, changed from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VertexWritable.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestAffinityMatrixInputJob.java
- copied, changed from r1507954, mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestAffinityMatrixInputJob.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestMatrixDiagonalizeJob.java
- copied, changed from r1507954, mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestMatrixDiagonalizeJob.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestUnitVectorizerJob.java
- copied, changed from r1507954, mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestUnitVectorizerJob.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorCache.java
- copied, changed from r1507954, mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestVectorCache.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorMatrixMultiplicationJob.java
- copied, changed from r1507954, mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestVectorMatrixMultiplicationJob.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/similarity/precompute/example/GroupLensDataModel.java
- copied, changed from r1507892, mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java
Removed:
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/pseudo/
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/slopeone/
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/BiasedItemBasedRecommender.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/ClusterSimilarity.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/FarthestNeighborClusterSimilarity.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NearestNeighborClusterSimilarity.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender2.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/knn/
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/FunkSVDFactorizer.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/ImplicitLinearRegressionFactorizer.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/transforms/
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/recommender/ClusteringRecommender.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/recommender/slopeone/
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/transforms/
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/discriminative/
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/iterator/DirichletClusteringPolicy.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/iterator/MeanShiftClusteringPolicy.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/IntDoublePairWritable.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/MatrixDiagonalizeJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/UnitVectorizerJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorCache.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorMatrixMultiplicationJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VertexWritable.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/eigencuts/
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/
mahout/trunk/core/src/main/java/org/apache/mahout/math/stats/entropy/
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/AverageAbsoluteDifferenceRecommenderEvaluatorTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/RMSRecommenderEvaluatorTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/BiasedItemBasedRecommenderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommender2Test.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/TreeClusteringRecommenderTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/knn/
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/transforms/
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/discriminative/
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/dirichlet/
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/minhash/
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/eigencuts/
mahout/trunk/core/src/test/java/org/apache/mahout/fpm/pfpgrowth/
mahout/trunk/core/src/test/java/org/apache/mahout/math/stats/entropy/
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/jester/
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayDirichlet.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayMeanShift.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayMinHash.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/minhash/
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/
mahout/trunk/examples/src/main/java/org/apache/mahout/fpm/pfpgrowth/
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/jdbc/
mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/conversion/meanshift/
mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/dirichlet/
Modified:
mahout/trunk/CHANGELOG
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AbstractSimilarity.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/kmeans/SpectralKMeansDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/commandline/DefaultOptionCreator.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDHelper.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJobTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluatorImplTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/TestClusterInterface.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/TestGaussianAccumulators.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/iterator/TestClusterClassifier.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDPCADenseTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverSparseSequentialTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/EncodedVectorsFromSequenceFilesTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/HighDFWordsPrunerTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/SparseVectorsFromSequenceFilesTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocReducerTest.java
mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducerTest.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingDataModel.java
mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/similarity/precompute/example/BatchItemSimilaritiesGroupLens.java
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sequencelearning/hmm/PosTagger.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/hbase/HBaseDataModel.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/AbstractClusterWriter.java
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java
mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java
mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterEvaluator.java
mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/cdbw/TestCDbwEvaluator.java
mahout/trunk/math/src/test/java/org/apache/mahout/math/randomized/RandomBlasting.java
Modified: mahout/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/mahout/trunk/CHANGELOG?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/CHANGELOG (original)
+++ mahout/trunk/CHANGELOG Mon Jul 29 07:39:53 2013
@@ -2,6 +2,8 @@ Mahout Change Log
Release 0.9 - unreleased
+ MAHOUT-1296: Remove deprecated algorithms (ssc)
+
MAHOUT-1295: Excluded all Maven's target directories from distribution archives (sslavic)
MAHOUT-1294: Cleanup previously installed artifacts from CI server local repository (sslavic)
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AbstractSimilarity.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AbstractSimilarity.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AbstractSimilarity.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/AbstractSimilarity.java Mon Jul 29 07:39:53 2013
@@ -28,8 +28,6 @@ import org.apache.mahout.cf.taste.model.
import org.apache.mahout.cf.taste.model.PreferenceArray;
import org.apache.mahout.cf.taste.similarity.PreferenceInferrer;
import org.apache.mahout.cf.taste.similarity.UserSimilarity;
-import org.apache.mahout.cf.taste.transforms.PreferenceTransform;
-import org.apache.mahout.cf.taste.transforms.SimilarityTransform;
import com.google.common.base.Preconditions;
@@ -37,8 +35,6 @@ import com.google.common.base.Preconditi
abstract class AbstractSimilarity extends AbstractItemSimilarity implements UserSimilarity {
private PreferenceInferrer inferrer;
- private PreferenceTransform prefTransform;
- private SimilarityTransform similarityTransform;
private final boolean weighted;
private final boolean centerData;
private int cachedNumItems;
@@ -78,26 +74,6 @@ abstract class AbstractSimilarity extend
this.inferrer = inferrer;
}
- public final PreferenceTransform getPrefTransform() {
- return prefTransform;
- }
-
- public final void setPrefTransform(PreferenceTransform prefTransform) {
- refreshHelper.addDependency(prefTransform);
- refreshHelper.removeDependency(this.prefTransform);
- this.prefTransform = prefTransform;
- }
-
- public final SimilarityTransform getSimilarityTransform() {
- return similarityTransform;
- }
-
- public final void setSimilarityTransform(SimilarityTransform similarityTransform) {
- refreshHelper.addDependency(similarityTransform);
- refreshHelper.removeDependency(this.similarityTransform);
- this.similarityTransform = similarityTransform;
- }
-
final boolean isWeighted() {
return weighted;
}
@@ -156,7 +132,6 @@ abstract class AbstractSimilarity extend
int count = 0;
boolean hasInferrer = inferrer != null;
- boolean hasPrefTransform = prefTransform != null;
while (true) {
int compare = xIndex < yIndex ? -1 : xIndex > yIndex ? 1 : 0;
@@ -165,29 +140,20 @@ abstract class AbstractSimilarity extend
double y;
if (xIndex == yIndex) {
// Both users expressed a preference for the item
- if (hasPrefTransform) {
- x = prefTransform.getTransformedValue(xPrefs.get(xPrefIndex));
- y = prefTransform.getTransformedValue(yPrefs.get(yPrefIndex));
- } else {
- x = xPrefs.getValue(xPrefIndex);
- y = yPrefs.getValue(yPrefIndex);
- }
+ x = xPrefs.getValue(xPrefIndex);
+ y = yPrefs.getValue(yPrefIndex);
} else {
// Only one user expressed a preference, but infer the other one's preference and tally
// as if the other user expressed that preference
if (compare < 0) {
// X has a value; infer Y's
- x = hasPrefTransform
- ? prefTransform.getTransformedValue(xPrefs.get(xPrefIndex))
- : xPrefs.getValue(xPrefIndex);
+ x = xPrefs.getValue(xPrefIndex);
y = inferrer.inferPreference(userID2, xIndex);
} else {
// compare > 0
// Y has a value; infer X's
x = inferrer.inferPreference(userID1, yIndex);
- y = hasPrefTransform
- ? prefTransform.getTransformedValue(yPrefs.get(yPrefIndex))
- : yPrefs.getValue(yPrefIndex);
+ y = yPrefs.getValue(yPrefIndex);
}
}
sumXY += x * y;
@@ -249,10 +215,6 @@ abstract class AbstractSimilarity extend
result = computeResult(count, sumXY, sumX2, sumY2, sumXYdiff2);
}
- if (similarityTransform != null) {
- result = similarityTransform.transformSimilarity(userID1, userID2, result);
- }
-
if (!Double.isNaN(result)) {
result = normalizeWeightResult(result, count, cachedNumItems);
}
@@ -332,10 +294,6 @@ abstract class AbstractSimilarity extend
result = computeResult(count, sumXY, sumX2, sumY2, sumXYdiff2);
}
- if (similarityTransform != null) {
- result = similarityTransform.transformSimilarity(itemID1, itemID2, result);
- }
-
if (!Double.isNaN(result)) {
result = normalizeWeightResult(result, count, cachedNumUsers);
}
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/UncommonDistributions.java (from r1507892, 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/UncommonDistributions.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/UncommonDistributions.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/UncommonDistributions.java&r1=1507892&r2=1507960&rev=1507960&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/UncommonDistributions.java Mon Jul 29 07:39:53 2013
@@ -15,24 +15,18 @@
* limitations under the License.
*/
-package org.apache.mahout.clustering.dirichlet;
+package org.apache.mahout.clustering;
import org.apache.commons.math3.distribution.NormalDistribution;
import org.apache.commons.math3.distribution.RealDistribution;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.common.RandomWrapper;
-import org.apache.mahout.math.DenseVector;
-import org.apache.mahout.math.Vector;
-@Deprecated
public final class UncommonDistributions {
-
- public static final double SQRT2PI = Math.sqrt(2.0 * Math.PI);
-
+
private static final RandomWrapper RANDOM = RandomUtils.getRandom();
- private UncommonDistributions() {
- }
+ private UncommonDistributions() {}
// =============== start of BSD licensed code. See LICENSE.txt
/**
@@ -99,42 +93,6 @@ public final class UncommonDistributions
}
/**
- * Returns a vector of random samples from a beta distribution with the given shapes
- *
- * @param k
- * the number of samples to return
- * @param shape1
- * a double representing shape1
- * @param shape2
- * a double representing shape2
- * @return a Vector of samples
- */
- public static Vector rBeta(int k, double shape1, double shape2) {
- // List<Double> params = new ArrayList<Double>(2);
- // params.add(shape1);
- // params.add(Math.max(0, shape2));
- Vector result = new DenseVector(k);
- for (int i = 0; i < k; i++) {
- result.set(i, rBeta(shape1, shape2));
- }
- return result;
- }
-
- /**
- * Return a random sample from the chi-squared (chi^2) distribution with df degrees of freedom.
- *
- * @return a double sample
- */
- public static double rChisq(double df) {
- double result = 0.0;
- for (int i = 0; i < df; i++) {
- double sample = rNorm(0.0, 1.0);
- result += sample * sample;
- }
- return result;
- }
-
- /**
* Return a random value from a normal distribution with the given mean and standard deviation
*
* @param mean
@@ -152,74 +110,6 @@ public final class UncommonDistributions
}
/**
- * Return the normal density function value for the sample x
- *
- * pdf = 1/[sqrt(2*p)*s] * e^{-1/2*[(x-m)/s]^2}
- *
- * @param x
- * a double sample value
- * @param m
- * a double mean value
- * @param s
- * a double standard deviation
- * @return a double probability value
- */
- public static double dNorm(double x, double m, double s) {
- double xms = (x - m) / s;
- double ex = xms * xms / 2.0;
- double exp = Math.exp(-ex);
- 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 = RANDOM.nextDouble();
- double p = nextDouble * total;
- for (int i = 0; i < probabilities.size(); i++) {
- double pi = probabilities.get(i);
- if (p < pi) {
- return i;
- } else {
- p -= pi;
- }
- }
- // can't happen except for round-off error so we don't care what we return here
- return 0;
- }
-
- /**
- * Returns a multinomial vector sampled from the given probabilities
- *
- * rmultinom should be implemented as successive binomial sampling.
- *
- * Keep a normalizing amount that starts with 1 (I call it total).
- *
- * For each i k[i] = rbinom(p[i] / total, size); total -= p[i]; size -= k[i];
- *
- * @param size
- * the size parameter of the binomial distribution
- * @param probabilities
- * a Vector of probabilities
- * @return a multinomial distribution Vector
- */
- public static Vector rMultinom(int size, Vector probabilities) {
- // our probability argument may not be normalized.
- double total = probabilities.zSum();
- int cardinality = probabilities.size();
- Vector result = new DenseVector(cardinality);
- for (int i = 0; total > 0 && i < cardinality; i++) {
- double p = probabilities.get(i);
- int ki = rBinomial(size, p / total);
- total -= p;
- size -= ki;
- result.set(i, ki);
- }
- return result;
- }
-
- /**
* Returns an integer sampled according to this distribution. Takes time proportional to np + 1. (Reference:
* Non-Uniform Random Variate Generation, Devroye http://cgm.cs.mcgill.ca/~luc/rnbookindex.html) Second
* time-waiting algorithm.
@@ -242,30 +132,5 @@ public final class UncommonDistributions
}
return x - 1;
}
-
- /**
- * Sample from a Dirichlet distribution, returning a vector of probabilities using a stick-breaking
- * algorithm
- *
- * @param totalCounts
- * an unnormalized count Vector
- * @param alpha0
- * a double
- * @return a Vector of probabilities
- */
- public static Vector rDirichlet(Vector totalCounts, double alpha0) {
- Vector pi = totalCounts.like();
- double total = totalCounts.zSum();
- double remainder = 1.0;
- for (int k = 0; k < pi.size(); k++) {
- double countK = totalCounts.get(k);
- total -= countK;
- double betaK = rBeta(1.0 + countK, Math.max(0.0, alpha0 + total));
- double piK = betaK * remainder;
- pi.set(k, piK);
- remainder -= piK;
- }
- return pi;
- }
-
+
}
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/AffinityMatrixInputJob.java (from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputJob.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/AffinityMatrixInputJob.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/AffinityMatrixInputJob.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputJob.java&r1=1507954&r2=1507960&rev=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/AffinityMatrixInputJob.java Mon Jul 29 07:39:53 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.clustering.spectral.common;
+package org.apache.mahout.clustering.spectral;
import java.io.IOException;
@@ -26,7 +26,6 @@ import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
import org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat;
-import org.apache.mahout.clustering.spectral.eigencuts.EigencutsKeys;
import org.apache.mahout.common.HadoopUtil;
import org.apache.mahout.math.VectorWritable;
import org.apache.mahout.math.hadoop.DistributedRowMatrix;
@@ -45,7 +44,7 @@ public final class AffinityMatrixInputJo
Configuration conf = new Configuration();
HadoopUtil.delete(conf, output);
- conf.setInt(EigencutsKeys.AFFINITY_DIMENSIONS, rows);
+ conf.setInt(Keys.AFFINITY_DIMENSIONS, rows);
Job job = new Job(conf, "AffinityMatrixInputJob: " + input + " -> M/R -> " + output);
job.setMapOutputKeyClass(IntWritable.class);
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/AffinityMatrixInputMapper.java (from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputMapper.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/AffinityMatrixInputMapper.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/AffinityMatrixInputMapper.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputMapper.java&r1=1507954&r2=1507960&rev=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/AffinityMatrixInputMapper.java Mon Jul 29 07:39:53 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.clustering.spectral.common;
+package org.apache.mahout.clustering.spectral;
import java.io.IOException;
import java.util.regex.Pattern;
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/AffinityMatrixInputReducer.java (from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputReducer.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/AffinityMatrixInputReducer.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/AffinityMatrixInputReducer.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputReducer.java&r1=1507954&r2=1507960&rev=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputReducer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/AffinityMatrixInputReducer.java Mon Jul 29 07:39:53 2013
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-package org.apache.mahout.clustering.spectral.common;
+package org.apache.mahout.clustering.spectral;
import java.io.IOException;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.mapreduce.Reducer;
-import org.apache.mahout.clustering.spectral.eigencuts.EigencutsKeys;
import org.apache.mahout.math.RandomAccessSparseVector;
import org.apache.mahout.math.SequentialAccessSparseVector;
import org.apache.mahout.math.VectorWritable;
@@ -44,7 +43,7 @@ public class AffinityMatrixInputReducer
@Override
protected void reduce(IntWritable row, Iterable<DistributedRowMatrix.MatrixEntryWritable> values, Context context)
throws IOException, InterruptedException {
- int size = context.getConfiguration().getInt(EigencutsKeys.AFFINITY_DIMENSIONS, Integer.MAX_VALUE);
+ int size = context.getConfiguration().getInt(Keys.AFFINITY_DIMENSIONS, Integer.MAX_VALUE);
RandomAccessSparseVector out = new RandomAccessSparseVector(size, 100);
for (DistributedRowMatrix.MatrixEntryWritable element : values) {
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/IntDoublePairWritable.java (from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/IntDoublePairWritable.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/IntDoublePairWritable.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/IntDoublePairWritable.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/IntDoublePairWritable.java&r1=1507954&r2=1507960&rev=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/IntDoublePairWritable.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/IntDoublePairWritable.java Mon Jul 29 07:39:53 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.clustering.spectral.common;
+package org.apache.mahout.clustering.spectral;
import java.io.DataInput;
import java.io.DataOutput;
Added: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/Keys.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/Keys.java?rev=1507960&view=auto
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/Keys.java (added)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/Keys.java Mon Jul 29 07:39:53 2013
@@ -0,0 +1,31 @@
+/**
+ * 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.clustering.spectral;
+
+public class Keys {
+
+ /**
+ * Sets the SequenceFile index for the diagonal matrix.
+ */
+ public static final int DIAGONAL_CACHE_INDEX = 1;
+
+ public static final String AFFINITY_DIMENSIONS = "org.apache.mahout.clustering.spectral.common.affinitydimensions";
+
+ private Keys() {}
+
+}
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/MatrixDiagonalizeJob.java (from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/MatrixDiagonalizeJob.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/MatrixDiagonalizeJob.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/MatrixDiagonalizeJob.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/MatrixDiagonalizeJob.java&r1=1507954&r2=1507960&rev=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/MatrixDiagonalizeJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/MatrixDiagonalizeJob.java Mon Jul 29 07:39:53 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.clustering.spectral.common;
+package org.apache.mahout.clustering.spectral;
import java.io.IOException;
@@ -30,7 +30,6 @@ import org.apache.hadoop.mapreduce.lib.i
import org.apache.hadoop.mapreduce.lib.input.SequenceFileInputFormat;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
import org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat;
-import org.apache.mahout.clustering.spectral.eigencuts.EigencutsKeys;
import org.apache.mahout.common.HadoopUtil;
import org.apache.mahout.math.DenseVector;
import org.apache.mahout.math.Vector;
@@ -52,7 +51,7 @@ public final class MatrixDiagonalizeJob
Configuration conf = new Configuration();
Path diagOutput = new Path(affInput.getParent(), "diagonal");
HadoopUtil.delete(conf, diagOutput);
- conf.setInt(EigencutsKeys.AFFINITY_DIMENSIONS, dimensions);
+ conf.setInt(Keys.AFFINITY_DIMENSIONS, dimensions);
Job job = new Job(conf, "MatrixDiagonalizeJob");
job.setInputFormatClass(SequenceFileInputFormat.class);
@@ -97,8 +96,7 @@ public final class MatrixDiagonalizeJob
protected void reduce(NullWritable key, Iterable<IntDoublePairWritable> values,
Context context) throws IOException, InterruptedException {
// create the return vector
- Vector retval = new DenseVector(context.getConfiguration().getInt(
- EigencutsKeys.AFFINITY_DIMENSIONS, Integer.MAX_VALUE));
+ Vector retval = new DenseVector(context.getConfiguration().getInt(Keys.AFFINITY_DIMENSIONS, Integer.MAX_VALUE));
// put everything in its correct spot
for (IntDoublePairWritable e : values) {
retval.setQuick(e.getKey(), e.getValue());
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/UnitVectorizerJob.java (from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/UnitVectorizerJob.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/UnitVectorizerJob.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/UnitVectorizerJob.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/UnitVectorizerJob.java&r1=1507954&r2=1507960&rev=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/UnitVectorizerJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/UnitVectorizerJob.java Mon Jul 29 07:39:53 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.clustering.spectral.common;
+package org.apache.mahout.clustering.spectral;
import java.io.IOException;
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/VectorCache.java (from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorCache.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/VectorCache.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/VectorCache.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorCache.java&r1=1507954&r2=1507960&rev=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorCache.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/VectorCache.java Mon Jul 29 07:39:53 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.clustering.spectral.common;
+package org.apache.mahout.clustering.spectral;
import java.io.IOException;
import java.net.URI;
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/VectorMatrixMultiplicationJob.java (from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorMatrixMultiplicationJob.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/VectorMatrixMultiplicationJob.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/VectorMatrixMultiplicationJob.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorMatrixMultiplicationJob.java&r1=1507954&r2=1507960&rev=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorMatrixMultiplicationJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/VectorMatrixMultiplicationJob.java Mon Jul 29 07:39:53 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.clustering.spectral.common;
+package org.apache.mahout.clustering.spectral;
import java.io.IOException;
@@ -29,7 +29,6 @@ import org.apache.hadoop.mapreduce.lib.i
import org.apache.hadoop.mapreduce.lib.input.SequenceFileInputFormat;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
import org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat;
-import org.apache.mahout.clustering.spectral.eigencuts.EigencutsKeys;
import org.apache.mahout.math.DenseVector;
import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
@@ -71,7 +70,7 @@ public final class VectorMatrixMultiplic
markovPath = fs.makeQualified(markovPath);
outputPath = fs.makeQualified(outputPath);
Path vectorOutputPath = new Path(outputPath.getParent(), "vector");
- VectorCache.save(new IntWritable(EigencutsKeys.DIAGONAL_CACHE_INDEX), diag, vectorOutputPath, conf);
+ VectorCache.save(new IntWritable(Keys.DIAGONAL_CACHE_INDEX), diag, vectorOutputPath, conf);
// set up the job itself
Job job = new Job(conf, "VectorMatrixMultiplication");
Copied: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/VertexWritable.java (from r1507954, mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VertexWritable.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/VertexWritable.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/VertexWritable.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VertexWritable.java&r1=1507954&r2=1507960&rev=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VertexWritable.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/VertexWritable.java Mon Jul 29 07:39:53 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.clustering.spectral.common;
+package org.apache.mahout.clustering.spectral;
import java.io.DataInput;
import java.io.DataOutput;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/kmeans/SpectralKMeansDriver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/kmeans/SpectralKMeansDriver.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/kmeans/SpectralKMeansDriver.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/kmeans/SpectralKMeansDriver.java Mon Jul 29 07:39:53 2013
@@ -32,10 +32,10 @@ import org.apache.mahout.clustering.Clus
import org.apache.mahout.clustering.classify.WeightedVectorWritable;
import org.apache.mahout.clustering.kmeans.EigenSeedGenerator;
import org.apache.mahout.clustering.kmeans.KMeansDriver;
-import org.apache.mahout.clustering.spectral.common.AffinityMatrixInputJob;
-import org.apache.mahout.clustering.spectral.common.MatrixDiagonalizeJob;
-import org.apache.mahout.clustering.spectral.common.UnitVectorizerJob;
-import org.apache.mahout.clustering.spectral.common.VectorMatrixMultiplicationJob;
+import org.apache.mahout.clustering.spectral.AffinityMatrixInputJob;
+import org.apache.mahout.clustering.spectral.MatrixDiagonalizeJob;
+import org.apache.mahout.clustering.spectral.UnitVectorizerJob;
+import org.apache.mahout.clustering.spectral.VectorMatrixMultiplicationJob;
import org.apache.mahout.common.AbstractJob;
import org.apache.mahout.common.ClassUtils;
import org.apache.mahout.common.HadoopUtil;
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/common/commandline/DefaultOptionCreator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/common/commandline/DefaultOptionCreator.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/common/commandline/DefaultOptionCreator.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/common/commandline/DefaultOptionCreator.java Mon Jul 29 07:39:53 2013
@@ -21,7 +21,6 @@ import org.apache.commons.cli2.Option;
import org.apache.commons.cli2.builder.ArgumentBuilder;
import org.apache.commons.cli2.builder.DefaultOptionBuilder;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.mahout.clustering.meanshift.MeanShiftCanopyDriver;
import org.apache.mahout.common.distance.SquaredEuclideanDistanceMeasure;
import org.apache.mahout.clustering.kernel.TriangularKernelProfile;
@@ -390,19 +389,6 @@ public final class DefaultOptionCreator
"The classname of the IKernelProfile. Default is TriangularKernelProfile");
}
- public static DefaultOptionBuilder inputIsCanopiesOption() {
- return new DefaultOptionBuilder()
- .withLongName(MeanShiftCanopyDriver.INPUT_IS_CANOPIES_OPTION)
- .withRequired(false)
- .withShortName("ic")
- .withArgument(
- new ArgumentBuilder()
- .withName(MeanShiftCanopyDriver.INPUT_IS_CANOPIES_OPTION)
- .withMinimum(1).withMaximum(1).create())
- .withDescription(
- "If present, the input directory already contains MeanShiftCanopies");
- }
-
/**
* Returns a default command line option for specification of OUTLIER THRESHOLD value. Used for
* Cluster Classification.
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDHelper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDHelper.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDHelper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/stochasticsvd/SSVDHelper.java Mon Jul 29 07:39:53 2013
@@ -36,7 +36,6 @@ import org.apache.mahout.common.iterator
import org.apache.mahout.common.iterator.sequencefile.SequenceFileDirValueIterator;
import org.apache.mahout.common.iterator.sequencefile.SequenceFileValueIterable;
import org.apache.mahout.math.*;
-import org.apache.mahout.math.UpperTriangular;
import org.apache.mahout.math.function.Functions;
import com.google.common.collect.Lists;
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJobTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJobTest.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJobTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJobTest.java Mon Jul 29 07:39:53 2013
@@ -21,7 +21,6 @@ import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluatorImplTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluatorImplTest.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluatorImplTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/eval/GenericRecommenderIRStatsEvaluatorImplTest.java Mon Jul 29 07:39:53 2013
@@ -17,7 +17,6 @@
package org.apache.mahout.cf.taste.impl.eval;
-import org.apache.mahout.cf.taste.common.TasteException;
import org.apache.mahout.cf.taste.eval.DataModelBuilder;
import org.apache.mahout.cf.taste.eval.IRStatistics;
import org.apache.mahout.cf.taste.eval.RecommenderBuilder;
@@ -26,7 +25,6 @@ import org.apache.mahout.cf.taste.impl.T
import org.apache.mahout.cf.taste.impl.common.FastByIDMap;
import org.apache.mahout.cf.taste.impl.model.GenericBooleanPrefDataModel;
import org.apache.mahout.cf.taste.impl.recommender.GenericBooleanPrefItemBasedRecommender;
-import org.apache.mahout.cf.taste.impl.recommender.slopeone.SlopeOneRecommender;
import org.apache.mahout.cf.taste.impl.similarity.LogLikelihoodSimilarity;
import org.apache.mahout.cf.taste.model.DataModel;
import org.apache.mahout.cf.taste.model.PreferenceArray;
@@ -36,25 +34,6 @@ import org.junit.Test;
public final class GenericRecommenderIRStatsEvaluatorImplTest extends TasteTestCase {
@Test
- public void testEvaluate() throws Exception {
- DataModel model = getDataModel();
- RecommenderBuilder builder = new RecommenderBuilder() {
- @Override
- public Recommender buildRecommender(DataModel dataModel) throws TasteException {
- return new SlopeOneRecommender(dataModel);
- }
- };
- RecommenderIRStatsEvaluator evaluator = new GenericRecommenderIRStatsEvaluator();
- IRStatistics stats = evaluator.evaluate(builder, null, model, null, 1, 0.2, 1.0);
- assertNotNull(stats);
- assertEquals(0.75, stats.getPrecision(), EPSILON);
- assertEquals(0.75, stats.getRecall(), EPSILON);
- assertEquals(0.75, stats.getF1Measure(), EPSILON);
- assertEquals(0.75, stats.getFNMeasure(2.0), EPSILON);
- assertEquals(0.75, stats.getNormalizedDiscountedCumulativeGain(), EPSILON);
- }
-
- @Test
public void testBoolean() throws Exception {
DataModel model = getBooleanDataModel();
RecommenderBuilder builder = new RecommenderBuilder() {
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=1507960&r1=1507959&r2=1507960&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 Mon Jul 29 07:39:53 2013
@@ -18,7 +18,6 @@
package org.apache.mahout.clustering;
import org.apache.mahout.clustering.canopy.Canopy;
-import org.apache.mahout.clustering.meanshift.MeanShiftCanopy;
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.distance.ManhattanDistanceMeasure;
@@ -110,44 +109,4 @@ public final class TestClusterInterface
assertEquals("CL-123{n=0 c=[0:1.100, 2:3.300] r=[]}", formatString);
}
- @Test
- public void testMSCanopyAsFormatString() {
- double[] d = { 1.1, 2.2, 3.3 };
- Vector m = new DenseVector(d);
- Cluster cluster = new MeanShiftCanopy(m, 123, measure);
- String formatString = cluster.asFormatString(null);
- assertEquals("MSC-123{n=0 c=[1.100, 2.200, 3.300] r=[]}", formatString);
- }
-
- @Test
- public void testMSCanopyAsFormatStringSparse() {
- double[] d = { 1.1, 0.0, 3.3 };
- Vector m = new SequentialAccessSparseVector(3);
- m.assign(d);
- Cluster cluster = new MeanShiftCanopy(m, 123, measure);
- String formatString = cluster.asFormatString(null);
- assertEquals("MSC-123{n=0 c=[0:1.100, 2:3.300] r=[]}", formatString);
- }
-
- @Test
- public void testMSCanopyAsFormatStringWithBindings() {
- double[] d = { 1.1, 2.2, 3.3 };
- Vector m = new DenseVector(d);
- Cluster cluster = new MeanShiftCanopy(m, 123, measure);
- String[] bindings = { "fee", null, "foo" };
- String formatString = cluster.asFormatString(bindings);
- assertEquals("MSC-123{n=0 c=[fee:1.100, 1:2.200, foo:3.300] r=[]}", formatString);
- }
-
- @Test
- public void testMSCanopyAsFormatStringSparseWithBindings() {
- double[] d = { 1.1, 0.0, 3.3 };
- Vector m = new SequentialAccessSparseVector(3);
- m.assign(d);
- Cluster cluster = new MeanShiftCanopy(m, 123, measure);
- String[] bindings = { "fee", null, "foo" };
- String formatString = cluster.asFormatString(bindings);
- assertEquals("MSC-123{n=0 c=[fee:1.100, foo:3.300] r=[]}", formatString);
- }
-
}
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/TestGaussianAccumulators.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/TestGaussianAccumulators.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/TestGaussianAccumulators.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/TestGaussianAccumulators.java Mon Jul 29 07:39:53 2013
@@ -19,7 +19,6 @@ package org.apache.mahout.clustering;
import java.util.Collection;
import com.google.common.collect.Lists;
-import org.apache.mahout.clustering.dirichlet.UncommonDistributions;
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.DenseVector;
import org.apache.mahout.math.Vector;
@@ -68,7 +67,7 @@ public final class TestGaussianAccumulat
/**
* Generate random samples and add them to the sampleData
- *
+ *
* @param num
* int number of samples to generate
* @param mx
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/iterator/TestClusterClassifier.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/iterator/TestClusterClassifier.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/iterator/TestClusterClassifier.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/iterator/TestClusterClassifier.java Mon Jul 29 07:39:53 2013
@@ -28,10 +28,8 @@ import org.apache.mahout.clustering.Clus
import org.apache.mahout.clustering.ClusteringTestUtils;
import org.apache.mahout.clustering.canopy.Canopy;
import org.apache.mahout.clustering.classify.ClusterClassifier;
-import org.apache.mahout.clustering.dirichlet.models.GaussianCluster;
import org.apache.mahout.clustering.fuzzykmeans.SoftCluster;
import org.apache.mahout.clustering.kmeans.TestKmeansClustering;
-import org.apache.mahout.clustering.meanshift.MeanShiftCanopy;
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.distance.CosineDistanceMeasure;
import org.apache.mahout.common.distance.DistanceMeasure;
@@ -81,14 +79,6 @@ public final class TestClusterClassifier
return new ClusterClassifier(models, new FuzzyKMeansClusteringPolicy());
}
- private static ClusterClassifier newGaussianClassifier() {
- List<Cluster> models = Lists.newArrayList();
- models.add(new GaussianCluster(new DenseVector(2).assign(1), new DenseVector(2).assign(1), 0));
- models.add(new GaussianCluster(new DenseVector(2), new DenseVector(2).assign(1), 1));
- models.add(new GaussianCluster(new DenseVector(2).assign(-1), new DenseVector(2).assign(1), 2));
- return new ClusterClassifier(models, new DirichletClusteringPolicy(3, 1.0));
- }
-
private ClusterClassifier writeAndRead(ClusterClassifier classifier) throws IOException {
Path path = new Path(getTestTempDirPath(), "output");
classifier.writeToSeqFiles(path);
@@ -129,17 +119,6 @@ public final class TestClusterClassifier
assertEquals("[2,2]", "[0.493, 0.296, 0.211]", AbstractCluster.formatVector(pdf, null));
}
- @Test(expected = UnsupportedOperationException.class)
- public void testMSCanopyClassification() {
- List<Cluster> models = Lists.newArrayList();
- DistanceMeasure measure = new ManhattanDistanceMeasure();
- models.add(new MeanShiftCanopy(new DenseVector(2).assign(1), 0, measure));
- models.add(new MeanShiftCanopy(new DenseVector(2), 1, measure));
- models.add(new MeanShiftCanopy(new DenseVector(2).assign(-1), 2, measure));
- ClusterClassifier classifier = new ClusterClassifier(models, new MeanShiftClusteringPolicy());
- classifier.classify(new DenseVector(2));
- }
-
@Test
public void testSoftClusterClassification() {
ClusterClassifier classifier = newSoftClusterClassifier();
@@ -150,15 +129,6 @@ public final class TestClusterClassifier
}
@Test
- public void testGaussianClusterClassification() {
- ClusterClassifier classifier = newGaussianClassifier();
- Vector pdf = classifier.classify(new DenseVector(2));
- assertEquals("[0,0]", "[0.212, 0.576, 0.212]", AbstractCluster.formatVector(pdf, null));
- pdf = classifier.classify(new DenseVector(2).assign(2));
- assertEquals("[2,2]", "[0.952, 0.047, 0.000]", AbstractCluster.formatVector(pdf, null));
- }
-
- @Test
public void testDMClassifierSerialization() throws Exception {
ClusterClassifier classifier = newDMClassifier();
ClusterClassifier classifierOut = writeAndRead(classifier);
@@ -186,15 +156,6 @@ public final class TestClusterClassifier
}
@Test
- public void testGaussianClassifierSerialization() throws Exception {
- ClusterClassifier classifier = newGaussianClassifier();
- ClusterClassifier classifierOut = writeAndRead(classifier);
- assertEquals(classifier.getModels().size(), classifierOut.getModels().size());
- assertEquals(classifier.getModels().get(0).getClass().getName(), classifierOut.getModels().get(0).getClass()
- .getName());
- }
-
- @Test
public void testClusterIteratorKMeans() {
List<Vector> data = TestKmeansClustering.getPoints(TestKmeansClustering.REFERENCE);
ClusterClassifier prior = newKlusterClassifier();
Copied: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestAffinityMatrixInputJob.java (from r1507954, mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestAffinityMatrixInputJob.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestAffinityMatrixInputJob.java?p2=mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestAffinityMatrixInputJob.java&p1=mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestAffinityMatrixInputJob.java&r1=1507954&r2=1507960&rev=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestAffinityMatrixInputJob.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestAffinityMatrixInputJob.java Mon Jul 29 07:39:53 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.clustering.spectral.common;
+package org.apache.mahout.clustering.spectral;
import java.util.List;
import java.util.Map;
@@ -27,7 +27,6 @@ import org.apache.hadoop.io.LongWritable
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapreduce.Mapper;
import org.apache.hadoop.mapreduce.Reducer;
-import org.apache.mahout.clustering.spectral.eigencuts.EigencutsKeys;
import org.apache.mahout.common.DummyRecordWriter;
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.Vector;
@@ -72,7 +71,7 @@ public class TestAffinityMatrixInputJob
public void testAffinityMatrixInputMapper() throws Exception {
AffinityMatrixInputMapper mapper = new AffinityMatrixInputMapper();
Configuration conf = new Configuration();
- conf.setInt(EigencutsKeys.AFFINITY_DIMENSIONS, RAW_DIMENSIONS);
+ conf.setInt(Keys.AFFINITY_DIMENSIONS, RAW_DIMENSIONS);
// set up the dummy writer and the M/R context
DummyRecordWriter<IntWritable, MatrixEntryWritable> writer =
@@ -99,7 +98,7 @@ public class TestAffinityMatrixInputJob
public void testAffinitymatrixInputReducer() throws Exception {
AffinityMatrixInputMapper mapper = new AffinityMatrixInputMapper();
Configuration conf = new Configuration();
- conf.setInt(EigencutsKeys.AFFINITY_DIMENSIONS, RAW_DIMENSIONS);
+ conf.setInt(Keys.AFFINITY_DIMENSIONS, RAW_DIMENSIONS);
// set up the dummy writer and the M/R context
DummyRecordWriter<IntWritable, MatrixEntryWritable> mapWriter =
Copied: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestMatrixDiagonalizeJob.java (from r1507954, mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestMatrixDiagonalizeJob.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestMatrixDiagonalizeJob.java?p2=mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestMatrixDiagonalizeJob.java&p1=mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestMatrixDiagonalizeJob.java&r1=1507954&r2=1507960&rev=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestMatrixDiagonalizeJob.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestMatrixDiagonalizeJob.java Mon Jul 29 07:39:53 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.clustering.spectral.common;
+package org.apache.mahout.clustering.spectral;
import java.util.List;
@@ -24,9 +24,8 @@ import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.mapreduce.Mapper;
import org.apache.hadoop.mapreduce.Reducer;
-import org.apache.mahout.clustering.spectral.common.MatrixDiagonalizeJob.MatrixDiagonalizeMapper;
-import org.apache.mahout.clustering.spectral.common.MatrixDiagonalizeJob.MatrixDiagonalizeReducer;
-import org.apache.mahout.clustering.spectral.eigencuts.EigencutsKeys;
+import org.apache.mahout.clustering.spectral.MatrixDiagonalizeJob.MatrixDiagonalizeMapper;
+import org.apache.mahout.clustering.spectral.MatrixDiagonalizeJob.MatrixDiagonalizeReducer;
import org.apache.mahout.common.DummyRecordWriter;
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.RandomAccessSparseVector;
@@ -56,10 +55,10 @@ public class TestMatrixDiagonalizeJob ex
public void testMatrixDiagonalizeMapper() throws Exception {
MatrixDiagonalizeMapper mapper = new MatrixDiagonalizeMapper();
Configuration conf = new Configuration();
- conf.setInt(EigencutsKeys.AFFINITY_DIMENSIONS, RAW_DIMENSIONS);
+ conf.setInt(Keys.AFFINITY_DIMENSIONS, RAW_DIMENSIONS);
// set up the dummy writers
- DummyRecordWriter<NullWritable, IntDoublePairWritable> writer =
+ DummyRecordWriter<NullWritable, IntDoublePairWritable> writer =
new DummyRecordWriter<NullWritable, IntDoublePairWritable>();
Mapper<IntWritable, VectorWritable, NullWritable, IntDoublePairWritable>.Context
context = DummyRecordWriter.build(mapper, conf, writer);
@@ -80,7 +79,7 @@ public class TestMatrixDiagonalizeJob ex
public void testMatrixDiagonalizeReducer() throws Exception {
MatrixDiagonalizeMapper mapper = new MatrixDiagonalizeMapper();
Configuration conf = new Configuration();
- conf.setInt(EigencutsKeys.AFFINITY_DIMENSIONS, RAW_DIMENSIONS);
+ conf.setInt(Keys.AFFINITY_DIMENSIONS, RAW_DIMENSIONS);
// set up the dummy writers
DummyRecordWriter<NullWritable, IntDoublePairWritable> mapWriter =
Copied: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestUnitVectorizerJob.java (from r1507954, mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestUnitVectorizerJob.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestUnitVectorizerJob.java?p2=mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestUnitVectorizerJob.java&p1=mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestUnitVectorizerJob.java&r1=1507954&r2=1507960&rev=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestUnitVectorizerJob.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestUnitVectorizerJob.java Mon Jul 29 07:39:53 2013
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.mahout.clustering.spectral.common;
+package org.apache.mahout.clustering.spectral;
import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.mapreduce.Mapper;
-import org.apache.mahout.clustering.spectral.common.UnitVectorizerJob.UnitVectorizerMapper;
+import org.apache.mahout.clustering.spectral.UnitVectorizerJob.UnitVectorizerMapper;
import org.apache.mahout.common.DummyRecordWriter;
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.RandomAccessSparseVector;
Copied: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorCache.java (from r1507954, mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestVectorCache.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorCache.java?p2=mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorCache.java&p1=mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestVectorCache.java&r1=1507954&r2=1507960&rev=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestVectorCache.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorCache.java Mon Jul 29 07:39:53 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.clustering.spectral.common;
+package org.apache.mahout.clustering.spectral;
import java.net.URI;
Copied: mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorMatrixMultiplicationJob.java (from r1507954, mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestVectorMatrixMultiplicationJob.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorMatrixMultiplicationJob.java?p2=mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorMatrixMultiplicationJob.java&p1=mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestVectorMatrixMultiplicationJob.java&r1=1507954&r2=1507960&rev=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/common/TestVectorMatrixMultiplicationJob.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/clustering/spectral/TestVectorMatrixMultiplicationJob.java Mon Jul 29 07:39:53 2013
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.mahout.clustering.spectral.common;
+package org.apache.mahout.clustering.spectral;
import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.mapreduce.Mapper;
-import org.apache.mahout.clustering.spectral.common.VectorMatrixMultiplicationJob.VectorMatrixMultiplicationMapper;
+import org.apache.mahout.clustering.spectral.VectorMatrixMultiplicationJob.VectorMatrixMultiplicationMapper;
import org.apache.mahout.common.DummyRecordWriter;
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.math.DenseVector;
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDPCADenseTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDPCADenseTest.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDPCADenseTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDPCADenseTest.java Mon Jul 29 07:39:53 2013
@@ -21,7 +21,6 @@ import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.util.Deque;
-import java.util.LinkedList;
import java.util.Random;
import com.google.common.collect.Lists;
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverSparseSequentialTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverSparseSequentialTest.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverSparseSequentialTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/math/hadoop/stochasticsvd/LocalSSVDSolverSparseSequentialTest.java Mon Jul 29 07:39:53 2013
@@ -21,7 +21,6 @@ import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.util.Deque;
-import java.util.LinkedList;
import java.util.Random;
import com.google.common.collect.Lists;
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/EncodedVectorsFromSequenceFilesTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/EncodedVectorsFromSequenceFilesTest.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/EncodedVectorsFromSequenceFilesTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/EncodedVectorsFromSequenceFilesTest.java Mon Jul 29 07:39:53 2013
@@ -17,7 +17,6 @@
package org.apache.mahout.vectorizer;
-import java.util.LinkedList;
import java.util.List;
import com.google.common.collect.Lists;
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/HighDFWordsPrunerTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/HighDFWordsPrunerTest.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/HighDFWordsPrunerTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/HighDFWordsPrunerTest.java Mon Jul 29 07:39:53 2013
@@ -37,7 +37,6 @@ import org.junit.Before;
import org.junit.Test;
import java.util.Arrays;
-import java.util.LinkedList;
import java.util.List;
public class HighDFWordsPrunerTest extends MahoutTestCase {
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/SparseVectorsFromSequenceFilesTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/SparseVectorsFromSequenceFilesTest.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/SparseVectorsFromSequenceFilesTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/SparseVectorsFromSequenceFilesTest.java Mon Jul 29 07:39:53 2013
@@ -18,7 +18,6 @@
package org.apache.mahout.vectorizer;
import java.io.IOException;
-import java.util.LinkedList;
import java.util.List;
import com.google.common.collect.Lists;
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocReducerTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocReducerTest.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocReducerTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/CollocReducerTest.java Mon Jul 29 07:39:53 2013
@@ -19,7 +19,6 @@ package org.apache.mahout.vectorizer.col
import java.util.Arrays;
import java.util.Collection;
-import java.util.LinkedList;
import com.google.common.collect.Lists;
import org.apache.hadoop.mapreduce.Reducer;
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducerTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducerTest.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducerTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/vectorizer/collocations/llr/LLRReducerTest.java Mon Jul 29 07:39:53 2013
@@ -19,7 +19,6 @@ package org.apache.mahout.vectorizer.col
import java.util.Arrays;
import java.util.Collection;
-import java.util.LinkedList;
import com.google.common.collect.Lists;
import org.apache.hadoop.conf.Configuration;
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingDataModel.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingDataModel.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingDataModel.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingDataModel.java Mon Jul 29 07:39:53 2013
@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
import com.google.common.base.Charsets;
import com.google.common.io.Closeables;
-import org.apache.mahout.cf.taste.example.grouplens.GroupLensDataModel;
+import org.apache.mahout.cf.taste.similarity.precompute.example.GroupLensDataModel;
import org.apache.mahout.cf.taste.impl.model.file.FileDataModel;
import org.apache.mahout.common.iterator.FileLineIterable;
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/similarity/precompute/example/BatchItemSimilaritiesGroupLens.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/similarity/precompute/example/BatchItemSimilaritiesGroupLens.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/similarity/precompute/example/BatchItemSimilaritiesGroupLens.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/similarity/precompute/example/BatchItemSimilaritiesGroupLens.java Mon Jul 29 07:39:53 2013
@@ -17,7 +17,6 @@
package org.apache.mahout.cf.taste.similarity.precompute.example;
-import org.apache.mahout.cf.taste.example.grouplens.GroupLensDataModel;
import org.apache.mahout.cf.taste.impl.recommender.GenericItemBasedRecommender;
import org.apache.mahout.cf.taste.impl.similarity.LogLikelihoodSimilarity;
import org.apache.mahout.cf.taste.impl.similarity.precompute.FileSimilarItemsWriter;
Copied: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/similarity/precompute/example/GroupLensDataModel.java (from r1507892, 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/similarity/precompute/example/GroupLensDataModel.java?p2=mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/similarity/precompute/example/GroupLensDataModel.java&p1=mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java&r1=1507892&r2=1507960&rev=1507960&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/similarity/precompute/example/GroupLensDataModel.java Mon Jul 29 07:39:53 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.mahout.cf.taste.example.grouplens;
+package org.apache.mahout.cf.taste.similarity.precompute.example;
import java.io.File;
import java.io.FileOutputStream;
@@ -82,7 +82,7 @@ public final class GroupLensDataModel ex
public static File readResourceToTempFile(String resourceName) throws IOException {
InputSupplier<? extends InputStream> inSupplier;
try {
- URL resourceURL = Resources.getResource(GroupLensRecommender.class, resourceName);
+ URL resourceURL = Resources.getResource(GroupLensDataModel.class, resourceName);
inSupplier = Resources.newInputStreamSupplier(resourceURL);
} catch (IllegalArgumentException iae) {
File resourceFile = new File("src/main/java" + resourceName);
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sequencelearning/hmm/PosTagger.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sequencelearning/hmm/PosTagger.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sequencelearning/hmm/PosTagger.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sequencelearning/hmm/PosTagger.java Mon Jul 29 07:39:53 2013
@@ -20,7 +20,6 @@ package org.apache.mahout.classifier.seq
import java.io.IOException;
import java.net.URL;
import java.util.Arrays;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java Mon Jul 29 07:39:53 2013
@@ -44,7 +44,7 @@ import org.apache.hadoop.io.Text;
import org.apache.mahout.clustering.AbstractCluster;
import org.apache.mahout.clustering.Cluster;
import org.apache.mahout.clustering.classify.WeightedVectorWritable;
-import org.apache.mahout.clustering.dirichlet.UncommonDistributions;
+import org.apache.mahout.clustering.UncommonDistributions;
import org.apache.mahout.clustering.iterator.ClusterWritable;
import org.apache.mahout.common.Pair;
import org.apache.mahout.common.RandomUtils;
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/hbase/HBaseDataModel.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/hbase/HBaseDataModel.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/hbase/HBaseDataModel.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/hbase/HBaseDataModel.java Mon Jul 29 07:39:53 2013
@@ -21,7 +21,6 @@ import java.io.Closeable;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Collection;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.SortedMap;
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/AbstractClusterWriter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/AbstractClusterWriter.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/AbstractClusterWriter.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/AbstractClusterWriter.java Mon Jul 29 07:39:53 2013
@@ -23,7 +23,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java Mon Jul 29 07:39:53 2013
@@ -24,7 +24,6 @@ import java.io.Writer;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java Mon Jul 29 07:39:53 2013
@@ -31,22 +31,12 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.Version;
import org.apache.mahout.clustering.canopy.CanopyDriver;
-import org.apache.mahout.clustering.dirichlet.DirichletDriver;
-import org.apache.mahout.clustering.dirichlet.models.DistanceMeasureClusterDistribution;
-import org.apache.mahout.clustering.dirichlet.models.DistributionDescription;
-import org.apache.mahout.clustering.dirichlet.models.GaussianClusterDistribution;
import org.apache.mahout.clustering.fuzzykmeans.FuzzyKMeansDriver;
-import org.apache.mahout.clustering.kernel.IKernelProfile;
-import org.apache.mahout.clustering.kernel.TriangularKernelProfile;
import org.apache.mahout.clustering.kmeans.KMeansDriver;
-import org.apache.mahout.clustering.meanshift.MeanShiftCanopyDriver;
import org.apache.mahout.common.MahoutTestCase;
-import org.apache.mahout.common.distance.CosineDistanceMeasure;
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
-import org.apache.mahout.common.distance.ManhattanDistanceMeasure;
import org.apache.mahout.math.NamedVector;
-import org.apache.mahout.math.RandomAccessSparseVector;
import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
import org.apache.mahout.utils.clustering.ClusterDumper;
@@ -230,55 +220,6 @@ public final class TestClusterDumper ext
clusterDumper.printClusters(termDictionary);
}
- @Test
- public void testMeanShift() throws Exception {
- DistanceMeasure measure = new CosineDistanceMeasure();
- IKernelProfile kernelProfile = new TriangularKernelProfile();
- Path output = getTestTempDirPath("output");
- Configuration conf = new Configuration();
- MeanShiftCanopyDriver.run(conf, getTestTempDirPath("testdata"), output,
- measure, kernelProfile, 0.5, 0.01, 0.05, 10, false, true, true);
- // run ClusterDumper
- ClusterDumper clusterDumper = new ClusterDumper(finalClusterPath(conf,
- output, 10), new Path(output, "clusteredPoints"));
- clusterDumper.printClusters(termDictionary);
- }
-
- @Test
- public void testDirichlet2() throws Exception {
- Path output = getTestTempDirPath("output");
- NamedVector prototype = (NamedVector) sampleData.get(0).get();
- DistributionDescription description = new DistributionDescription(
- GaussianClusterDistribution.class.getName(),
- RandomAccessSparseVector.class.getName(), null, prototype.getDelegate()
- .size());
- Configuration conf = new Configuration();
- DirichletDriver.run(conf, getTestTempDirPath("testdata"), output,
- description, 15, 10, 1.0, true, true, 0, true);
- // run ClusterDumper
- ClusterDumper clusterDumper = new ClusterDumper(finalClusterPath(conf,
- output, 10), new Path(output, "clusteredPoints"));
- clusterDumper.printClusters(termDictionary);
- }
-
- @Test
- public void testDirichlet3() throws Exception {
- Path output = getTestTempDirPath("output");
- NamedVector prototype = (NamedVector) sampleData.get(0).get();
- DistributionDescription description = new DistributionDescription(
- DistanceMeasureClusterDistribution.class.getName(),
- RandomAccessSparseVector.class.getName(),
- ManhattanDistanceMeasure.class.getName(), prototype.getDelegate()
- .size());
- Configuration conf = new Configuration();
- DirichletDriver.run(conf, getTestTempDirPath("testdata"), output,
- description, 15, 10, 1.0, true, true, 0, true);
- // run ClusterDumper
- ClusterDumper clusterDumper = new ClusterDumper(finalClusterPath(conf,
- output, 10), new Path(output, "clusteredPoints"));
- clusterDumper.printClusters(termDictionary);
- }
-
/*
@Test
public void testKmeansSVD() throws Exception {
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterEvaluator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterEvaluator.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterEvaluator.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterEvaluator.java Mon Jul 29 07:39:53 2013
@@ -26,18 +26,11 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.mahout.clustering.canopy.Canopy;
import org.apache.mahout.clustering.canopy.CanopyDriver;
-import org.apache.mahout.clustering.dirichlet.DirichletDriver;
-import org.apache.mahout.clustering.dirichlet.UncommonDistributions;
-import org.apache.mahout.clustering.dirichlet.models.DistributionDescription;
-import org.apache.mahout.clustering.dirichlet.models.GaussianClusterDistribution;
import org.apache.mahout.clustering.evaluation.ClusterEvaluator;
import org.apache.mahout.clustering.evaluation.RepresentativePointsDriver;
import org.apache.mahout.clustering.fuzzykmeans.FuzzyKMeansDriver;
-import org.apache.mahout.clustering.kernel.IKernelProfile;
-import org.apache.mahout.clustering.kernel.TriangularKernelProfile;
import org.apache.mahout.clustering.kmeans.KMeansDriver;
import org.apache.mahout.clustering.kmeans.TestKmeansClustering;
-import org.apache.mahout.clustering.meanshift.MeanShiftCanopyDriver;
import org.apache.mahout.common.HadoopUtil;
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.distance.DistanceMeasure;
@@ -325,40 +318,4 @@ public final class TestClusterEvaluator
System.out.println("Inter-cluster density = " + evaluator.interClusterDensity());
}
- @Test
- public void testMeanShift() throws Exception {
- ClusteringTestUtils.writePointsToFile(sampleData, new Path(testdata, "file1"), fs, conf);
- DistanceMeasure measure = new EuclideanDistanceMeasure();
- IKernelProfile kernelProfile = new TriangularKernelProfile();
- Configuration conf = new Configuration();
- MeanShiftCanopyDriver.run(conf, testdata, output, measure, kernelProfile, 2.1, 1.0, 0.001, 10, false, true, true);
- int numIterations = 10;
- Path clustersIn = new Path(output, "clusters-8-final");
- RepresentativePointsDriver.run(conf, clustersIn, new Path(output, "clusteredPoints"), output, measure,
- numIterations, true);
- //printRepPoints(numIterations);
- ClusterEvaluator evaluator = new ClusterEvaluator(conf, clustersIn);
- // now print out the Results
- System.out.println("Intra-cluster density = " + evaluator.intraClusterDensity());
- System.out.println("Inter-cluster density = " + evaluator.interClusterDensity());
- }
-
- @Test
- public void testDirichlet() throws Exception {
- ClusteringTestUtils.writePointsToFile(sampleData, new Path(testdata, "file1"), fs, conf);
- DistributionDescription description = new DistributionDescription(GaussianClusterDistribution.class.getName(),
- DenseVector.class.getName(), null, 2);
- DirichletDriver.run(new Configuration(), testdata, output, description, 15, 5, 1.0, true, true, 0.0, true);
- int numIterations = 10;
- Configuration conf = new Configuration();
- Path clustersIn = new Path(output, "clusters-5-final");
- RepresentativePointsDriver.run(conf, clustersIn, new Path(output, "clusteredPoints"), output,
- new EuclideanDistanceMeasure(), numIterations, true);
- //printRepPoints(numIterations);
- ClusterEvaluator evaluator = new ClusterEvaluator(conf, clustersIn);
- // now print out the Results
- System.out.println("Intra-cluster density = " + evaluator.intraClusterDensity());
- System.out.println("Inter-cluster density = " + evaluator.interClusterDensity());
- }
-
}