Off by 1 bug

diff --git a/src/ASTAnalyses/Encoding/encodinggraph.cc b/src/ASTAnalyses/Encoding/encodinggraph.cc
index abbaf29fbcf41745eb8f055ffac8ff5cdfb45f45..5416ed0e2d7778444bff22640de8f127dd6ef187 100644 (file)
--- a/src/ASTAnalyses/Encoding/encodinggraph.cc
+++ b/src/ASTAnalyses/Encoding/encodinggraph.cc
@@ -73,12 +73,15 @@ void EncodingGraph::encode() {
                                        EncodingSubGraph *subgraph = graphMap.get(n);
                                        if (subgraph == NULL)
                                                continue;
                                        EncodingSubGraph *subgraph = graphMap.get(n);
                                        if (subgraph == NULL)
                                                continue;

-                                       uint encodingSize = subgraph->getEncodingSize(n);
+                                       uint encodingSize = subgraph->getEncodingMaxVal(n)+1;

                                        uint paddedSize = encoding->getSizeEncodingArray(encodingSize);
                                        uint paddedSize = encoding->getSizeEncodingArray(encodingSize);

+                                       model_print("encoding size=%u\n", encodingSize);
+                                       model_print("padded=%u\n", paddedSize);

                                        encoding->allocInUseArrayElement(paddedSize);
                                        encoding->allocEncodingArrayElement(paddedSize);
                                        Set *s = e->getRange();
                                        for (uint i = 0; i < s->getSize(); i++) {
                                        encoding->allocInUseArrayElement(paddedSize);
                                        encoding->allocEncodingArrayElement(paddedSize);
                                        Set *s = e->getRange();
                                        for (uint i = 0; i < s->getSize(); i++) {

+                                               model_print("index=%u\n", i);

                                                uint64_t value = s->getElement(i);
                                                uint encodingIndex = subgraph->getEncoding(n, value);
                                                encoding->setInUseElement(encodingIndex);
                                                uint64_t value = s->getElement(i);
                                                uint encodingIndex = subgraph->getEncoding(n, value);
                                                encoding->setInUseElement(encodingIndex);

diff --git a/src/ASTAnalyses/Encoding/subgraph.h b/src/ASTAnalyses/Encoding/subgraph.h
index 36f19021eb60751edcacec31c54ed98f17ae2aa0..c9aaa0cd6d63813aaf90f6619e58ad12b0953193 100644 (file)
--- a/src/ASTAnalyses/Encoding/subgraph.h
+++ b/src/ASTAnalyses/Encoding/subgraph.h
@@ -41,7 +41,7 @@ public:
        SetIteratorEncodingNode *nodeIterator();
        void encode();
        uint getEncoding(EncodingNode *n, uint64_t val);
        SetIteratorEncodingNode *nodeIterator();
        void encode();
        uint getEncoding(EncodingNode *n, uint64_t val);

-       uint getEncodingSize(EncodingNode *n) { return maxEncodingVal;}
+       uint getEncodingMaxVal(EncodingNode *n) { return maxEncodingVal;}

 
        CMEMALLOC;
 private:
 
        CMEMALLOC;
 private:

diff --git a/src/Encoders/elementencoding.cc b/src/Encoders/elementencoding.cc
index da6efd19154b0f1f3075114151e426923bc46fe9..19439dc426e88933e13a4561d878398316611cc8 100644 (file)
--- a/src/Encoders/elementencoding.cc
+++ b/src/Encoders/elementencoding.cc
@@ -57,7 +57,7 @@ void ElementEncoding::print() {
        if (type == BINARYINDEX) {
                for (uint i = 0; i < encArraySize; i++) {
                        if (i != 0)
        if (type == BINARYINDEX) {
                for (uint i = 0; i < encArraySize; i++) {
                        if (i != 0)

-                               model_print(" ,");
+                               model_print(", ");

                        if (isinUseElement(i))
                                model_print("%" PRIu64 "", encodingArray[i]);
                        else
                        if (isinUseElement(i))
                                model_print("%" PRIu64 "", encodingArray[i]);
                        else