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/08/08 17:30:33 UTC
[commons-numbers] 10/18: NUMBERS-120: Remove redundant conditional
branch
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 504f82b68c2bb597f11985a0599969139e117f2b
Author: Schamschi <he...@gmx.at>
AuthorDate: Fri Jun 28 01:29:49 2019 +0200
NUMBERS-120: Remove redundant conditional branch
---
.../commons/numbers/fraction/BigFraction.java | 27 ++++++++++------------
1 file changed, 12 insertions(+), 15 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 c5410b0..3487dda 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
@@ -835,22 +835,19 @@ public class BigFraction extends Number implements Comparable<BigFraction>, Seri
private static BigInteger roundAndRightShift(BigInteger value, int bits, boolean hasFractionalBits) {
if (bits <= 0) {
throw new IllegalArgumentException();
- } else if (bits > value.bitLength()) {
- return BigInteger.ZERO;
- } else {
- boolean roundUp = false;
- if (value.testBit(bits - 1)
- && (hasFractionalBits
- || (value.getLowestSetBit() < bits - 1)
- || value.testBit(bits))) {
- roundUp = true;
- }
- BigInteger result = value.shiftRight(bits);
- if (roundUp) {
- result = result.add(BigInteger.ONE);
- }
- return result;
}
+ boolean roundUp = false;
+ if (value.testBit(bits - 1)
+ && (hasFractionalBits
+ || (value.getLowestSetBit() < bits - 1)
+ || value.testBit(bits))) {
+ roundUp = true;
+ }
+ BigInteger result = value.shiftRight(bits);
+ if (roundUp) {
+ result = result.add(BigInteger.ONE);
+ }
+ return result;
}
/**