From 5758e66ca8214b3f674ae36dd70c49003b99d523 Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 22 Jul 2015 11:13:18 +0200 Subject: [PATCH] renamed MathUtils -> MathUtil --- .../src/dorkbox/util/{MathUtils.java => MathUtil.java} | 2 +- Dorkbox-Util/src/dorkbox/util/collections/IntArray.java | 6 +++--- Dorkbox-Util/src/dorkbox/util/collections/IntMap.java | 8 ++++---- .../src/dorkbox/util/collections/ObjectIntMap.java | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) rename Dorkbox-Util/src/dorkbox/util/{MathUtils.java => MathUtil.java} (99%) diff --git a/Dorkbox-Util/src/dorkbox/util/MathUtils.java b/Dorkbox-Util/src/dorkbox/util/MathUtil.java similarity index 99% rename from Dorkbox-Util/src/dorkbox/util/MathUtils.java rename to Dorkbox-Util/src/dorkbox/util/MathUtil.java index 12da50d..3aa9dd8 100644 --- a/Dorkbox-Util/src/dorkbox/util/MathUtils.java +++ b/Dorkbox-Util/src/dorkbox/util/MathUtil.java @@ -19,7 +19,7 @@ package dorkbox.util; @SuppressWarnings("unused") public -class MathUtils { +class MathUtil { // --- diff --git a/Dorkbox-Util/src/dorkbox/util/collections/IntArray.java b/Dorkbox-Util/src/dorkbox/util/collections/IntArray.java index 151e5c2..75ad0e9 100644 --- a/Dorkbox-Util/src/dorkbox/util/collections/IntArray.java +++ b/Dorkbox-Util/src/dorkbox/util/collections/IntArray.java @@ -19,7 +19,7 @@ package dorkbox.util.collections; -import dorkbox.util.MathUtils; +import dorkbox.util.MathUtil; import java.util.Arrays; @@ -291,7 +291,7 @@ public class IntArray { public void shuffle () { for (int i = this.size - 1; i >= 0; i--) { - int ii = MathUtils.randomInt(i); + int ii = MathUtil.randomInt(i); int temp = this.items[i]; this.items[i] = this.items[ii]; this.items[ii] = temp; @@ -311,7 +311,7 @@ public class IntArray { if (this.size == 0) { return 0; } - return this.items[MathUtils.randomInt(0, this.size - 1)]; + return this.items[MathUtil.randomInt(0, this.size - 1)]; } public int[] toArray () { diff --git a/Dorkbox-Util/src/dorkbox/util/collections/IntMap.java b/Dorkbox-Util/src/dorkbox/util/collections/IntMap.java index 4722ff8..b001f85 100644 --- a/Dorkbox-Util/src/dorkbox/util/collections/IntMap.java +++ b/Dorkbox-Util/src/dorkbox/util/collections/IntMap.java @@ -19,7 +19,7 @@ package dorkbox.util.collections; -import dorkbox.util.MathUtils; +import dorkbox.util.MathUtil; import java.util.Iterator; import java.util.NoSuchElementException; @@ -78,7 +78,7 @@ public class IntMap { if (this.capacity > 1 << 30) { throw new IllegalArgumentException("initialCapacity is too large: " + initialCapacity); } - this.capacity = MathUtils.nextPowerOfTwo(initialCapacity); + this.capacity = MathUtil.nextPowerOfTwo(initialCapacity); if (loadFactor <= 0) { throw new IllegalArgumentException("loadFactor must be > 0: " + loadFactor); @@ -237,7 +237,7 @@ public class IntMap { int i = 0, pushIterations = this.pushIterations; do { // Replace the key and value for one of the hashes. - switch (MathUtils.randomInt(2)) { + switch (MathUtil.randomInt(2)) { case 0: evictedKey = key1; evictedValue = valueTable[index1]; @@ -557,7 +557,7 @@ public class IntMap { public void ensureCapacity (int additionalCapacity) { int sizeNeeded = this.size + additionalCapacity; if (sizeNeeded >= this.threshold) { - resize(MathUtils.nextPowerOfTwo((int)(sizeNeeded / this.loadFactor))); + resize(MathUtil.nextPowerOfTwo((int) (sizeNeeded / this.loadFactor))); } } diff --git a/Dorkbox-Util/src/dorkbox/util/collections/ObjectIntMap.java b/Dorkbox-Util/src/dorkbox/util/collections/ObjectIntMap.java index a6adbce..2e1eb3f 100644 --- a/Dorkbox-Util/src/dorkbox/util/collections/ObjectIntMap.java +++ b/Dorkbox-Util/src/dorkbox/util/collections/ObjectIntMap.java @@ -16,7 +16,7 @@ package dorkbox.util.collections; import com.esotericsoftware.kryo.util.ObjectMap; -import dorkbox.util.MathUtils; +import dorkbox.util.MathUtil; /** An unordered map where the values are ints. This implementation is a cuckoo hash map using 3 hashes, random walking, and a * small stash for problematic keys. Null keys are not allowed. No allocation is done except when growing the table size.
@@ -209,7 +209,7 @@ public class ObjectIntMap { int i = 0, pushIterations = this.pushIterations; do { // Replace the key and value for one of the hashes. - switch (MathUtils.randomInt(2)) { + switch (MathUtil.randomInt(2)) { case 0: evictedKey = key1; evictedValue = valueTable[index1];