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 2019/06/07 22:00:12 UTC
[commons-numbers] branch master updated (6bcc6d9 -> b4356bd)
This is an automated email from the ASF dual-hosted git repository.
erans pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-numbers.git.
from 6bcc6d9 [numbers] support JUnit 5 tests
new c97fc79 Fix issues (compilation failure) introduced by the merge of "fraction-dev" branch.
new b4356bd Implement ValJO convention.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../commons/numbers/arrays/LinearCombinationTest.java | 12 ++++++------
.../java/org/apache/commons/numbers/field/FP64.java | 12 +++++++++++-
.../org/apache/commons/numbers/field/FP64Field.java | 4 ++--
.../org/apache/commons/numbers/field/FieldsList.java | 12 ++++++------
.../org/apache/commons/numbers/fraction/Fraction.java | 17 ++++++++++++++++-
5 files changed, 41 insertions(+), 16 deletions(-)
[commons-numbers] 02/02: Implement ValJO convention.
Posted by er...@apache.org.
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 b4356bd53bdab7cb73ba7594a6594310c233d08d
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Fri Jun 7 23:48:58 2019 +0200
Implement ValJO convention.
---
.../src/main/java/org/apache/commons/numbers/field/FP64.java | 12 +++++++++++-
.../java/org/apache/commons/numbers/field/FP64Field.java | 4 ++--
.../java/org/apache/commons/numbers/field/FieldsList.java | 6 +++---
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/commons-numbers-field/src/main/java/org/apache/commons/numbers/field/FP64.java b/commons-numbers-field/src/main/java/org/apache/commons/numbers/field/FP64.java
index f0a2c92..764b51c 100644
--- a/commons-numbers-field/src/main/java/org/apache/commons/numbers/field/FP64.java
+++ b/commons-numbers-field/src/main/java/org/apache/commons/numbers/field/FP64.java
@@ -36,10 +36,20 @@ public class FP64 extends Number
/**
* @param value Value.
*/
- public FP64(double value) {
+ private FP64(double value) {
this.value = value;
}
+ /**
+ * Factory.
+ *
+ * @param value Value.
+ * @return a new instance.
+ */
+ public static FP64 of(double value) {
+ return new FP64(value);
+ }
+
/** {@inheritDoc} */
@Override
public FP64 add(FP64 a) {
diff --git a/commons-numbers-field/src/main/java/org/apache/commons/numbers/field/FP64Field.java b/commons-numbers-field/src/main/java/org/apache/commons/numbers/field/FP64Field.java
index fe7e921..491c8d4 100644
--- a/commons-numbers-field/src/main/java/org/apache/commons/numbers/field/FP64Field.java
+++ b/commons-numbers-field/src/main/java/org/apache/commons/numbers/field/FP64Field.java
@@ -21,9 +21,9 @@ package org.apache.commons.numbers.field;
*/
public class FP64Field extends AbstractField<FP64> {
/** 0d */
- private static final FP64 ZERO = new FP64(0.);
+ private static final FP64 ZERO = FP64.of(0d);
/** 1d */
- private static final FP64 ONE = new FP64(1.);
+ private static final FP64 ONE = FP64.of(1d);
/** {@inheritDoc} */
@Override
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 ec68123..a341171 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
@@ -39,9 +39,9 @@ public class FieldsList {
Fraction.of(5, 29),
Fraction.of(-279, 11));
add(new FP64Field(),
- new FP64(23.45678901),
- new FP64(-543.2109876),
- new FP64(-234.5678901));
+ FP64.of(23.45678901),
+ FP64.of(-543.2109876),
+ FP64.of(-234.5678901));
} catch (Exception e) {
System.err.println("Unexpected exception while creating the list of fields: " + e);
[commons-numbers] 01/02: Fix issues (compilation failure)
introduced by the merge of "fraction-dev" branch.
Posted by er...@apache.org.
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 <gi...@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.