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/19 00:36:57 UTC
svn commit: r786323 - in /lucene/mahout/trunk/core/src:
main/java/org/apache/mahout/clustering/meanshift/
test/java/org/apache/mahout/clustering/meanshift/
test/java/org/apache/mahout/matrix/
Author: jeastman
Date: Thu Jun 18 22:36:57 2009
New Revision: 786323
URL: http://svn.apache.org/viewvc?rev=786323&view=rev
Log:
- MAHOUT-65: changed calls to Vector.asWritableComparable().toString()
to asFormatString()
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestDenseVector.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestSparseVector.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestVectorView.java
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java?rev=786323&r1=786322&r2=786323&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopy.java Thu Jun 18 22:36:57 2009
@@ -345,7 +345,7 @@
OutputCollector<Text, WritableComparable<?>> collector)
throws IOException {
collector.collect(new Text(this.getIdentifier()), new Text(canopy
- .computeCentroid().asWritableComparable().toString()
+ .computeCentroid().asFormatString()
+ ":=:" + boundPoints.size()));
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java?rev=786323&r1=786322&r2=786323&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java Thu Jun 18 22:36:57 2009
@@ -238,8 +238,8 @@
+ (ref.getCanopyId() - raw.length));
assertEquals("ids", ref.getCanopyId(), canopy.getCanopyId() + 100);
assertEquals("centers(" + ref.getIdentifier() + ')', ref.getCenter()
- .asWritableComparable().toString(), canopy.getCenter()
- .asWritableComparable().toString());
+ .asFormatString(), canopy.getCenter()
+ .asFormatString());
assertEquals("bound points", ref.getBoundPoints().size(), canopy
.getBoundPoints().size());
}
@@ -313,8 +313,8 @@
.toString());
assertEquals("ids", ref.getCanopyId(), canopy.getCanopyId() + 100);
assertEquals("centers(" + stringMeanShiftCanopyEntry.getKey() + ')', ref.getCenter()
- .asWritableComparable().toString(), canopy.getCenter()
- .asWritableComparable().toString());
+ .asFormatString(), canopy.getCenter()
+ .asFormatString().toString());
assertEquals("bound points", ref.getBoundPoints().size(), canopy
.getBoundPoints().size());
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestDenseVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestDenseVector.java?rev=786323&r1=786322&r2=786323&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestDenseVector.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestDenseVector.java Thu Jun 18 22:36:57 2009
@@ -33,7 +33,7 @@
}
public void testAsFormatString() {
- String formatString = test.asWritableComparable().toString();
+ String formatString = test.asFormatString();
assertEquals(
"format",
"{\"class\":\"org.apache.mahout.matrix.DenseVector\",\"vector\":\"{\\\"values\\\":[1.1,2.2,3.3]}\"}",
@@ -133,7 +133,7 @@
}
public void testDecodeVector() throws Exception {
- Vector val = AbstractVector.decodeVector(test.asWritableComparable());
+ Vector val = AbstractVector.decodeVector(test.asFormatString());
for (int i = 0; i < test.cardinality(); i++)
assertEquals("get [" + i + ']', test.get(i), val.get(i));
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestSparseVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestSparseVector.java?rev=786323&r1=786322&r2=786323&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestSparseVector.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestSparseVector.java Thu Jun 18 22:36:57 2009
@@ -40,7 +40,7 @@
}
public void testAsFormatString() {
- String formatString = test.asWritableComparable().toString();
+ String formatString = test.asFormatString();
assertEquals(
"format",
"{\"class\":\"org.apache.mahout.matrix.SparseVector\",\"vector\":\"{\\\"values\\\":{\\\"1\\\":1.1,\\\"2\\\":2.2,\\\"3\\\":3.3},\\\"cardinality\\\":5}\"}",
@@ -145,7 +145,7 @@
}
public void testDecodeVectort() throws Exception {
- Vector val = AbstractVector.decodeVector(test.asWritableComparable());
+ Vector val = AbstractVector.decodeVector(test.asFormatString());
for (int i = 0; i < test.cardinality(); i++)
assertEquals("get [" + i + ']', test.get(i), val.get(i));
}
Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestVectorView.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestVectorView.java?rev=786323&r1=786322&r2=786323&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestVectorView.java (original)
+++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/matrix/TestVectorView.java Thu Jun 18 22:36:57 2009
@@ -35,7 +35,7 @@
}
public void testAsFormatString() {
- String formatString = test.asWritableComparable().toString();
+ String formatString = test.asFormatString();
Vector v = AbstractVector.decodeVector(formatString);
assertEquals("cardinality", test.cardinality(), v.cardinality());
}