svn commit: r1507960 [2/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/...

[ssc]

Modified: 
mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/cdbw/TestCDbwEvaluator.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/cdbw/TestCDbwEvaluator.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- 
mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/cdbw/TestCDbwEvaluator.java
 (original)
+++ 
mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/cdbw/TestCDbwEvaluator.java
 Mon Jul 29 07:39:53 2013
@@ -28,22 +28,16 @@ import org.apache.hadoop.fs.Path;
 import org.apache.mahout.clustering.Cluster;
 import org.apache.mahout.clustering.ClusteringTestUtils;
 import org.apache.mahout.clustering.TestClusterEvaluator;
-import org.apache.mahout.clustering.kernel.TriangularKernelProfile;
 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.UncommonDistributions;
 import org.apache.mahout.clustering.evaluation.RepresentativePointsDriver;
 import org.apache.mahout.clustering.fuzzykmeans.FuzzyKMeansDriver;
 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.MahoutTestCase;
 import org.apache.mahout.common.distance.DistanceMeasure;
 import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
-import org.apache.mahout.clustering.kernel.IKernelProfile;
 import org.apache.mahout.math.DenseVector;
 import org.apache.mahout.math.Vector;
 import org.apache.mahout.math.VectorWritable;
@@ -331,42 +325,4 @@ public final class TestCDbwEvaluator ext
     System.out.println("Separation = " + evaluator.separation());
   }
   
-  @Test
-  public void testMeanShift() throws Exception {
-    ClusteringTestUtils.writePointsToFile(sampleData, 
getTestTempFilePath("testdata/file1"), fs, conf);
-    DistanceMeasure measure = new EuclideanDistanceMeasure();
-    IKernelProfile kernelProfile = new TriangularKernelProfile();
-    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-2");
-    RepresentativePointsDriver.run(conf, clustersIn, new Path(output, 
"clusteredPoints"), output, measure,
-        numIterations, true);
-    CDbwEvaluator evaluator = new CDbwEvaluator(conf, clustersIn);
-    // printRepPoints(numIterations);
-    // now print out the Results
-    System.out.println("Mean Shift CDbw = " + evaluator.getCDbw());
-    System.out.println("Intra-cluster density = " + 
evaluator.intraClusterDensity());
-    System.out.println("Inter-cluster density = " + 
evaluator.interClusterDensity());
-    System.out.println("Separation = " + evaluator.separation());
-  }
-  
-  @Test
-  public void testDirichlet() throws Exception {
-    ClusteringTestUtils.writePointsToFile(sampleData, 
getTestTempFilePath("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;
-    Path clustersIn = new Path(output, "clusters-0");
-    RepresentativePointsDriver.run(conf, clustersIn, new Path(output, 
"clusteredPoints"), output,
-        new EuclideanDistanceMeasure(), numIterations, true);
-    CDbwEvaluator evaluator = new CDbwEvaluator(conf, clustersIn);
-    RepresentativePointsDriver.printRepresentativePoints(output, 
numIterations);
-    // now print out the Results
-    System.out.println("Dirichlet CDbw = " + evaluator.getCDbw());
-    System.out.println("Intra-cluster density = " + 
evaluator.intraClusterDensity());
-    System.out.println("Inter-cluster density = " + 
evaluator.interClusterDensity());
-    System.out.println("Separation = " + evaluator.separation());
-  }
-  
 }

Modified: 
mahout/trunk/math/src/test/java/org/apache/mahout/math/randomized/RandomBlasting.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/math/src/test/java/org/apache/mahout/math/randomized/RandomBlasting.java?rev=1507960&r1=1507959&r2=1507960&view=diff
==============================================================================
--- 
mahout/trunk/math/src/test/java/org/apache/mahout/math/randomized/RandomBlasting.java
 (original)
+++ 
mahout/trunk/math/src/test/java/org/apache/mahout/math/randomized/RandomBlasting.java
 Mon Jul 29 07:39:53 2013
@@ -1,7 +1,6 @@
 package org.apache.mahout.math.randomized;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;