Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MATH-875: deprecated sparseIterator() in the RealVector hierarchy, and replaced its use with iterator(). 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1395455 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastien Brisard 2012-10-08 05:54:21 +00:00
parent d0e8a3587a
commit 37f8de9542
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/apache/commons/math3/linear/ArrayRealVector.java
View File

@ -306,7 +306,7 @@ public class ArrayRealVector extends RealVector implements Serializable {
} else { } else {
checkVectorDimensions(v); checkVectorDimensions(v);
double[] out = data.clone(); double[] out = data.clone();
Iterator<Entry> it = v.sparseIterator(); Iterator<Entry> it = v.iterator();
while (it.hasNext()) { while (it.hasNext()) {
final Entry e = it.next(); final Entry e = it.next();
out[e.getIndex()] += e.getValue(); out[e.getIndex()] += e.getValue();
@ -332,7 +332,7 @@ public class ArrayRealVector extends RealVector implements Serializable {
} else { } else {
checkVectorDimensions(v); checkVectorDimensions(v);
double[] out = data.clone(); double[] out = data.clone();
Iterator<Entry> it = v.sparseIterator(); Iterator<Entry> it = v.iterator();
while (it.hasNext()) { while (it.hasNext()) {
final Entry e = it.next(); final Entry e = it.next();
out[e.getIndex()] -= e.getValue(); out[e.getIndex()] -= e.getValue();

23
src/main/java/org/apache/commons/math3/linear/RealVector.java
View File

@ -232,7 +232,7 @@ public abstract class RealVector {
public RealVector add(RealVector v) throws DimensionMismatchException { public RealVector add(RealVector v) throws DimensionMismatchException {
checkVectorDimensions(v); checkVectorDimensions(v);
RealVector result = v.copy(); RealVector result = v.copy();
Iterator<Entry> it = sparseIterator(); Iterator<Entry> it = iterator();
while (it.hasNext()) { while (it.hasNext()) {
final Entry e = it.next(); final Entry e = it.next();
final int index = e.getIndex(); final int index = e.getIndex();
@ -253,7 +253,7 @@ public abstract class RealVector {
public RealVector subtract(RealVector v) throws DimensionMismatchException { public RealVector subtract(RealVector v) throws DimensionMismatchException {
checkVectorDimensions(v); checkVectorDimensions(v);
RealVector result = v.mapMultiply(-1d); RealVector result = v.mapMultiply(-1d);
Iterator<Entry> it = sparseIterator(); Iterator<Entry> it = iterator();
while (it.hasNext()) { while (it.hasNext()) {
final Entry e = it.next(); final Entry e = it.next();
final int index = e.getIndex(); final int index = e.getIndex();
@ -415,7 +415,7 @@ public abstract class RealVector {
*/ */
public double getNorm() { public double getNorm() {
double sum = 0; double sum = 0;
Iterator<Entry> it = sparseIterator(); Iterator<Entry> it = iterator();
while (it.hasNext()) { while (it.hasNext()) {
final Entry e = it.next(); final Entry e = it.next();
final double value = e.getValue(); final double value = e.getValue();
@ -436,7 +436,7 @@ public abstract class RealVector {
*/ */
public double getL1Norm() { public double getL1Norm() {
double norm = 0; double norm = 0;
Iterator<Entry> it = sparseIterator(); Iterator<Entry> it = iterator();
while (it.hasNext()) { while (it.hasNext()) {
final Entry e = it.next(); final Entry e = it.next();
norm += FastMath.abs(e.getValue()); norm += FastMath.abs(e.getValue());
@ -456,7 +456,7 @@ public abstract class RealVector {
*/ */
public double getLInfNorm() { public double getLInfNorm() {
double norm = 0; double norm = 0;
Iterator<Entry> it = sparseIterator(); Iterator<Entry> it = iterator();
while (it.hasNext()) { while (it.hasNext()) {
final Entry e = it.next(); final Entry e = it.next();
norm = FastMath.max(norm, FastMath.abs(e.getValue())); norm = FastMath.max(norm, FastMath.abs(e.getValue()));
@ -756,7 +756,12 @@ public abstract class RealVector {
* returns {@code true}.</p> * returns {@code true}.</p>
* *
* @return a sparse iterator. * @return a sparse iterator.
* @deprecated As of 3.1, this method is deprecated, because its interface
* is too confusing (see
* <a href="https://issues.apache.org/jira/browse/MATH-875">JIRA MATH-875</a>).
* This method will be completely removed in 4.0.
*/ */
@Deprecated
public Iterator<Entry> sparseIterator() { public Iterator<Entry> sparseIterator() {
return new SparseEntryIterator(); return new SparseEntryIterator();
} }
@ -835,7 +840,7 @@ public abstract class RealVector {
* @return a reference to this vector. * @return a reference to this vector.
*/ */
public RealVector mapToSelf(UnivariateFunction function) { public RealVector mapToSelf(UnivariateFunction function) {
Iterator<Entry> it = (function.value(0) == 0) ? sparseIterator() : iterator(); Iterator<Entry> it = iterator();
while (it.hasNext()) { while (it.hasNext()) {
final Entry e = it.next(); final Entry e = it.next();
e.setValue(function.value(e.getValue())); e.setValue(function.value(e.getValue()));
@ -1137,7 +1142,13 @@ public abstract class RealVector {
* operations which preserve the default value are to be done on the entries, * operations which preserve the default value are to be done on the entries,
* and the fraction of non-default values is small (i.e. someone took a * and the fraction of non-default values is small (i.e. someone took a
* SparseVector, and passed it into the copy-constructor of ArrayRealVector) * SparseVector, and passed it into the copy-constructor of ArrayRealVector)
*
* @deprecated As of 3.1, this class is deprecated, see
* <a href="https://issues.apache.org/jira/browse/MATH-875">JIRA MATH-875</a>.
* This class will be completely removed in 4.0.
*/ */
@Deprecated
protected class SparseEntryIterator implements Iterator<Entry> { protected class SparseEntryIterator implements Iterator<Entry> {
/** Dimension of the vector. */ /** Dimension of the vector. */
private final int dim; private final int dim;