commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject svn commit: r942638 - in /commons/proper/math/trunk/src: main/java/org/apache/commons/math/linear/AbstractRealVector.java site/xdoc/changes.xml test/java/org/apache/commons/math/linear/AbstractRealVectorTest.java
Date Mon, 10 May 2010 01:11:35 GMT
Author: billbarker
Date: Mon May 10 01:11:35 2010
New Revision: 942638

URL: http://svn.apache.org/viewvc?rev=942638&view=rev
Log:
Fix a problem with the default sparseIterator when an array has exactly one non-zero element
Submitted by: Albert Huang (with some style tweeks)
Issue: MATH-367

Modified:
    commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/AbstractRealVector.java
    commons/proper/math/trunk/src/site/xdoc/changes.xml
    commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/AbstractRealVectorTest.java

Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/AbstractRealVector.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/AbstractRealVector.java?rev=942638&r1=942637&r2=942638&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/AbstractRealVector.java
(original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/AbstractRealVector.java
Mon May 10 01:11:35 2010
@@ -18,6 +18,7 @@
 package org.apache.commons.math.linear;
 
 import java.util.Iterator;
+import java.util.NoSuchElementException;
 
 import org.apache.commons.math.FunctionEvaluationException;
 import org.apache.commons.math.MathRuntimeException;
@@ -875,34 +876,23 @@ public abstract class AbstractRealVector
         /** Dimension of the vector. */
         private final int dim;
 
-        /** Temporary entry (reused on each call to {@link #next()}. */
-        private EntryImpl tmp = new EntryImpl();
-
-        /** Current entry. */
+        /** last entry returned by {@link #next()} */
         private EntryImpl current;
 
-        /** Next entry. */
+        /** Next entry for {@link #next()} to return. */
         private EntryImpl next;
 
         /** Simple constructor. */
         protected SparseEntryIterator() {
             dim = getDimension();
             current = new EntryImpl();
-            if (current.getValue() == 0) {
-                advance(current);
-            }
-            if(current.getIndex() >= 0){
-                // There is at least one non-zero entry
-                next = new EntryImpl();
-                next.setIndex(current.getIndex());
-                advance(next);
-            } else {
-                // The vector consists of only zero entries, so deny having a next
-                current = null;
+            next = new EntryImpl();
+            if(next.getValue() == 0){
+            	advance(next);
             }
         }
 
-        /** Advance an entry up to the next non null one.
+        /** Advance an entry up to the next nonzero one.
          * @param e entry to advance
          */
         protected void advance(EntryImpl e) {
@@ -919,22 +909,18 @@ public abstract class AbstractRealVector
 
         /** {@inheritDoc} */
         public boolean hasNext() {
-            return current != null;
+            return next.getIndex() >= 0;
         }
 
         /** {@inheritDoc} */
         public Entry next() {
-            tmp.setIndex(current.getIndex());
-            if (next != null) {
-                current.setIndex(next.getIndex());
-                advance(next);
-                if (next.getIndex() < 0) {
-                    next = null;
-                }
-            } else {
-                current = null;
-            }
-            return tmp;
+        	int index = next.getIndex();
+        	if(index < 0){
+        		throw new NoSuchElementException();
+        	}
+        	current.setIndex(index);
+        	advance(next);
+        	return current;
         }
 
         /** {@inheritDoc} */

Modified: commons/proper/math/trunk/src/site/xdoc/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/site/xdoc/changes.xml?rev=942638&r1=942637&r2=942638&view=diff
==============================================================================
--- commons/proper/math/trunk/src/site/xdoc/changes.xml (original)
+++ commons/proper/math/trunk/src/site/xdoc/changes.xml Mon May 10 01:11:35 2010
@@ -58,6 +58,9 @@ The <action> type attribute can be add,u
       <action dev="billbarker" type="fix" issue="MATH-368">
        Fix spelling of getSparcity [sic] method of OpenMapRealVector
       </action>
+      <action dev="billbarker" type="fix" issue="MATH-367" due-to="Albert Huang">
+       Fix problem with the default sparseIterator when a RealVector has exactly one non-zero
entry
+      </action>
     </release>
     <release version="2.1" date="2010-04-02" description="
 This is primarily a maintenance release, but it also includes new features and enhancements.

Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/AbstractRealVectorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/AbstractRealVectorTest.java?rev=942638&r1=942637&r2=942638&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/AbstractRealVectorTest.java
(original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/AbstractRealVectorTest.java
Mon May 10 01:11:35 2010
@@ -209,6 +209,12 @@ public class AbstractRealVectorTest exte
         for(Iterator<Entry> it = v.sparseIterator(); it.hasNext() && (e = it.next())
!= null; i++) {
             assertEquals(nonDefaultV2[i], e.getValue());
         }
+        double [] onlyOne = {0d, 1.0, 0d};
+        v = new TestVectorImpl(onlyOne);
+        for(Iterator<Entry> it = v.sparseIterator(); it.hasNext() && (e = it.next())
!= null; ) {
+            assertEquals(onlyOne[1], e.getValue());
+        }
+        
     }
 
     public void testClone() throws Exception {



Mime
View raw message