Short explanation on the cmake in build/cmakereadme.txt. Print functions in the Problem class

Author: Azzaare

build/cmakereadme.txt

@@ -0,0 +1,18 @@
+Commands to use with cmake in the current folder
+
+# For linking new files (or unlink removed files)
+cmake ..
+
+# To create debugger executable
+cmake -DCMAKE_BUILD_TYPE=Debug ..
+
+# For compilation (normal and debug)
+make
+
+# To clean
+make clean
+
+# To run gdb
+gdb
+file ./smartstack
+run

build/smartstack

@@ -68,7 +68,7 @@ std::string CompressedStack<T,D>::toString()
   str += "\t\tSecond Component\n";
   str += mSecond.toString();
   str += "\t\tFully Compressed\n";
-  str += toString();
+  str += blockToString(mCompressed);
   return str;
 }
 

include/compressedStack.hpp

@@ -79,7 +79,7 @@ std::string explicitToString(Explicit<D> xplicit)
   str = "{";
   for (typename Explicit<D>::iterator it = xplicit.begin() ; it != xplicit.end(); ++it)
     str += (*it).toString() + ",";
-  str.back() = ')';
+  str.back() = '}';
   return str;
 }
 

include/data.hpp

@@ -17,6 +17,7 @@ class NormalStack: public Stack<D>
   Data<D> top(int k);
 
   // IO
+  std::string toString();
   void print();
   void println();
 
@@ -57,9 +58,16 @@ template <class D>
 
 /** IO **/
 template <class D>
+std::string NormalStack<D>::toString()
+{
+  std::string str;
+  str = "\tNormal Stack (Explicit Datas)\n\t\t";
+  return str;
+}
+template <class D>
 void NormalStack<D>::print()
 {
-  std::cout << "\tNormal Stack (Explicit Datas)\n\t\t";
+  std::cout << this->toString();
   printExplicit(mDatas);
 }
 template <class D>

include/normalStack.hpp

@@ -21,21 +21,28 @@ class Problem
   void run();
 
   // Setters
-  void setInitStack(void (*functionPointer)());
   void setReadInput(D (*functionPointer)());
+  void setInitStack(void (*functionPointer)());
   void setPopCondition(bool (*functionPointer)());
   void setPopAction(void (*functionPointer)());
   void setPushCondition(bool (*functionPointer)());
   void setPushAction(void (*functionPointer)());
 
+  void setOutput(std::string fileName);
+
+  // IO
+  std::string toString();
+  void print();
+  void println();
+
 private:
   // Input/Ouput
   std::ifstream* mInput;
   std::ofstream* mOutput; // output file is optional
 
   // Stack Functions: defined by user
-  void (*mInitStack)();
   D    (*mReadInput)();
+  void (*mInitStack)();
   bool (*mPopCondition)();
   void (*mPopAction)();
   bool (*mPushCondition)();
@@ -68,6 +75,7 @@ Problem<T,D>::Problem(std::string fileName, int size)
   mContext = nullptr;
   mIndex = 0;
 
+
   mStack = new NormalStack<T> (size);
 }
 
@@ -76,7 +84,7 @@ Problem<T,D>::Problem(std::string fileName, int size, int space)
 {
   std::ifstream ifstr;
   ifstr.open(fileName, std::ifstream::in);
-  mInput = ifstr;
+  mInput = &ifstr;
   mOutput = nullptr;
 
   mInitStack = nullptr;
@@ -92,6 +100,29 @@ Problem<T,D>::Problem(std::string fileName, int size, int space)
   mStack = new CompressedStack<T,D> (size, space);
 }
 
+/** IO **/
+template <class T, class D>
+std::string Problem<T,D>::toString(){
+  std::string str;
+  str = "Problem with an actual index of " + std::to_string(mIndex);
+  str += ", with a stack of type\n";
+  str += (*mStack).toString();
+  return str;
+}
+
+template <class T, class D>
+void Problem<T,D>::print()
+{
+  std::cout << this->toString();
+}
+
+template <class T, class D>
+void Problem<T,D>::println()
+{
+  this->print();
+  std::cout << std::endl;
+}
+
 /** Running the stack **/
 template <class T, class D>
 void Problem<T,D>::run() {
@@ -106,4 +137,37 @@ void Problem<T,D>::run() {
   }
 }
 
+/** Setters **/
+template <class T, class D>
+void Problem<T,D>::setReadInput(D (*functionPointer)()){
+  mReadInput = functionPointer;
+}
+template <class T, class D>
+void Problem<T,D>::setInitStack(void (*functionPointer)()){
+  mInitStack = functionPointer;
+}
+template <class T, class D>
+void Problem<T,D>::setPopAction(void (*functionPointer)()){
+  mPopAction = functionPointer;
+}
+template <class T, class D>
+void Problem<T,D>::setPopCondition(bool (*functionPointer)()){
+  mPopConditon = functionPointer;
+}
+template <class T, class D>
+void Problem<T,D>::setPushAction(void (*functionPointer)()){
+  mPushAction = functionPointer;
+}
+template <class T, class D>
+void Problem<T,D>::setPushCondition(bool (*functionPointer)()){
+  mPushConditon = functionPointer;
+}
+
+template <class T, class D>
+void Problem<T,D>::setOutput(std::string fileName){
+  std::ofstream ofstr;
+  ofstr.open(fileName, std::ofstream::out);
+  mOutput = &ofstr;
+}
+
 #endif /* PROBLEM */

include/problem.hpp

@@ -14,6 +14,7 @@ class Stack
   virtual Data<D> top(int k) = 0;
 
   // IO
+  virtual std::string toString() = 0;
   virtual void print() = 0;
   virtual void println() = 0;
 };