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/07/02 21:13:32 UTC
[commons-numbers] branch master updated (f8e93c2 -> e44b91e)
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 f8e93c2 Merge branch 'NUMBERS-127__heinrich'
new 14b3591 Convention for serial version identifier: Use date of last incompatible change.
new e44b91e Formatting.
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:
.../apache/commons/numbers/fraction/BigFraction.java | 3 +--
.../org/apache/commons/numbers/fraction/Fraction.java | 17 +++++++----------
2 files changed, 8 insertions(+), 12 deletions(-)
[commons-numbers] 01/02: Convention for serial version identifier:
Use date of last incompatible change.
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 14b3591b914d21bfd7bc8f948c3ad783789adf81
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Mon Jul 1 23:58:25 2019 +0200
Convention for serial version identifier: Use date of last incompatible change.
---
.../src/main/java/org/apache/commons/numbers/fraction/BigFraction.java | 3 +--
.../src/main/java/org/apache/commons/numbers/fraction/Fraction.java | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/BigFraction.java b/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/BigFraction.java
index 4cf1ecf..7c8ce9c 100644
--- a/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/BigFraction.java
+++ b/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction/BigFraction.java
@@ -34,7 +34,7 @@ public class BigFraction extends Number implements Comparable<BigFraction>, Seri
public static final BigFraction ONE = of(1);
/** Serializable version identifier. */
- private static final long serialVersionUID = -5630213147331578515L;
+ private static final long serialVersionUID = 20190701L;
/** Parameter name for fraction (to satisfy checkstyle). */
private static final String PARAM_NAME_FRACTION = "fraction";
@@ -1113,7 +1113,6 @@ public class BigFraction extends Number implements Comparable<BigFraction>, Seri
den = denominator.multiply(fraction.denominator);
}
return new BigFraction(num, den);
-
}
/**
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 9920d03..49e4a17 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
@@ -38,7 +38,7 @@ public class Fraction
public static final Fraction ZERO = new Fraction(0, 1);
/** Serializable version identifier */
- private static final long serialVersionUID = 3698073679419233275L;
+ private static final long serialVersionUID = 20190701L;
/** Parameter name for fraction (to satisfy checkstyle). */
private static final String PARAM_NAME_FRACTION = "fraction";
[commons-numbers] 02/02: Formatting.
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 e44b91e461c730873c4e4e7c4e4c3dc84c73ec53
Author: Gilles Sadowski <gi...@harfang.homelinux.org>
AuthorDate: Tue Jul 2 00:04:00 2019 +0200
Formatting.
---
.../org/apache/commons/numbers/fraction/Fraction.java | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
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 49e4a17..b544192 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
@@ -83,8 +83,7 @@ public class Fraction
* @throws IllegalArgumentException if the continued fraction failed to
* converge.
*/
- private Fraction(double value, double epsilon, int maxDenominator, int maxIterations)
- {
+ private Fraction(double value, double epsilon, int maxDenominator, int maxIterations) {
long overflow = Integer.MAX_VALUE;
double r0 = value;
long a0 = (long)Math.floor(r0);
@@ -193,6 +192,7 @@ public class Fraction
this.numerator = num;
this.denominator = den;
}
+
/**
* Create a fraction given the double value.
* @param value the double value to convert to a fraction.
@@ -221,8 +221,7 @@ public class Fraction
* converge.
* @return {@link Fraction} instance
*/
- public static Fraction from(double value, double epsilon, int maxIterations)
- {
+ public static Fraction from(double value, double epsilon, int maxIterations) {
return new Fraction(value, epsilon, Integer.MAX_VALUE, maxIterations);
}
@@ -241,8 +240,7 @@ public class Fraction
* converge
* @return {@link Fraction} instance
*/
- public static Fraction from(double value, int maxDenominator)
- {
+ public static Fraction from(double value, int maxDenominator) {
return new Fraction(value, 0, maxDenominator, 100);
}
@@ -373,7 +371,7 @@ public class Fraction
*/
@Override
public int intValue() {
- return (int)doubleValue();
+ return (int) doubleValue();
}
/**
@@ -383,7 +381,7 @@ public class Fraction
*/
@Override
public long longValue() {
- return (long)doubleValue();
+ return (long) doubleValue();
}
/**
@@ -628,5 +626,4 @@ public class Fraction
return of(num, denom);
}
}
-
}