Another test

lemire · lemire · commit db83ebc98364 · 2014-09-19T13:36:10.000-04:00
diff --git a/src/main/java/me/lemire/integercompression/CopyOfFastPFOR.java b/src/main/java/me/lemire/integercompression/CopyOfFastPFOR.java
diff --git a/src/main/java/me/lemire/integercompression/FastPFOR.java b/src/main/java/me/lemire/integercompression/FastPFOR.java
@@ -204,10 +204,6 @@ private void encodePage(int[] in, IntWrapper inpos, int thissize,
                                 }
                                 int overflow = j - dataPointers[k];
                                 tmpoutpos -= overflow * k / 32;
-                                //int leftover = dataPointers[k] % 32;
-                                //if(leftover > 0) {
-                                //    tmpoutpos =  Util.pack(out, tmpoutpos, dataTobePacked[k], j, leftover, k);
-                                //}
                         }
                 }
                 outpos.set(tmpoutpos);
@@ -266,11 +262,6 @@ private void decodePage(int[] in, IntWrapper inpos, int[] out,
                                 }
                                 int overflow = j - size;
                                 inexcept -= overflow * k / 32;
-
-                                //int leftover = size % 32;
-                                //if(size > 0)
-                                //    inexcept = Util.unpack(in, inexcept, dataTobePacked[k], j, leftover, k);
-
                         }
                 }
                 Arrays.fill(dataPointers, 0);
diff --git a/src/main/java/me/lemire/integercompression/benchmarktools/BenchmarkSkippable.java b/src/main/java/me/lemire/integercompression/benchmarktools/BenchmarkSkippable.java
@@ -292,7 +292,7 @@ private static int[][] generateTestData(ClusteredDataGenerator dataGen,
 
     static Object[] codecs = {
         new SkippableComposition(new FastPFOR(), new VariableByte()),
-        new SkippableComposition(new CopyOfFastPFOR(), new VariableByte()),
+        new SkippableComposition(new OptPFD(), new VariableByte()),
         /*
             new SkippableIntegratedComposition(new IntegratedBinaryPacking(),
                     new IntegratedVariableByte()), new JustCopy(), new VariableByte(),

Original file line number	Diff line number	Diff line change
`@@ -204,10 +204,6 @@ private void encodePage(int[] in, IntWrapper inpos, int thissize,`
`204`	`204`	`}`
`205`	`205`	`int overflow = j - dataPointers[k];`
`206`	`206`	`tmpoutpos -= overflow * k / 32;`
`207`		`- //int leftover = dataPointers[k] % 32;`
`208`		`- //if(leftover > 0) {`
`209`		`- // tmpoutpos = Util.pack(out, tmpoutpos, dataTobePacked[k], j, leftover, k);`
`210`		`- //}`
`211`	`207`	`}`
`212`	`208`	`}`
`213`	`209`	`outpos.set(tmpoutpos);`
`@@ -266,11 +262,6 @@ private void decodePage(int[] in, IntWrapper inpos, int[] out,`
`266`	`262`	`}`
`267`	`263`	`int overflow = j - size;`
`268`	`264`	`inexcept -= overflow * k / 32;`
`269`		`-`
`270`		`- //int leftover = size % 32;`
`271`		`- //if(size > 0)`
`272`		`- // inexcept = Util.unpack(in, inexcept, dataTobePacked[k], j, leftover, k);`
`273`		`-`
`274`	`265`	`}`
`275`	`266`	`}`
`276`	`267`	`Arrays.fill(dataPointers, 0);`