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

MATH-894 

Removed call to "contract" in "addElement".


git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1407485 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gilles Sadowski 2012-11-09 15:15:11 +00:00
parent 3456d2a12a
commit 4ece62e101
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/apache/commons/math3/util/ResizableDoubleArray.java
View File

@ -298,14 +298,10 @@ public class ResizableDoubleArray implements DoubleArray, Serializable {
* @param value to be added to end of array * @param value to be added to end of array
*/ */
public synchronized void addElement(double value) { public synchronized void addElement(double value) {
numElements++; if (internalArray.length <= startIndex + numElements) {
if ((startIndex + numElements) > internalArray.length) {
expand(); expand();
} }
internalArray[startIndex + (numElements - 1)] = value; internalArray[startIndex + numElements++] = value;
if (shouldContract()) {
contract();
}
} }
/** /**

8
src/test/java/org/apache/commons/math3/util/ResizableDoubleArrayTest.java
View File

@ -157,16 +157,16 @@ public class ResizableDoubleArrayTest extends DoubleArrayAbstractTest {
da.addElement(2.0); da.addElement(2.0);
da.addElement(4.0); da.addElement(4.0);
da.addElement(6.0); da.addElement(6.0);
Assert.assertEquals(4, ((ResizableDoubleArray) da).getInternalLength()); Assert.assertEquals(16, ((ResizableDoubleArray) da).getInternalLength());
Assert.assertEquals(3, da.getNumElements()); Assert.assertEquals(3, da.getNumElements());
da.setElement(3, 7.0); da.setElement(3, 7.0);
Assert.assertEquals(4, ((ResizableDoubleArray) da).getInternalLength()); Assert.assertEquals(16, ((ResizableDoubleArray) da).getInternalLength());
Assert.assertEquals(4, da.getNumElements()); Assert.assertEquals(4, da.getNumElements());
da.setElement(10, 10.0); da.setElement(10, 10.0);
Assert.assertEquals(11, ((ResizableDoubleArray) da).getInternalLength()); Assert.assertEquals(16, ((ResizableDoubleArray) da).getInternalLength());
Assert.assertEquals(11, da.getNumElements()); Assert.assertEquals(11, da.getNumElements());
da.setElement(9, 10.0); da.setElement(9, 10.0);
Assert.assertEquals(11, ((ResizableDoubleArray) da).getInternalLength()); Assert.assertEquals(16, ((ResizableDoubleArray) da).getInternalLength());
Assert.assertEquals(11, da.getNumElements()); Assert.assertEquals(11, da.getNumElements());
try { try {