Solved end of file problem + reconstruction

Author: Azzaare

include/compressedStack.hpp

@@ -368,7 +368,7 @@ void CompressedStack<T,D>::pushExplicit(SPData<T,D> elt){
       mFirst.mSign.mLast = index;
     } else {
       if ((mDepth == 1) && (!(mSecond.isExplicitEmpty()))) {
-        int distCompressed = mSpace*mSpace;
+        int distCompressed = mSpace;
         int startCompressed = headIndex - (headIndex - 1) % distCompressed;
         if (index - startCompressed < distCompressed) {
           mCompressed.back().mLast = headIndex;
@@ -414,7 +414,7 @@ void CompressedStack<T,D>::pushCompressed(SPData<T,D> elt, int lvl, int headInde
       }
     } else {
       if (lvl == 0 && (!mSecond.mPartial[0].empty())) {
-        int distCompressed = std::pow(mSpace, mDepth + 1);
+        int distCompressed = std::pow(mSpace, mDepth);
         int startCompressed = headIndex - (headIndex - 1) % distCompressed;
         int gamma = index - startCompressed;
         if (gamma < distCompressed && !mCompressed.empty()) {
@@ -458,11 +458,16 @@ void CompressedStack<T,D>::reconstruct(Problem<T,D> &problem){
 // Reconstruct an auxiliary stack based on the signature found above
 template <class T, class D>
 void CompressedStack<T,D>::reconstruct(Problem<T,D> &problem, const Signature<T,D> &sign, int lvl){
+  Signature<T,D> sign2 = sign;
+  std::cout << "Reconstruct on " << sign2.toString() << std::endl;
+
   std::streampos posReminder = problem.mInput.tellg();
   int indexReminder = problem.mIndex;
+  std::ios_base::iostate eofbitReminder = problem.mInput.rdstate();
 
   problem.mContext = std::make_shared<T>(*sign.mContext);
   problem.mIndex = sign.mFirst - 1;
+  problem.mInput.clear();
   problem.mInput.seekg(sign.mPosition);
 
   int auxSize = std::pow(mSpace, mDepth - lvl + 1);
@@ -490,13 +495,14 @@ void CompressedStack<T,D>::reconstruct(Problem<T,D> &problem, const Signature<T,
   problem.mIndex = indexReminder;
   problem.mInput.seekg(posReminder);
   problem.mContext = mContext;
+  problem.mInput.setstate(eofbitReminder);
 }
 
 template <class T, class D>
 void CompressedStack<T,D>::copyContent(CompressedStack<T,D> &stack) {
   stack.mFirst = mFirst;
   stack.mSecond = mSecond;
-  stack.mCompressed = mCompressed;
+  stack.mCompressed.pop_back();
   stack.mBuffer = mBuffer;
 }
 
@@ -570,6 +576,10 @@ template <class T, class D>
 void CompressedStack<T,D>::propagateFirst(int index, int lvl){
   for (int i = 0; i <= lvl; i++) {
     int temp = std::min(mFirst.mPartial[i].back().mLast, index);
+    if (temp < mFirst.mPartial[i].back().mFirst) {
+      std::cout << "Debug Prop1" << std::endl << toString() << std::endl;
+      exit(0);
+    }
     mFirst.mPartial[i].back().mLast = temp;
   }
 }
@@ -635,12 +645,15 @@ Data<T,D> CompressedStack<T,D>::pop(Problem<T,D> &problem){
   SPData<T,D> elt;
   if (mFirst.mExplicit.empty() && mSecond.mExplicit.empty()) {
     // Reconstruct the compressed stack with the first available signature
+    std::cout << "Begin reconstruct with mDepth = " << mDepth << std::endl;
     reconstruct(problem);
+    std::cout << "End reconstruct with mDepth = " << mDepth << std::endl;
   }
   if (mFirst.mExplicit.empty()) {
     if (mSecond.mExplicit.empty()) {
+      std::cout << "Empty after reconstruct" << std::endl;
       problem.println();
-//      exit(0);
+      exit(0);
     }
     elt = mSecond.mExplicit.back();
     popSecond((*elt).mIndex);

include/problem.hpp

@@ -214,7 +214,7 @@ void Problem<T,D>::run(){
     std::streampos position = mInput.tellg();
     (*mStack).setPosition(position);
     std::vector<std::string> line = readLine();
-    if ( (line.front()== "-1") || (line.front()=="") ) {
+    if (line.front()=="") {
       break;
     }
      D data = readInput(line);
@@ -228,20 +228,17 @@ void Problem<T,D>::run(){
       pushAction(elt);
       push(elt);
     }
-
   }
 }
 
 template <class T, class D>
 void Problem<T,D>::run(int limit){
   int testIndex = mIndex;
-  while (mInput.good() && (mIndex < limit)) {
+  while (mInput.good() && mIndex < limit) {
     std::streampos position = mInput.tellg();
     (*mStack).setPosition(position);
     std::vector<std::string> line = readLine();
-    if ( (line.front()== "-1") || (line.front()=="") ) {
-      break;
-    }
+
     D data = readInput(line);
     mIndex++; // Might have to move
 

src/main.cpp

@@ -36,6 +36,7 @@ class Instance: public Problem<int,int>{
   }
   void popAction(Data<int,int> elt){
     std::cout << elt.toString() << " <<<< Pop!" << std::endl;
+    println();
     setContext(getContext() - 1);
   }
   bool pushCondition(int data){
@@ -46,6 +47,7 @@ class Instance: public Problem<int,int>{
   }
   void pushAction(Data<int,int> elt){
     std::cout << "Push >>>> " << elt.toString() << std::endl;
+    println();
   }
 };
 
@@ -94,13 +96,16 @@ class Comparison: public CompareStacks<int,int>{
 void testProblem(std::string filePath)
 {
   // Test on normal stack
-  Instance testNS(filePath);
-  testNS.run();
-  testNS.println();
+//  Instance testNS(filePath);
+//  testNS.run();
+//  testNS.println();
 
   // Test on CompressedStack
+  std::cout << "Debug testProblem 1" << std::endl;
   Instance testCS(filePath);
+  std::cout << "Debug testProblem 2" << std::endl;
   testCS.run();
+  std::cout << "Debug testProblem 3" << std::endl;
   testCS.println();
 }
 
@@ -123,7 +128,7 @@ int main(int argc, char *argv[]) {
   {
     case 0:
           testProblem(filename);
-          testCompare(filename);
+//          testCompare(filename);
     break;
     case 1:
       ct.createTestInputFiles(0,filename,atoi(argv[3]),atoi(argv[4]), atoi(argv[5]), atoi(argv[6]), atof(argv[7]) );