minor tweak to EncodedValue implementation

Author: karussell

core/src/main/java/com/graphhopper/routing/ev/SimpleBooleanEncodedValue.java

@@ -34,32 +34,11 @@ public SimpleBooleanEncodedValue(String name, boolean storeBothDirections) {
 
     @Override
     public final void setBool(boolean reverse, IntsRef ref, boolean value) {
-        if (storeTwoDirections && reverse) {
-            int flags = ref.ints[bwdDataIndex + ref.offset];
-            flags &= ~bwdMask;
-            // set value
-            if (value)
-                flags = flags | (1 << bwdShift);
-            ref.ints[bwdDataIndex + ref.offset] = flags;
-
-        } else {
-            int flags = ref.ints[fwdDataIndex + ref.offset];
-            flags &= ~fwdMask;
-            if (value)
-                flags = flags | (1 << fwdShift);
-            ref.ints[fwdDataIndex + ref.offset] = flags;
-        }
+        setInt(reverse, ref, value ? 1 : 0);
     }
 
     @Override
     public final boolean getBool(boolean reverse, IntsRef ref) {
-        int flags;
-        if (storeTwoDirections && reverse) {
-            flags = ref.ints[bwdDataIndex + ref.offset];
-            return (flags & bwdMask) >>> bwdShift == 1;
-        }
-
-        flags = ref.ints[fwdDataIndex + ref.offset];
-        return (flags & fwdMask) >>> fwdShift == 1;
+        return getInt(reverse, ref) == 1;
     }
 }

core/src/main/java/com/graphhopper/routing/ev/StringEncodedValue.java

@@ -1,18 +1,18 @@
 package com.graphhopper.routing.ev;
 
+import com.carrotsearch.hppc.ObjectIntHashMap;
+import com.carrotsearch.hppc.ObjectIntMap;
+import com.graphhopper.storage.IntsRef;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
-import com.carrotsearch.hppc.ObjectIntHashMap;
-import com.carrotsearch.hppc.ObjectIntMap;
-import com.graphhopper.storage.IntsRef;
-
 /**
  * This class holds a List of up to {@link #maxValues} encountered Strings and stores
  * <i>index+1</i> to indicate a string is set or <i>0</i> if no value is assigned
- * 
+ *
  * @author Peter Karich
  * @author Thomas Butz
  */
@@ -37,11 +37,10 @@ public StringEncodedValue(String name, int bits, List<String> values, boolean st
         super(name, bits, storeTwoDirections);
 
         this.maxValues = (1 << bits) - 1;
-        if (values.size() > maxValues) {
-            throw new IllegalArgumentException(
-                            "Number of values is higher than the maximum value count: "
-                                            + values.size() + " > " + maxValues);
-        }
+        if (values.size() > maxValues)
+            throw new IllegalArgumentException("Number of values is higher than the maximum value count: "
+                    + values.size() + " > " + maxValues);
+
         this.values = new ArrayList<>(values);
         this.indexMap = new ObjectIntHashMap<>(values.size());
         int index = 1;
@@ -57,10 +56,9 @@ public final void setString(boolean reverse, IntsRef ref, String value) {
         }
         int index = indexMap.get(value);
         if (index == 0) {
-            if (values.size() == maxValues) {
-                throw new IllegalStateException("Maximum number of values reached for " + getName()
-                                + ": " + maxValues);
-            }
+            if (values.size() == maxValues)
+                throw new IllegalStateException("Maximum number of values reached for " + getName() + ": " + maxValues);
+
             values.add(value);
             index = values.size();
             indexMap.put(value, index);
@@ -77,17 +75,15 @@ public final String getString(boolean reverse, IntsRef ref) {
     }
 
     /**
-     * @param value
-     *            the value to be rounded
+     * @param value the value to be rounded
      * @return the value rounded to the highest integer with the same number of leading zeros
      */
     private static int roundUp(int value) {
         return -1 >>> Integer.numberOfLeadingZeros(value);
     }
 
     /**
-     * @param value
-     *            the String to retrieve the index
+     * @param value the String to retrieve the index
      * @return the non-zero index of the String or <i>0</i> if it couldn't be found
      */
     public int indexOf(String value) {

core/src/main/java/com/graphhopper/routing/ev/UnsignedDecimalEncodedValue.java

@@ -66,11 +66,11 @@ public final void setDecimal(boolean reverse, IntsRef ints, double value) {
         }
         if (value == defaultValue)
             value = 0;
-        if (value > maxValue * factor)
+        else if (value > maxValue * factor)
             throw new IllegalArgumentException(getName() + " value " + value + " too large for encoding. maxValue:" + maxValue * factor);
-        if (value < 0)
+        else if (value < 0)
             throw new IllegalArgumentException("Negative value for " + getName() + " not allowed! " + value);
-        if (Double.isNaN(value))
+        else if (Double.isNaN(value))
             throw new IllegalArgumentException("NaN value for " + getName() + " not allowed!");
 
         super.setInt(reverse, ints, toInt(value));
@@ -81,9 +81,7 @@ public final double getDecimal(boolean reverse, IntsRef ref) {
         int value = getInt(reverse, ref);
         if (useMaximumAsInfinity && value == maxValue)
             return Double.POSITIVE_INFINITY;
-        if (value == 0)
-            return defaultValue;
-        return value * factor;
+        return value == 0 ? defaultValue : value * factor;
     }
 
     @Override

core/src/main/java/com/graphhopper/routing/ev/UnsignedIntEncodedValue.java

@@ -112,22 +112,19 @@ final void uncheckedSet(boolean reverse, IntsRef ref, int value) {
             int flags = ref.ints[bwdDataIndex + ref.offset];
             // clear value bits
             flags &= ~bwdMask;
-            value <<= bwdShift;
-            // set value
-            ref.ints[bwdDataIndex + ref.offset] = flags | value;
+            ref.ints[bwdDataIndex + ref.offset] = flags | (value << bwdShift);
         } else {
             int flags = ref.ints[fwdDataIndex + ref.offset];
             flags &= ~fwdMask;
-            value <<= fwdShift;
-            ref.ints[fwdDataIndex + ref.offset] = flags | value;
+            ref.ints[fwdDataIndex + ref.offset] = flags | (value << fwdShift);
         }
     }
 
     @Override
     public final int getInt(boolean reverse, IntsRef ref) {
         int flags;
         // if we do not store both directions ignore reverse == true for convenient reading
-        if (reverse && storeTwoDirections) {
+        if (storeTwoDirections && reverse) {
             flags = ref.ints[bwdDataIndex + ref.offset];
             return (flags & bwdMask) >>> bwdShift;
         } else {
@@ -234,7 +231,7 @@ static int staticHashCode(String... vals) {
 
         return val;
     }
-    
+
     /**
      * Produces a static hashcode for a collection of Strings that is platform independent and still compatible to the default
      * of openjdk.