Add ROLZXCodec to tests.

Author: flanglet

src/function/ROLZCodec.hpp

@@ -32,7 +32,6 @@ namespace kanzi {
    class ROLZEncoder {
    private:
        static const uint64 TOP = 0x00FFFFFFFFFFFFFF;
-       static const uint64 MASK_0_24 = 0x0000000000FFFFFF;
        static const uint64 MASK_0_32 = 0x00000000FFFFFFFF;
        static const int MATCH_FLAG = 0;
        static const int LITERAL_FLAG = 1;
@@ -253,7 +252,7 @@ namespace kanzi {
 
    inline void ROLZEncoder::encodeBit(int bit)
    {
-       const uint64 split = ((_high - _low) >> 4) * uint64((_probs[_pIdx][_ctx + _c1]) >> 4) >> 8;
+       const uint64 split = ((_high - _low) >> 4) * uint64(_probs[_pIdx][_ctx + _c1] >> 4) >> 8;
 
        // Update fields with new interval bounds
        if (bit == 0) {
@@ -278,7 +277,7 @@ namespace kanzi {
 
    inline int ROLZDecoder::decodeBit()
    {
-       const uint64 mid = _low + (((_high - _low) >> 4) * uint64((_probs[_pIdx][_ctx + _c1]) >> 4) >> 8);
+       const uint64 mid = _low + (((_high - _low) >> 4) * uint64(_probs[_pIdx][_ctx + _c1] >> 4) >> 8);
        int bit;
 
        // Update bounds and predictor

src/test/TestFunctions.cpp

@@ -47,6 +47,12 @@ static Function<byte>* getByteFunction(string name)
     if (name.compare("ROLZ") == 0)
         return new ROLZCodec();
 
+    if (name.compare("ROLZX") == 0) {
+        Context ctx;
+        ctx.putString("transform", "ROLZX");
+        return new ROLZCodec(ctx);
+    }
+
     cout << "No such byte function: " << name << endl;
     return nullptr;
 }
@@ -67,7 +73,6 @@ int testFunctionsCorrectness(const string& name)
         byte values[80000];
 
         if (ii == 0) {
-           size = 15;
             byte arr[] = {
                 (byte)0, (byte)1, (byte)2, (byte)2, (byte)2, (byte)2, (byte)7, (byte)9,
                 (byte)9, (byte)16, (byte)16, (byte)16, (byte)1, (byte)3, (byte)3, (byte)3,
@@ -203,7 +208,7 @@ int testFunctionsCorrectness(const string& name)
         }
 
         if (f->forward(iba1, iba2, size) == false) {
-            if (iba1._index != size) {
+            if ((iba1._index != size) || (iba2._index >= iba1._index)) {
                 cout << endl
                      << "No compression (ratio > 1.0), skip reverse" << endl;
                 continue;
@@ -330,7 +335,12 @@ int testFunctionsSpeed(const string& name)
             before = clock();
 
             if (f->forward(iba1, iba2, size) == false) {
-                // ZRLT may fail if the input data has too few 0s
+                if ((iba1._index != size) || (iba2._index >= iba1._index)) {
+                   cout << endl
+                        << "No compression (ratio > 1.0), skip reverse" << endl;
+                   continue;
+                }
+
                 cout << "Encoding error" << endl;
                 delete f;
                 continue;