You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by er...@apache.org on 2015/08/21 00:28:14 UTC
[1/2] [math] MATH-1261
Repository: commons-math
Updated Branches:
refs/heads/master 44c6d267a -> 3aa34dbc9
MATH-1261
Avoid unnecessary overflow. Thanks to Osamu Ikeuchi.
Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/4c4b3e2e
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/4c4b3e2e
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/4c4b3e2e
Branch: refs/heads/master
Commit: 4c4b3e2e32ddae35e4c1a6ffce1cd2b2eafa958b
Parents: 44c6d26
Author: Gilles <er...@apache.org>
Authored: Fri Aug 21 00:13:35 2015 +0200
Committer: Gilles <er...@apache.org>
Committed: Fri Aug 21 00:13:35 2015 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 7 +++++--
.../java/org/apache/commons/math4/fraction/Fraction.java | 4 ++--
.../org/apache/commons/math4/fraction/FractionTest.java | 11 +++++++++++
3 files changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-math/blob/4c4b3e2e/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index db6a7ea..4d3b478 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -53,11 +53,14 @@ If the output is not quite correct, check for invisible trailing spaces!
<release version="TBD" date="TBD" description="TBD">
</release>
- <release version="4.0" date="XXXX-XX-XX" description=""> <!-- backported to 3.6 -->
+ <release version="4.0" date="XXXX-XX-XX" description="">
+ <action dev="erans" type="fix" issue="MATH-1261" due-to="Osamu Ikeuchi">
+ Avoid overflow in "Fraction" (multiplication or division by an int).
+ </action>
<action dev="oertl" type="fix" issue="MATH-1258" due-to="Gunel Jahangirova"> <!-- backported to 3.6 -->
Added check for equal array lengths to distance measure functions.
</action>
- <action dev="erans" type="fix" issue="MATH-1257" due-to="Bill Murphy">
+ <action dev="erans" type="fix" issue="MATH-1257" due-to="Bill Murphy"> <!-- backported to 3.6 -->
Better accuracy in computation of cumulative probability of "NormalDistribution"
(package "o.a.c.m.distribution").
</action>
http://git-wip-us.apache.org/repos/asf/commons-math/blob/4c4b3e2e/src/main/java/org/apache/commons/math4/fraction/Fraction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/fraction/Fraction.java b/src/main/java/org/apache/commons/math4/fraction/Fraction.java
index 0713b85..39eba8d 100644
--- a/src/main/java/org/apache/commons/math4/fraction/Fraction.java
+++ b/src/main/java/org/apache/commons/math4/fraction/Fraction.java
@@ -566,7 +566,7 @@ public class Fraction
*/
@Override
public Fraction multiply(final int i) {
- return new Fraction(numerator * i, denominator);
+ return multiply(new Fraction(i));
}
/**
@@ -597,7 +597,7 @@ public class Fraction
* @return this * i
*/
public Fraction divide(final int i) {
- return new Fraction(numerator, denominator * i);
+ return divide(new Fraction(i));
}
/**
http://git-wip-us.apache.org/repos/asf/commons-math/blob/4c4b3e2e/src/test/java/org/apache/commons/math4/fraction/FractionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/fraction/FractionTest.java b/src/test/java/org/apache/commons/math4/fraction/FractionTest.java
index aca7d05..971e740 100644
--- a/src/test/java/org/apache/commons/math4/fraction/FractionTest.java
+++ b/src/test/java/org/apache/commons/math4/fraction/FractionTest.java
@@ -263,6 +263,17 @@ public class FractionTest {
}
@Test
+ public void testMath1261() {
+ final Fraction a = new Fraction(Integer.MAX_VALUE, 2);
+ final Fraction b = a.multiply(2);
+ Assert.assertTrue(b.equals(new Fraction(Integer.MAX_VALUE)));
+
+ final Fraction c = new Fraction(2, Integer.MAX_VALUE);
+ final Fraction d = c.divide(2);
+ Assert.assertTrue(d.equals(new Fraction(1, Integer.MAX_VALUE)));
+ }
+
+ @Test
public void testReciprocal() {
Fraction f = null;
[2/2] [math] Backport tracking.
Posted by er...@apache.org.
Backport tracking.
Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/3aa34dbc
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/3aa34dbc
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/3aa34dbc
Branch: refs/heads/master
Commit: 3aa34dbc9d8d6f900a6077b62deeb046502d5bb5
Parents: 4c4b3e2
Author: Gilles <er...@apache.org>
Authored: Fri Aug 21 00:26:59 2015 +0200
Committer: Gilles <er...@apache.org>
Committed: Fri Aug 21 00:26:59 2015 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-math/blob/3aa34dbc/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4d3b478..d209db5 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -54,7 +54,7 @@ If the output is not quite correct, check for invisible trailing spaces!
</release>
<release version="4.0" date="XXXX-XX-XX" description="">
- <action dev="erans" type="fix" issue="MATH-1261" due-to="Osamu Ikeuchi">
+ <action dev="erans" type="fix" issue="MATH-1261" due-to="Osamu Ikeuchi"> <!-- backported to 3.6 -->
Avoid overflow in "Fraction" (multiplication or division by an int).
</action>
<action dev="oertl" type="fix" issue="MATH-1258" due-to="Gunel Jahangirova"> <!-- backported to 3.6 -->