Author: tdunning
Date: Mon Aug 30 20:45:23 2010
New Revision: 990935
URL: http://svn.apache.org/viewvc?rev=990935&view=rev
Log:
MAHOUT-492 - Changed tests to track change in text encoding, fixed bug
introduced into AWVE.
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectors/AdaptiveWordValueEncoder.java
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sgd/CsvRecordFactoryTest.java
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/vectors/AdaptiveWordValueEncoder.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/vectors/AdaptiveWordValueEncoder.java?rev=990935&r1=990934&r2=990935&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/vectors/AdaptiveWordValueEncoder.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/vectors/AdaptiveWordValueEncoder.java
Mon Aug 30 20:45:23 2010
@@ -44,7 +44,7 @@ public class AdaptiveWordValueEncoder ex
@Override
public void addToVector(String originalForm, double weight, Vector data) {
dictionary.add(originalForm);
- super.addToVector(originalForm, getWeight(originalForm, weight), data);
+ super.addToVector(originalForm, weight, data);
}
@Override
Modified:
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sgd/CsvRecordFactoryTest.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sgd/CsvRecordFactoryTest.java?rev=990935&r1=990934&r2=990935&view=diff
==============================================================================
---
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sgd/CsvRecordFactoryTest.java
(original)
+++
mahout/trunk/core/src/test/java/org/apache/mahout/classifier/sgd/CsvRecordFactoryTest.java
Mon Aug 30 20:45:23 2010
@@ -53,8 +53,8 @@ public class CsvRecordFactoryTest {
Assert.assertEquals(5.3, v.maxValue(), 0);
v.set(v.maxValueIndex(), 0);
Assert.assertEquals(8.0, v.norm(0), 0);
- Assert.assertEquals(12.0, v.norm(1), 0);
- Assert.assertEquals(2, v.maxValue(), 0);
+ Assert.assertEquals(10.339850002884626, v.norm(1), 1e-6);
+ Assert.assertEquals(1.5849625007211563, v.maxValue(), 1e-6);
v.assign(0);
t = csv.processLine("ignore,5.3,invalid,line, \"and more text and
more\",ignore", v);
@@ -66,8 +66,8 @@ public class CsvRecordFactoryTest {
Assert.assertEquals(5.3, v.maxValue(), 0);
v.set(v.maxValueIndex(), 0);
Assert.assertEquals(8.0, v.norm(0), 0);
- Assert.assertEquals(12.0, v.norm(1), 0);
- Assert.assertEquals(2, v.maxValue(), 0);
+ Assert.assertEquals(10.339850002884626, v.norm(1), 1e-6);
+ Assert.assertEquals(1.5849625007211563, v.maxValue(), 1e-6);
}
@Test
