This is an automated email from the ASF dual-hosted git repository. erans pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-numbers.git
commit c97fc79f4dbebc15128c5bc77afde4c2319ca3c4 Author: Gilles Sadowski <gil...@harfang.homelinux.org> AuthorDate: Fri Jun 7 23:39:09 2019 +0200 Fix issues (compilation failure) introduced by the merge of "fraction-dev" branch. --- .../commons/numbers/arrays/LinearCombinationTest.java | 12 ++++++------ .../org/apache/commons/numbers/field/FieldsList.java | 6 +++--- .../org/apache/commons/numbers/fraction/Fraction.java | 17 ++++++++++++++++- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/commons-numbers-arrays/src/test/java/org/apache/commons/numbers/arrays/LinearCombinationTest.java b/commons-numbers-arrays/src/test/java/org/apache/commons/numbers/arrays/LinearCombinationTest.java index 49843ac..7e0a12c 100644 --- a/commons-numbers-arrays/src/test/java/org/apache/commons/numbers/arrays/LinearCombinationTest.java +++ b/commons-numbers-arrays/src/test/java/org/apache/commons/numbers/arrays/LinearCombinationTest.java @@ -36,14 +36,14 @@ public class LinearCombinationTest { @Test public void testTwoSums() { final BigFraction[] aF = new BigFraction[] { - new BigFraction(-1321008684645961L, 268435456L), - new BigFraction(-5774608829631843L, 268435456L), - new BigFraction(-7645843051051357L, 8589934592L) + BigFraction.of(-1321008684645961L, 268435456L), + BigFraction.of(-5774608829631843L, 268435456L), + BigFraction.of(-7645843051051357L, 8589934592L) }; final BigFraction[] bF = new BigFraction[] { - new BigFraction(-5712344449280879L, 2097152L), - new BigFraction(-4550117129121957L, 2097152L), - new BigFraction(8846951984510141L, 131072L) + BigFraction.of(-5712344449280879L, 2097152L), + BigFraction.of(-4550117129121957L, 2097152L), + BigFraction.of(8846951984510141L, 131072L) }; final int len = aF.length; diff --git a/commons-numbers-field/src/test/java/org/apache/commons/numbers/field/FieldsList.java b/commons-numbers-field/src/test/java/org/apache/commons/numbers/field/FieldsList.java index 0dc52cc..ec68123 100644 --- a/commons-numbers-field/src/test/java/org/apache/commons/numbers/field/FieldsList.java +++ b/commons-numbers-field/src/test/java/org/apache/commons/numbers/field/FieldsList.java @@ -35,9 +35,9 @@ public class FieldsList { try { // List of fields to test. add(new FractionField(), - new Fraction(13, 4), - new Fraction(5, 29), - new Fraction(-279, 11)); + Fraction.of(13, 4), + Fraction.of(5, 29), + Fraction.of(-279, 11)); add(new FP64Field(), new FP64(23.45678901), new FP64(-543.2109876), diff --git a/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/Fraction.java b/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/Fraction.java index c6ed60e..d5f1b46 100644 --- a/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/Fraction.java +++ b/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/Fraction.java @@ -18,6 +18,7 @@ package org.apache.commons.numbers.fraction; import java.io.Serializable; import org.apache.commons.numbers.core.ArithmeticUtils; +import org.apache.commons.numbers.core.NativeOperators; /** * Representation of a rational number. @@ -26,7 +27,9 @@ import org.apache.commons.numbers.core.ArithmeticUtils; */ public class Fraction extends Number - implements Comparable<Fraction>, Serializable { + implements Comparable<Fraction>, + NativeOperators<Fraction>, + Serializable { /** A fraction representing "1". */ public static final Fraction ONE = new Fraction(1, 1); @@ -622,6 +625,18 @@ public class Fraction return str; } + /** {@inheritDoc} */ + @Override + public Fraction zero() { + return ZERO; + } + + /** {@inheritDoc} */ + @Override + public Fraction one() { + return ONE; + } + /** * Parses a string that would be produced by {@link #toString()} * and instantiates the corresponding object.