You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ro...@apache.org on 2010/02/25 04:41:07 UTC
svn commit: r916108 - in /lucene/mahout/trunk/math/src:
main/java/org/apache/mahout/math/AbstractVector.java
test/java/org/apache/mahout/math/TestDenseVector.java
test/java/org/apache/mahout/math/TestSparseVector.java
Author: robinanil
Date: Thu Feb 25 03:41:07 2010
New Revision: 916108
URL: http://svn.apache.org/viewvc?rev=916108&view=rev
Log:
Bug is minus was causing inverse result. Added tests
Modified:
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractVector.java
lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestDenseVector.java
lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseVector.java
Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractVector.java?rev=916108&r1=916107&r2=916108&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractVector.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/AbstractVector.java Thu Feb 25 03:41:07 2010
@@ -168,7 +168,7 @@
Iterator<Element> iter = iterateNonZero();
while (iter.hasNext()) {
Element e = iter.next();
- result.setQuick(e.index(), result.getQuick(e.index()) - e.get());
+ result.setQuick(e.index(), e.get() - result.getQuick(e.index()));
}
return result;
} else { // TODO: check the numNonDefault elements to further optimize
Modified: lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestDenseVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestDenseVector.java?rev=916108&r1=916107&r2=916108&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestDenseVector.java (original)
+++ lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestDenseVector.java Thu Feb 25 03:41:07 2010
@@ -216,6 +216,17 @@
for (int i = 0; i < test.size(); i++) {
assertEquals("get [" + i + ']', 0.0, val.get(i));
}
+ Vector val1 = test.plus(1);
+ val = val1.minus(test);
+ for (int i = 0; i < test.size(); i++) {
+ assertEquals("get [" + i + ']', 1.0, val.get(i));
+ }
+
+ val1 = test.plus(-1);
+ val = val1.minus(test);
+ for (int i = 0; i < test.size(); i++) {
+ assertEquals("get [" + i + ']', -1.0, val.get(i));
+ }
}
public void testPlusDouble() throws Exception {
Modified: lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseVector.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseVector.java?rev=916108&r1=916107&r2=916108&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseVector.java (original)
+++ lucene/mahout/trunk/math/src/test/java/org/apache/mahout/math/TestSparseVector.java Thu Feb 25 03:41:07 2010
@@ -231,6 +231,18 @@
for (int i = 0; i < test.size(); i++) {
assertEquals("get [" + i + ']', 0.0, val.get(i));
}
+
+ Vector val1 = test.plus(1);
+ val = val1.minus(test);
+ for (int i = 0; i < test.size(); i++) {
+ assertEquals("get [" + i + ']', 1.0, val.get(i));
+ }
+
+ val1 = test.plus(-1);
+ val = val1.minus(test);
+ for (int i = 0; i < test.size(); i++) {
+ assertEquals("get [" + i + ']', -1.0, val.get(i));
+ }
}
public void testPlusDouble() throws Exception {