Version 0.6.5: Reverted "Fixed a bug in Scaler"

This reverts commit 639b405.

Author: leventov

README.md

@@ -39,8 +39,8 @@ Add to your Gradle build script:
 
     dependencies {
         // `jdk8` instead of `jdk6-7` if you use Java 8
-        compile 'net.openhft:koloboke-api-jdk6-7:0.6.4'
-        runtime 'net.openhft:koloboke-impl-jdk6-7:0.6.4'
+        compile 'net.openhft:koloboke-api-jdk6-7:0.6.5'
+        runtime 'net.openhft:koloboke-impl-jdk6-7:0.6.5'
     }
 
 Or Maven config (don't forget about jdk6-7/jdk8 suffix):
@@ -49,12 +49,12 @@ Or Maven config (don't forget about jdk6-7/jdk8 suffix):
         <dependency>
             <groupId>net.openhft</groupId>
             <artifactId>koloboke-api-jdk6-7</artifactId>
-            <version>0.6.4</version>
+            <version>0.6.5</version>
         </dependency>
         <dependency>
             <groupId>net.openhft</groupId>
             <artifactId>koloboke-impl-jdk6-7</artifactId>
-            <version>0.6.4</version>
+            <version>0.6.5</version>
             <scope>runtime</scope>
         </dependency>
     <dependencies>

lib/build.gradle

@@ -64,7 +64,7 @@ configure([apiProject, implProject]) {
 
     configurePublishing(project, project.is(apiProject))
     archivesBaseName  = "koloboke-$project.name-jdk${libTargetJava == '6' ? '6-7' : '8'}"
-    version = '0.6.4'
+    version = '0.6.5'
     ext.apiVersion = '0.6'
 
     poms*.whenConfigured { pom ->

lib/impl/src/main/java/net/openhft/koloboke/collect/impl/Scaler.java

@@ -139,7 +139,6 @@ private static void check(long n) {
     }
 
     private static final BigDecimal LONG_MAX_VALUE = valueOf(Long.MAX_VALUE);
-    private static final BigDecimal INT_MAX_VALUE = valueOf(Integer.MAX_VALUE);
 
     final double scale;
     private BigDecimal scaleAsBD;
@@ -159,19 +158,13 @@ BigDecimal createBD() {
 
     public int scaleUpper(int n) {
         check(n);
-        int lower = scaleLower(n);
+        int lower = (int) ((double) n * scale);
         return lower < Integer.MAX_VALUE ? lower + 1 : Integer.MAX_VALUE;
     }
 
     public int scaleLower(int n) {
         check(n);
-        double d = ((double) n) * scale;
-        if (d != Math.rint(d)) {
-            return (int) d;
-        } else {
-            BigDecimal lower = valueOf(n).multiply(scaleAsBD());
-            return lower.compareTo(INT_MAX_VALUE) < 0 ? lower.intValue() : Integer.MAX_VALUE;
-        }
+        return (int) ((double) n * scale);
     }
 
     public long scaleUpper(long n) {

lib/impl/src/test/java/net/openhft/koloboke/collect/impl/ScalerTest.java

@@ -54,10 +54,6 @@ public class ScalerTest {
     public static final Collection<Integer> ints = new ArrayList<Integer>();
     public static final Collection<Long> longs = new ArrayList<Long>();
     static {
-        // special property of this value: multiplied by Math.PI, it results to a double value
-        // which is actually an integer, i. e. d == Math.rint(d)
-        ints.add(415069444);
-        
         for (int i = 1; i < 10000; i++) {
             ints.add(i);
             longs.add((long) i);