Corrected push and pop

Author: Azzaare

include/buffer.hpp

@@ -119,10 +119,12 @@ void Buffer<T,D>::pop(SPData<T,D> elt){
 ==============================================================================*/
 template <class T, class D>
 std::string Buffer<T,D>::toString(){
-  std::string str;
-  str = "\t\tBuffer size is " + std::to_string(mSize);
-  str += " and start at index " + std::to_string(mStart) + "\n";
-  str += explicitPointerToString(mExplicit);
+  std::string str = "";
+  if (mSize > 0) {
+    str = "\t\tBuffer size is " + std::to_string(mSize);
+    str += " and start at index " + std::to_string(mStart) + "\n";
+    str += "\t\t\t" + explicitPointerToString(mExplicit);
+  }
   return str;
 }
 

include/compare.hpp

@@ -24,15 +24,17 @@ class CompareStacks: public Problem<T,D>{
   void runCompare(int buffer = 0);
 
 private:
-
-    // Stack Functions: defined by user
+  // Stack Functions: defined by user
   virtual D readInput(std::vector<std::string> line) = 0;
   virtual std::shared_ptr<T> initStack() = 0;
   virtual bool popCondition(D data) = 0;
   virtual void popAction(Data<T,D> elt) {};
   virtual bool pushCondition(D data) = 0;
   virtual void pushAction(Data<T,D> elt) {};
 
+  // pop
+  Data<T,D> popCompare();
+
   // Stack: Normal Stack for comparison
   std::shared_ptr<NormalStack<T,D>> mNormalStack;
 };
@@ -50,10 +52,18 @@ CompareStacks<T,D>::CompareStacks(std::string fileName, int size, int space, int
 /*==============================================================================
   Stack Functions: run, push, pop, top
 ==============================================================================*/
+template <class T, class D>
+Data<T,D> CompareStacks<T,D>::popCompare(){
+  std::cout << "Debug CompareStacks::pop 1" << std::endl;
+  return Problem<T,D>::mStack->pop(*this);
+  std::cout << "Debug CompareStacks::pop 2" << std::endl;
+}
+
 template <class T, class D>
 void CompareStacks<T,D>::runCompare(int buffer){
   Problem<T,D>::initStackIntern();
   while ((Problem<T,D>::mInput.good())) {
+    std::streampos position = Problem<T,D>::mInput.tellg();
     for (int i = 1; i <= buffer; i++) {
       bool bIndex = Problem<T,D>::top(i).mIndex == mNormalStack->top(i).mIndex;
       bool bData = Problem<T,D>::top(i).mData == mNormalStack->top(i).mData;
@@ -67,19 +77,28 @@ void CompareStacks<T,D>::runCompare(int buffer){
     }
     D data = readInput(line);
     Problem<T,D>::mIndex++; // Might have to move
+    std::cout << "Debug runCompare 1" << std::endl;
     if (Problem<T,D>::emptystack() != mNormalStack->isempty()) {
       throw "One stack is empty and not the other";
     }
-    while ( !(Problem<T,D>::emptystack()) && (popCondition(data)) ) {
-      Data<T,D> elt = Problem<T,D>::pop();
+    std::cout << "Debug runCompare 2" << std::endl;
+    while ( (!(Problem<T,D>::emptystack())) && (popCondition(data)) ) {
+      std::cout << "Debug runCompare 2.1" << std::endl;
+      Data<T,D> elt = popCompare();
+      std::cout << "Debug runCompare 2.2" << std::endl;
       Data<T,D> eltNormal = mNormalStack->pop();
+        std::cout << "Debug runCompare 2.3" << std::endl;
       bool bIndex = elt.mIndex == eltNormal.mIndex;
       bool bData = elt.mData == eltNormal.mData;
-      if (!bIndex || bData) {
+        std::cout << "Debug runCompare 2.4" << std::endl;
+      if (!bIndex || !bData) {
         throw "The two elements popped are different";
       }
+        std::cout << "Debug runCompare 2.5" << std::endl;
       popAction(elt);
+        std::cout << "Debug runCompare 2.6" << std::endl;
     }
+    std::cout << "Debug runCompare 3" << std::endl;
     if (pushCondition(data)) {
       Data<T,D> elt (Problem<T,D>::mIndex,data);
       pushAction(elt);

include/component.hpp

@@ -41,6 +41,7 @@ class Component{
   bool isempty();
   bool isempty(int lvl);
   bool isExplicitEmpty();
+  bool single(int lvl);
 
   Levels<T,D> mPartial;
   ExplicitPointer<T,D> mExplicit;
@@ -73,8 +74,8 @@ std::string levelsToString(Levels<T,D> levels){
   for (typename Levels<T,D>::iterator it = levels.begin() ; it != levels.end(); ++it)
   {
     index++;
-    str += "\t\t\tLevel" + std::to_string(index) + "->\n";
-    str += "\t\t\t\t" + blockToString(*it) + "\n";
+    str += "\t\t\tLevel " + std::to_string(index) + "   ->";
+    str += " " + blockToString(*it) + "\n";
   }
   return str;
 }
@@ -83,10 +84,10 @@ template <class T, class D>
 std::string Component<T,D>::toString(){
   std::string str;
   str = levelsToString(mPartial);
-  str += "\t\t\tExplicit->\n";
+  str += "\t\t\tExplicit  -> ";
   str += explicitPointerToString(mExplicit);
-  str += "\t\t\tSignature->\n";
-  //str += (&mSign).toString() + "\n";
+  str += "\n\t\t\tSignature -> ";
+  str += mSign.toString() + "\n";
   return str;
 }
 
@@ -142,6 +143,14 @@ int Component<T,D>::topIndex(int lvl){
   }
 }
 
+template <class T, class D>
+bool Component<T,D>::single(int lvl){
+  if (mPartial[lvl].empty()) {
+    return false;
+  }
+  return (mPartial[lvl].back().single());
+}
+
 /*==============================================================================
   Setters
 ==============================================================================*/