You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by je...@apache.org on 2009/06/29 23:20:20 UTC
svn commit: r789451 - in /lucene/mahout/trunk/core/src:
main/java/org/apache/mahout/clustering/kmeans/Cluster.java
test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
Author: jeastman
Date: Mon Jun 29 21:20:18 2009
New Revision: 789451
URL: http://svn.apache.org/viewvc?rev=789451&view=rev
Log:
MAHOUT-141
- changed Cluster.computeCentroid to return the center if the cluster has no points
- changed the expectedNumPoints for TestKmeansClustering.testReferenceImplemetation
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java?rev=789451&r1=789450&r2=789451&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/Cluster.java Mon Jun 29 21:20:18 2009
@@ -210,7 +210,7 @@
*/
private Vector computeCentroid() {
if (numPoints == 0)
- return pointTotal;
+ return center;
else if (centroid == null) {
// lazy compute new centroid
centroid = pointTotal.divide(numPoints);
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java?rev=789451&r1=789450&r2=789451&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java Mon Jun 29 21:20:18 2009
@@ -51,7 +51,7 @@
{ 2, 2 }, { 3, 3 }, { 4, 4 }, { 5, 4 }, { 4, 5 }, { 5, 5 } };
public static final int[][] expectedNumPoints = { { 9 }, { 4, 5 },
- { 4, 5, 0 }, { 1, 2, 1, 5 }, { 1, 1, 1, 2, 4 }, { 1, 1, 1, 1, 1, 4 },
+ { 4, 4, 1 }, { 1, 2, 1, 5 }, { 1, 1, 1, 2, 4 }, { 1, 1, 1, 1, 1, 4 },
{ 1, 1, 1, 1, 1, 2, 2 }, { 1, 1, 1, 1, 1, 1, 2, 1 },
{ 1, 1, 1, 1, 1, 1, 1, 1, 1 } };