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

Merge branch 'MATH-1492__heinrich' 

Closes #109.
This commit is contained in:
Gilles Sadowski 2019-06-20 14:02:40 +02:00
parent 5fc2399650 e6adb911b6
commit ea44a229da
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/apache/commons/math4/fraction/Fraction.java
View File

@ -499,12 +499,12 @@ public class Fraction
int d1 = ArithmeticUtils.gcd(denominator, fraction.denominator); int d1 = ArithmeticUtils.gcd(denominator, fraction.denominator);
if (d1==1) { if (d1==1) {
// result is ( (u*v' +/- u'v) / u'v') // result is ( (u*v' +/- u'v) / u'v')
int uvp = ArithmeticUtils.mulAndCheck(numerator, fraction.denominator); int uvp = Math.multiplyExact(numerator, fraction.denominator);
int upv = ArithmeticUtils.mulAndCheck(fraction.numerator, denominator); int upv = Math.multiplyExact(fraction.numerator, denominator);
return new Fraction return new Fraction
(isAdd ? ArithmeticUtils.addAndCheck(uvp, upv) : (isAdd ? Math.addExact(uvp, upv) :
ArithmeticUtils.subAndCheck(uvp, upv), Math.subtractExact(uvp, upv),
ArithmeticUtils.mulAndCheck(denominator, fraction.denominator)); Math.multiplyExact(denominator, fraction.denominator));
} }
// the quantity 't' requires 65 bits of precision; see knuth 4.5.1 // the quantity 't' requires 65 bits of precision; see knuth 4.5.1
// exercise 7. we're going to use a BigInteger. // exercise 7. we're going to use a BigInteger.
@ -526,7 +526,7 @@ public class Fraction
w); w);
} }
return new Fraction (w.intValue(), return new Fraction (w.intValue(),
ArithmeticUtils.mulAndCheck(denominator/d1, Math.multiplyExact(denominator/d1,
fraction.denominator/d2)); fraction.denominator/d2));
} }
@ -553,8 +553,8 @@ public class Fraction
int d1 = ArithmeticUtils.gcd(numerator, fraction.denominator); int d1 = ArithmeticUtils.gcd(numerator, fraction.denominator);
int d2 = ArithmeticUtils.gcd(fraction.numerator, denominator); int d2 = ArithmeticUtils.gcd(fraction.numerator, denominator);
return getReducedFraction return getReducedFraction
(ArithmeticUtils.mulAndCheck(numerator/d1, fraction.numerator/d2), (Math.multiplyExact(numerator/d1, fraction.numerator/d2),
ArithmeticUtils.mulAndCheck(denominator/d2, fraction.denominator/d1)); Math.multiplyExact(denominator/d2, fraction.denominator/d1));
} }
/** /**

9
src/test/java/org/apache/commons/math4/linear/InverseHilbertMatrix.java
View File

@ -20,7 +20,6 @@ import org.apache.commons.math4.exception.DimensionMismatchException;
import org.apache.commons.math4.linear.ArrayRealVector; import org.apache.commons.math4.linear.ArrayRealVector;
import org.apache.commons.math4.linear.RealLinearOperator; import org.apache.commons.math4.linear.RealLinearOperator;
import org.apache.commons.math4.linear.RealVector; import org.apache.commons.math4.linear.RealVector;
import org.apache.commons.numbers.core.ArithmeticUtils;
import org.apache.commons.numbers.combinatorics.BinomialCoefficient; import org.apache.commons.numbers.combinatorics.BinomialCoefficient;
/** /**
@ -59,12 +58,12 @@ public class InverseHilbertMatrix
public long getEntry(final int i, final int j) { public long getEntry(final int i, final int j) {
long val = i + j + 1; long val = i + j + 1;
long aux = BinomialCoefficient.value(n + i, n - j - 1); long aux = BinomialCoefficient.value(n + i, n - j - 1);
val = ArithmeticUtils.mulAndCheck(val, aux); val = Math.multiplyExact(val, aux);
aux = BinomialCoefficient.value(n + j, n - i - 1); aux = BinomialCoefficient.value(n + j, n - i - 1);
val = ArithmeticUtils.mulAndCheck(val, aux); val = Math.multiplyExact(val, aux);
aux = BinomialCoefficient.value(i + j, i); aux = BinomialCoefficient.value(i + j, i);
val = ArithmeticUtils.mulAndCheck(val, aux); val = Math.multiplyExact(val, aux);
val = ArithmeticUtils.mulAndCheck(val, aux); val = Math.multiplyExact(val, aux);
return ((i + j) & 1) == 0 ? val : -val; return ((i + j) & 1) == 0 ? val : -val;
} }