brush up

koron · koron · commit 6fc27d83fc73 · 2013-09-27T16:20:23.000+09:00
diff --git a/src/main/java/me/lemire/integercompression/DeltaZigzagBinaryPacking.java b/src/main/java/me/lemire/integercompression/DeltaZigzagBinaryPacking.java
@@ -65,15 +65,11 @@ public void uncompress(
         int op = outPos.get();
         final int outPosLast = op + outLen;
         for (; op < outPosLast; op += BLOCK_LENGTH) {
-            final int bits1 = (inBuf[ip] >>> 24);
-            final int bits2 = (inBuf[ip] >>> 16) & 0xFF;
-            final int bits3 = (inBuf[ip] >>>  8) & 0xFF;
-            final int bits4 = (inBuf[ip] >>>  0) & 0xFF;
-            ++ip;
-            ip += unpack(inBuf, ip, work,  0, bits1);
-            ip += unpack(inBuf, ip, work, 32, bits2);
-            ip += unpack(inBuf, ip, work, 64, bits3);
-            ip += unpack(inBuf, ip, work, 96, bits4);
+            int n = inBuf[ip++];
+            ip += unpack(inBuf, ip, work,  0, (n >> 24) & 0x3F);
+            ip += unpack(inBuf, ip, work, 32, (n >> 16) & 0x3F);
+            ip += unpack(inBuf, ip, work, 64, (n >>  8) & 0x3F);
+            ip += unpack(inBuf, ip, work, 96, (n >>  0) & 0x3F);
             ctx.decodeArray(work, 0, BLOCK_LENGTH, outBuf, op);
         }
 
diff --git a/src/main/java/me/lemire/integercompression/DeltaZigzagEncoding.java b/src/main/java/me/lemire/integercompression/DeltaZigzagEncoding.java
@@ -40,7 +40,10 @@ public int encodeInt(int value) {
         public int[] encodeArray(int[] src, int srcoff, int length,
                 int[] dst, int dstoff)
         {
-            return encodeArray1(src, srcoff, length, dst, dstoff);
+            for (int i = 0; i < length; ++i) {
+                dst[dstoff + i] = encodeInt(src[srcoff + i]);
+            }
+            return dst;
         }
 
         public int[] encodeArray(int[] src, int srcoff, int length,
@@ -56,28 +59,6 @@ public int[] encodeArray(int[] src, int offset, int length) {
         public int[] encodeArray(int[] src) {
             return encodeArray(src, 0, src.length, new int[src.length], 0);
         }
-
-        private int[] encodeArray1(int[] src, int srcoff, int length,
-                int[] dst, int dstoff)
-        {
-            for (int i = 0; i < length; ++i) {
-                dst[dstoff + i] = encodeInt(src[srcoff + i]);
-            }
-            return dst;
-        }
-
-        private int[] encodeArray2(int[] src, int srcoff, int length,
-                int[] dst, int dstoff)
-        {
-            int ctx = this.contextValue;
-            for (int i = 0; i < length; ++i) {
-                int n = src[srcoff + i] - ctx;
-                ctx = src[srcoff + i];
-                dst[dstoff + i] = (n << 1) ^ (n >> 31);
-            }
-            this.contextValue = ctx;
-            return dst;
-        }
     }
 
     public static class Decoder extends Context {
