You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by gs...@apache.org on 2008/02/24 23:00:12 UTC
svn commit: r630688 - in /lucene/mahout/trunk/src:
main/java/org/apache/mahout/clustering/canopy/
main/java/org/apache/mahout/utils/
test/java/org/apache/mahout/clustering/canopy/
test/java/org/apache/mahout/utils/
Author: gsingers
Date: Sun Feb 24 14:00:10 2008
New Revision: 630688
URL: http://svn.apache.org/viewvc?rev=630688&view=rev
Log:
moved distance measures to utils class, as they will be generally useful, even in some non-clustering based code
Added:
lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/DistanceMeasure.java (contents, props changed)
- copied, changed from r630564, lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/DistanceMeasure.java
lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/EuclideanDistanceMeasure.java (contents, props changed)
- copied, changed from r630564, lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/EuclideanDistanceMeasure.java
lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/ManhattanDistanceMeasure.java (contents, props changed)
- copied, changed from r630564, lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/ManhattanDistanceMeasure.java
lucene/mahout/trunk/src/test/java/org/apache/mahout/utils/UserDefinedDistanceMeasure.java (contents, props changed)
- copied, changed from r630564, lucene/mahout/trunk/src/test/java/org/apache/mahout/clustering/canopy/UserDefinedDistanceMeasure.java
Removed:
lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/DistanceMeasure.java
lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/EuclideanDistanceMeasure.java
lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/ManhattanDistanceMeasure.java
lucene/mahout/trunk/src/test/java/org/apache/mahout/clustering/canopy/UserDefinedDistanceMeasure.java
Modified:
lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java
lucene/mahout/trunk/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
Modified: lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java?rev=630688&r1=630687&r2=630688&view=diff
==============================================================================
--- lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java (original)
+++ lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/Canopy.java Sun Feb 24 14:00:10 2008
@@ -23,6 +23,7 @@
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.OutputCollector;
+import org.apache.mahout.utils.DistanceMeasure;
/**
* This class models a canopy as a center point, the number of points that are
Copied: lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/DistanceMeasure.java (from r630564, lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/DistanceMeasure.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/DistanceMeasure.java?p2=lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/DistanceMeasure.java&p1=lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/DistanceMeasure.java&r1=630564&r2=630688&rev=630688&view=diff
==============================================================================
--- lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/DistanceMeasure.java (original)
+++ lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/DistanceMeasure.java Sun Feb 24 14:00:10 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.mahout.clustering.canopy;
+package org.apache.mahout.utils;
import org.apache.hadoop.mapred.JobConfigurable;
Propchange: lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/DistanceMeasure.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/EuclideanDistanceMeasure.java (from r630564, lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/EuclideanDistanceMeasure.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/EuclideanDistanceMeasure.java?p2=lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/EuclideanDistanceMeasure.java&p1=lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/EuclideanDistanceMeasure.java&r1=630564&r2=630688&rev=630688&view=diff
==============================================================================
--- lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/EuclideanDistanceMeasure.java (original)
+++ lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/EuclideanDistanceMeasure.java Sun Feb 24 14:00:10 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.mahout.clustering.canopy;
+package org.apache.mahout.utils;
import org.apache.hadoop.mapred.JobConf;
Propchange: lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/EuclideanDistanceMeasure.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/ManhattanDistanceMeasure.java (from r630564, lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/ManhattanDistanceMeasure.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/ManhattanDistanceMeasure.java?p2=lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/ManhattanDistanceMeasure.java&p1=lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/ManhattanDistanceMeasure.java&r1=630564&r2=630688&rev=630688&view=diff
==============================================================================
--- lucene/mahout/trunk/src/main/java/org/apache/mahout/clustering/canopy/ManhattanDistanceMeasure.java (original)
+++ lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/ManhattanDistanceMeasure.java Sun Feb 24 14:00:10 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.mahout.clustering.canopy;
+package org.apache.mahout.utils;
import org.apache.hadoop.mapred.JobConf;
Propchange: lucene/mahout/trunk/src/main/java/org/apache/mahout/utils/ManhattanDistanceMeasure.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: lucene/mahout/trunk/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java?rev=630688&r1=630687&r2=630688&view=diff
==============================================================================
--- lucene/mahout/trunk/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java (original)
+++ lucene/mahout/trunk/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java Sun Feb 24 14:00:10 2008
@@ -38,6 +38,10 @@
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.Reducer;
import org.apache.hadoop.mapred.lib.IdentityReducer;
+import org.apache.mahout.utils.DistanceMeasure;
+import org.apache.mahout.utils.EuclideanDistanceMeasure;
+import org.apache.mahout.utils.ManhattanDistanceMeasure;
+import org.apache.mahout.utils.UserDefinedDistanceMeasure;
public class TestCanopyCreation extends TestCase {
static final float[][] raw = { { 1, 1 }, { 2, 1 }, { 1, 2 }, { 2, 2 },
Copied: lucene/mahout/trunk/src/test/java/org/apache/mahout/utils/UserDefinedDistanceMeasure.java (from r630564, lucene/mahout/trunk/src/test/java/org/apache/mahout/clustering/canopy/UserDefinedDistanceMeasure.java)
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/src/test/java/org/apache/mahout/utils/UserDefinedDistanceMeasure.java?p2=lucene/mahout/trunk/src/test/java/org/apache/mahout/utils/UserDefinedDistanceMeasure.java&p1=lucene/mahout/trunk/src/test/java/org/apache/mahout/clustering/canopy/UserDefinedDistanceMeasure.java&r1=630564&r2=630688&rev=630688&view=diff
==============================================================================
--- lucene/mahout/trunk/src/test/java/org/apache/mahout/clustering/canopy/UserDefinedDistanceMeasure.java (original)
+++ lucene/mahout/trunk/src/test/java/org/apache/mahout/utils/UserDefinedDistanceMeasure.java Sun Feb 24 14:00:10 2008
@@ -1,4 +1,6 @@
-package org.apache.mahout.clustering.canopy;
+package org.apache.mahout.utils;
+
+import org.apache.mahout.utils.ManhattanDistanceMeasure;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Propchange: lucene/mahout/trunk/src/test/java/org/apache/mahout/utils/UserDefinedDistanceMeasure.java
------------------------------------------------------------------------------
svn:eol-style = native