From 0663ca200aaaebfbcbf9561c3f2c9bf38dea9572 Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Sun, 28 May 2023 17:08:32 +0800 Subject: [PATCH] fixed bug --- .../main/java/net/woggioni/jmath/Matrix.java | 3 +-- .../java/net/woggioni/jmath/Rational.java | 4 +-- .../java/net/woggioni/jwo/Chronometer.java | 26 +++++++++---------- src/main/java/net/woggioni/jwo/LruCache.java | 4 +-- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/jmath/src/main/java/net/woggioni/jmath/Matrix.java b/jmath/src/main/java/net/woggioni/jmath/Matrix.java index f803d3a..0019c65 100644 --- a/jmath/src/main/java/net/woggioni/jmath/Matrix.java +++ b/jmath/src/main/java/net/woggioni/jmath/Matrix.java @@ -417,9 +417,8 @@ public class Matrix> implements Iterable x = Vector.of(numericTypeFactory, size); for (int i = 0; i < size; i++) { diff --git a/jmath/src/main/java/net/woggioni/jmath/Rational.java b/jmath/src/main/java/net/woggioni/jmath/Rational.java index 124b14e..668a350 100644 --- a/jmath/src/main/java/net/woggioni/jmath/Rational.java +++ b/jmath/src/main/java/net/woggioni/jmath/Rational.java @@ -54,11 +54,11 @@ public class Rational implements NumericType { public Rational(BigInteger num, BigInteger den) { this.num = num; this.den = den; + simplify(); } public Rational(long num, long den) { - this.num = BigInteger.valueOf(num); - this.den = BigInteger.valueOf(den); + this(BigInteger.valueOf(num), BigInteger.valueOf(den)); } public static Rational of(long num, long den) { diff --git a/src/main/java/net/woggioni/jwo/Chronometer.java b/src/main/java/net/woggioni/jwo/Chronometer.java index 1244c8d..9c08125 100644 --- a/src/main/java/net/woggioni/jwo/Chronometer.java +++ b/src/main/java/net/woggioni/jwo/Chronometer.java @@ -6,20 +6,20 @@ public class Chronometer { public enum UnitOfMeasure { NANOSECONDS(1), - MICROSECONDS(NANOSECONDS.nanoseconds_size * 1000), - MILLISECONDS(MICROSECONDS.nanoseconds_size * 1000), - SECONDS(MILLISECONDS.nanoseconds_size * 1000), - MINUTES(SECONDS.nanoseconds_size * 60), - HOURS(MINUTES.nanoseconds_size * 60), - DAYS(HOURS.nanoseconds_size * 24), - WEEKS(DAYS.nanoseconds_size * 7), - MONTHS(DAYS.nanoseconds_size * 30), - YEARS(DAYS.nanoseconds_size * 365); + MICROSECONDS(NANOSECONDS.nanoseconds * 1000), + MILLISECONDS(MICROSECONDS.nanoseconds * 1000), + SECONDS(MILLISECONDS.nanoseconds * 1000), + MINUTES(SECONDS.nanoseconds * 60), + HOURS(MINUTES.nanoseconds * 60), + DAYS(HOURS.nanoseconds * 24), + WEEKS(DAYS.nanoseconds * 7), + MONTHS(DAYS.nanoseconds * 30), + YEARS(DAYS.nanoseconds * 365); - public long nanoseconds_size; + public final long nanoseconds; - UnitOfMeasure(long nanoseconds_size) { - this.nanoseconds_size = nanoseconds_size; + UnitOfMeasure(long nanoseconds) { + this.nanoseconds = nanoseconds; } } @@ -39,6 +39,6 @@ public class Chronometer { } public double elapsed(UnitOfMeasure unitOfMeasure) { - return ((double) (System.nanoTime() - start)) / unitOfMeasure.nanoseconds_size; + return ((double) (System.nanoTime() - start)) / unitOfMeasure.nanoseconds; } } diff --git a/src/main/java/net/woggioni/jwo/LruCache.java b/src/main/java/net/woggioni/jwo/LruCache.java index 12241fe..c8993cd 100644 --- a/src/main/java/net/woggioni/jwo/LruCache.java +++ b/src/main/java/net/woggioni/jwo/LruCache.java @@ -277,11 +277,11 @@ public class LruCache implements Map { } public float getAverageLoadingTime(Chronometer.UnitOfMeasure unitOfMeasure) { - return (float) stats.loadingTime / calls / unitOfMeasure.nanoseconds_size; + return (float) stats.loadingTime / calls / unitOfMeasure.nanoseconds; } public float getTotalLoadingTime(Chronometer.UnitOfMeasure unitOfMeasure) { - return (float) stats.loadingTime / unitOfMeasure.nanoseconds_size; + return (float) stats.loadingTime / unitOfMeasure.nanoseconds; } public float getAverageLoadingTime() {