Author: ssc
Date: Mon Mar 25 11:27:36 2013
New Revision: 1460623
URL: http://svn.apache.org/r1460623
Log:
more clean up, removing unused classes
Added:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kernel/
- copied from r1460336,
mahout/trunk/core/src/main/java/org/apache/mahout/common/kernel/
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kernel/IKernelProfile.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kernel/TriangularKernelProfile.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinhashOptionCreator.java
- copied, changed from r1460336,
mahout/trunk/core/src/main/java/org/apache/mahout/common/commandline/MinhashOptionCreator.java
Removed:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kernel/NormalKernelProfile.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/IntTuple.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/commandline/MinhashOptionCreator.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/kernel/
mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/CompositeParameter.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/FileParameter.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/IntegerParameter.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/parameters/StringParameter.java
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterer.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/commandline/DefaultOptionCreator.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/minhash/TestMinHashClustering.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayMeanShift.java
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.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
Added:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kernel/IKernelProfile.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kernel/IKernelProfile.java?rev=1460623&view=auto
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kernel/IKernelProfile.java
(added)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kernel/IKernelProfile.java
Mon Mar 25 11:27:36 2013
@@ -0,0 +1,27 @@
+/**
+ * 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.kernel;
+
+public interface IKernelProfile {
+
+ /**
+ * @return the calculated dervative value of the kernel
+ */
+ double calculateDerivativeValue(double distance, double h);
+
+}
Added:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kernel/TriangularKernelProfile.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kernel/TriangularKernelProfile.java?rev=1460623&view=auto
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kernel/TriangularKernelProfile.java
(added)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kernel/TriangularKernelProfile.java
Mon Mar 25 11:27:36 2013
@@ -0,0 +1,27 @@
+/**
+ * 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.kernel;
+
+public class TriangularKernelProfile implements IKernelProfile {
+
+ @Override
+ public double calculateDerivativeValue(double distance, double h) {
+ return distance < h ? 1.0 : 0.0;
+ }
+
+}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterer.java?rev=1460623&r1=1460622&r2=1460623&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyClusterer.java
Mon Mar 25 11:27:36 2013
@@ -22,9 +22,9 @@ import java.util.List;
import com.google.common.collect.Lists;
import org.apache.hadoop.conf.Configuration;
+import org.apache.mahout.clustering.kernel.IKernelProfile;
import org.apache.mahout.common.ClassUtils;
import org.apache.mahout.common.distance.DistanceMeasure;
-import org.apache.mahout.common.kernel.IKernelProfile;
import org.apache.mahout.math.Vector;
public class MeanShiftCanopyClusterer {
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java?rev=1460623&r1=1460622&r2=1460623&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyDriver.java
Mon Mar 25 11:27:36 2013
@@ -37,6 +37,7 @@ import org.apache.hadoop.mapreduce.lib.o
import org.apache.hadoop.util.ToolRunner;
import org.apache.mahout.clustering.AbstractCluster;
import org.apache.mahout.clustering.Cluster;
+import org.apache.mahout.clustering.kernel.IKernelProfile;
import org.apache.mahout.clustering.classify.WeightedVectorWritable;
import org.apache.mahout.clustering.iterator.ClusterWritable;
import org.apache.mahout.clustering.kmeans.KMeansConfigKeys;
@@ -51,7 +52,6 @@ import org.apache.mahout.common.iterator
import
org.apache.mahout.common.iterator.sequencefile.SequenceFileDirValueIterable;
import org.apache.mahout.common.iterator.sequencefile.SequenceFileIterable;
import
org.apache.mahout.common.iterator.sequencefile.SequenceFileValueIterable;
-import org.apache.mahout.common.kernel.IKernelProfile;
import org.apache.mahout.math.VectorWritable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashDriver.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashDriver.java?rev=1460623&r1=1460622&r2=1460623&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashDriver.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashDriver.java
Mon Mar 25 11:27:36 2013
@@ -32,7 +32,6 @@ import org.apache.hadoop.util.ToolRunner
import org.apache.mahout.common.AbstractJob;
import org.apache.mahout.common.HadoopUtil;
import org.apache.mahout.common.commandline.DefaultOptionCreator;
-import org.apache.mahout.common.commandline.MinhashOptionCreator;
import org.apache.mahout.math.VectorWritable;
import java.io.IOException;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashMapper.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashMapper.java?rev=1460623&r1=1460622&r2=1460623&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashMapper.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashMapper.java
Mon Mar 25 11:27:36 2013
@@ -22,7 +22,6 @@ import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.mapreduce.Mapper;
import org.apache.mahout.clustering.minhash.HashFactory.HashType;
-import org.apache.mahout.common.commandline.MinhashOptionCreator;
import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
import org.slf4j.Logger;
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashReducer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashReducer.java?rev=1460623&r1=1460622&r2=1460623&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashReducer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinHashReducer.java
Mon Mar 25 11:27:36 2013
@@ -22,7 +22,6 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.mapreduce.Reducer;
-import org.apache.mahout.common.commandline.MinhashOptionCreator;
import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
Copied:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinhashOptionCreator.java
(from r1460336,
mahout/trunk/core/src/main/java/org/apache/mahout/common/commandline/MinhashOptionCreator.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinhashOptionCreator.java?p2=mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinhashOptionCreator.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/common/commandline/MinhashOptionCreator.java&r1=1460336&r2=1460623&rev=1460623&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/common/commandline/MinhashOptionCreator.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/minhash/MinhashOptionCreator.java
Mon Mar 25 11:27:36 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.mahout.common.commandline;
+package org.apache.mahout.clustering.minhash;
import org.apache.commons.cli2.builder.ArgumentBuilder;
import org.apache.commons.cli2.builder.DefaultOptionBuilder;
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=1460623&r1=1460622&r2=1460623&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 Mar 25 11:27:36 2013
@@ -23,7 +23,7 @@ import org.apache.commons.cli2.builder.D
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.common.kernel.TriangularKernelProfile;
+import org.apache.mahout.clustering.kernel.TriangularKernelProfile;
public final class DefaultOptionCreator {
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java?rev=1460623&r1=1460622&r2=1460623&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
Mon Mar 25 11:27:36 2013
@@ -34,6 +34,7 @@ import org.apache.hadoop.mapreduce.Mappe
import org.apache.hadoop.mapreduce.Reducer;
import org.apache.hadoop.util.ToolRunner;
import org.apache.mahout.clustering.ClusteringTestUtils;
+import org.apache.mahout.clustering.kernel.TriangularKernelProfile;
import org.apache.mahout.clustering.iterator.ClusterWritable;
import org.apache.mahout.common.DummyRecordWriter;
import org.apache.mahout.common.HadoopUtil;
@@ -42,8 +43,7 @@ import org.apache.mahout.common.commandl
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
import
org.apache.mahout.common.iterator.sequencefile.SequenceFileValueIterator;
-import org.apache.mahout.common.kernel.IKernelProfile;
-import org.apache.mahout.common.kernel.TriangularKernelProfile;
+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;
@@ -194,10 +194,8 @@ public final class TestMeanShift extends
}
Configuration conf = new Configuration();
- conf.set(MeanShiftCanopyConfigKeys.DISTANCE_MEASURE_KEY,
- "org.apache.mahout.common.distance.EuclideanDistanceMeasure");
- conf.set(MeanShiftCanopyConfigKeys.KERNEL_PROFILE_KEY,
- "org.apache.mahout.common.kernel.TriangularKernelProfile");
+ conf.set(MeanShiftCanopyConfigKeys.DISTANCE_MEASURE_KEY,
EuclideanDistanceMeasure.class.getName());
+ conf.set(MeanShiftCanopyConfigKeys.KERNEL_PROFILE_KEY,
TriangularKernelProfile.class.getName());
conf.set(MeanShiftCanopyConfigKeys.T1_KEY, "4");
conf.set(MeanShiftCanopyConfigKeys.T2_KEY, "1");
conf.set(MeanShiftCanopyConfigKeys.CLUSTER_CONVERGENCE_KEY, "0.5");
@@ -205,8 +203,8 @@ public final class TestMeanShift extends
// map the data
MeanShiftCanopyMapper mapper = new MeanShiftCanopyMapper();
DummyRecordWriter<Text, ClusterWritable> mapWriter = new
DummyRecordWriter<Text, ClusterWritable>();
- Mapper<WritableComparable<?>, ClusterWritable, Text,
ClusterWritable>.Context mapContext = DummyRecordWriter
- .build(mapper, conf, mapWriter);
+ Mapper<WritableComparable<?>, ClusterWritable, Text,
ClusterWritable>.Context mapContext =
+ DummyRecordWriter.build(mapper, conf, mapWriter);
mapper.setup(mapContext);
for (MeanShiftCanopy canopy : canopies) {
ClusterWritable clusterWritable = new ClusterWritable();
@@ -281,10 +279,8 @@ public final class TestMeanShift extends
}
Configuration conf = new Configuration();
- conf.set(MeanShiftCanopyConfigKeys.DISTANCE_MEASURE_KEY,
- "org.apache.mahout.common.distance.EuclideanDistanceMeasure");
- conf.set(MeanShiftCanopyConfigKeys.KERNEL_PROFILE_KEY,
- "org.apache.mahout.common.kernel.TriangularKernelProfile");
+ conf.set(MeanShiftCanopyConfigKeys.DISTANCE_MEASURE_KEY,
EuclideanDistanceMeasure.class.getName());
+ conf.set(MeanShiftCanopyConfigKeys.KERNEL_PROFILE_KEY,
TriangularKernelProfile.class.getName());
conf.set(MeanShiftCanopyConfigKeys.T1_KEY, "4");
conf.set(MeanShiftCanopyConfigKeys.T2_KEY, "1");
conf.set(MeanShiftCanopyConfigKeys.CLUSTER_CONVERGENCE_KEY, "0.5");
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/minhash/TestMinHashClustering.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/minhash/TestMinHashClustering.java?rev=1460623&r1=1460622&r2=1460623&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/minhash/TestMinHashClustering.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/minhash/TestMinHashClustering.java
Mon Mar 25 11:27:36 2013
@@ -30,7 +30,6 @@ import org.apache.mahout.clustering.minh
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.Pair;
import org.apache.mahout.common.commandline.DefaultOptionCreator;
-import org.apache.mahout.common.commandline.MinhashOptionCreator;
import org.apache.mahout.common.iterator.sequencefile.SequenceFileIterable;
import org.apache.mahout.math.SequentialAccessSparseVector;
import org.apache.mahout.math.Vector;
Modified:
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayMeanShift.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayMeanShift.java?rev=1460623&r1=1460622&r2=1460623&view=diff
==============================================================================
---
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayMeanShift.java
(original)
+++
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayMeanShift.java
Mon Mar 25 11:27:36 2013
@@ -25,14 +25,14 @@ import java.awt.geom.AffineTransform;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.mahout.clustering.Cluster;
+import org.apache.mahout.clustering.kernel.IKernelProfile;
+import org.apache.mahout.clustering.kernel.TriangularKernelProfile;
import org.apache.mahout.clustering.meanshift.MeanShiftCanopy;
import org.apache.mahout.clustering.meanshift.MeanShiftCanopyDriver;
import org.apache.mahout.common.HadoopUtil;
import org.apache.mahout.common.RandomUtils;
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
-import org.apache.mahout.common.kernel.IKernelProfile;
-import org.apache.mahout.common.kernel.TriangularKernelProfile;
import org.apache.mahout.math.DenseVector;
import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
Modified:
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java?rev=1460623&r1=1460622&r2=1460623&view=diff
==============================================================================
---
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java
(original)
+++
mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java
Mon Mar 25 11:27:36 2013
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.util.ToolRunner;
+import org.apache.mahout.clustering.kernel.IKernelProfile;
import org.apache.mahout.clustering.conversion.meanshift.InputDriver;
import org.apache.mahout.clustering.meanshift.MeanShiftCanopyDriver;
import org.apache.mahout.common.AbstractJob;
@@ -31,8 +32,7 @@ import org.apache.mahout.common.HadoopUt
import org.apache.mahout.common.commandline.DefaultOptionCreator;
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
-import org.apache.mahout.common.kernel.IKernelProfile;
-import org.apache.mahout.common.kernel.TriangularKernelProfile;
+import org.apache.mahout.clustering.kernel.TriangularKernelProfile;
import org.apache.mahout.utils.clustering.ClusterDumper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=1460623&r1=1460622&r2=1460623&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 Mar 25 11:27:36 2013
@@ -36,6 +36,8 @@ import org.apache.mahout.clustering.diri
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;
@@ -43,8 +45,6 @@ import org.apache.mahout.common.distance
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.common.kernel.IKernelProfile;
-import org.apache.mahout.common.kernel.TriangularKernelProfile;
import org.apache.mahout.math.NamedVector;
import org.apache.mahout.math.RandomAccessSparseVector;
import org.apache.mahout.math.Vector;
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=1460623&r1=1460622&r2=1460623&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 Mar 25 11:27:36 2013
@@ -33,6 +33,8 @@ import org.apache.mahout.clustering.diri
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;
@@ -40,8 +42,6 @@ import org.apache.mahout.common.HadoopUt
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
-import org.apache.mahout.common.kernel.IKernelProfile;
-import org.apache.mahout.common.kernel.TriangularKernelProfile;
import org.apache.mahout.math.DenseVector;
import org.apache.mahout.math.VectorWritable;
import org.junit.Before;
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=1460623&r1=1460622&r2=1460623&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 Mar 25 11:27:36 2013
@@ -28,6 +28,7 @@ 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;
@@ -42,8 +43,7 @@ import org.apache.mahout.clustering.mean
import org.apache.mahout.common.MahoutTestCase;
import org.apache.mahout.common.distance.DistanceMeasure;
import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
-import org.apache.mahout.common.kernel.IKernelProfile;
-import org.apache.mahout.common.kernel.TriangularKernelProfile;
+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;
