Code save for 3 weeks travel

Author: Azzaare

build/smartstack

@@ -11,7 +11,6 @@ template <class T, class D>
 class Component
 {
 public:
-  Component<T,D>();
   Component<T,D>(int space, int depth);
 
   // Setters
@@ -30,12 +29,6 @@ class Component
 };
 
 /** Constructors **/
-template <class T, class D>
-Component<T,D>::Component()
-{
-  std::cout << "Using default constructor for Component" << std::endl;
-}
-
 template <class T, class D>
 Component<T,D>::Component(int space, int depth)
 {

include/component.hpp

@@ -10,7 +10,7 @@
 
 /* Compressed Stack itself */
 template <class T, class D>
-class CompressedStack:Stack<D>
+class CompressedStack: public Stack<D>
 {
 public:
   CompressedStack<T,D>(int size, int space);
@@ -43,16 +43,16 @@ class CompressedStack:Stack<D>
 /** Constructors **/
 template <class T, class D>
 CompressedStack<T,D>::CompressedStack(int size, int space)
+: mFirst(size,space)
+, mSecond(size,space)
 {
-   mSize = size;
-   mSpace = space;
-   mDepth = (int) ceil(log(size)/log(space)-.1); // - 1;
+  mSize = size;
+  mSpace = space;
+  mDepth = (int) ceil(log(size)/log(space)-.1); // - 1;
 
-   mPosition = 0;
+  mPosition = 0;
 
-   mFirst = Component<T,D>(mSpace, mDepth);
-   mSecond = Component<T,D>(mSpace, mDepth);
-   mCompressed = initBlock<T>(mSpace);
+  mCompressed = initBlock<T>(mSpace);
 }
 
 /** IO **/
@@ -95,13 +95,15 @@ void CompressedStack<T,D>::push(Data<D> data)
 template <class T, class D>
 Data<D> CompressedStack<T,D>::pop()
 {
-
+  Data<D> d (1,1);
+  return d;
 }
 
 template <class T, class D>
 Data<D> CompressedStack<T,D>::top(int k)
 {
-
+  Data<D> d (1,1);
+  return d;
 }
 
 #endif /* COMPRESSEDSTACK */

include/compressedStack.hpp

@@ -5,7 +5,7 @@
 #include "stack.hpp"
 
 template <class D>
-class NormalStack:Stack<D>
+class NormalStack: public Stack<D>
 {
 public:
   // Constructors

include/normalStack.hpp

@@ -3,6 +3,8 @@
 
 /**** Problem : declaration ****/
 #include "stack.hpp"
+#include "compressedStack.hpp"
+#include "normalStack.hpp"
 #include <stdbool.h>
 #include <fstream>
 #include <string>
@@ -11,15 +13,24 @@ template <class T, class D>
 class Problem
 {
 public:
-  Problem<T,D>(std::string fileName);
+  // Problem<T,D>(std::string fileName);
+  Problem<T,D>(std::string fileName, int size);
+  Problem<T,D>(std::string fileName, int size, int space);
 
-  // Functions of the problem
-  //void init();
-  //D read();
+  // Running the stack
+  void run();
+
+  // Setters
+  void setInitStack(void (*functionPointer)());
+  void setReadInput(D (*functionPointer)());
+  void setPopCondition(bool (*functionPointer)());
+  void setPopAction(void (*functionPointer)());
+  void setPushCondition(bool (*functionPointer)());
+  void setPushAction(void (*functionPointer)());
 
 private:
   // Input/Ouput
-  std::ifstream mInput;
+  std::ifstream* mInput;
   std::ofstream* mOutput; // output file is optional
 
   // Stack Functions: defined by user
@@ -35,7 +46,64 @@ class Problem
   int mIndex;
 
   // Stack: Normal or Compressed
-  Stack<D> mStack;
+  Stack<D>* mStack;
 };
 
+/** Constructors **/
+template <class T, class D>
+Problem<T,D>::Problem(std::string fileName, int size)
+{
+  std::ifstream ifstr;
+  ifstr.open(fileName, std::ifstream::in);
+  mInput = &ifstr;
+  mOutput = nullptr;
+
+  mInitStack = nullptr;
+  mReadInput = nullptr;
+  mPopCondition = nullptr;
+  mPopAction = nullptr;
+  mPushCondition = nullptr;
+  mPushAction = nullptr;
+
+  mContext = nullptr;
+  mIndex = 0;
+
+  mStack = new NormalStack<T> (size);
+}
+
+template <class T, class D>
+Problem<T,D>::Problem(std::string fileName, int size, int space)
+{
+  std::ifstream ifstr;
+  ifstr.open(fileName, std::ifstream::in);
+  mInput = ifstr;
+  mOutput = nullptr;
+
+  mInitStack = nullptr;
+  mReadInput = nullptr;
+  mPopCondition = nullptr;
+  mPopAction = nullptr;
+  mPushCondition = nullptr;
+  mPushAction = nullptr;
+
+  mContext = nullptr;
+  mIndex = 0;
+
+  mStack = new CompressedStack<T,D> (size, space);
+}
+
+/** Running the stack **/
+template <class T, class D>
+void Problem<T,D>::run() {
+  while (true) {
+    D elt = mInput();
+    while (true && mPopConditon(elt)) {
+      (*mStack).pop();
+    }
+    if (mPushCondition()) {
+      (*mStack).push(elt);
+    }
+  }
+}
+
 #endif /* PROBLEM */

include/problem.hpp

@@ -3,6 +3,8 @@
 #include "../include/data.hpp"
 #include "../include/normalStack.hpp"
 #include "../include/compressedStack.hpp"
+#include "../include/problem.hpp"
+#include <string>
 
 // Test Signature
 void testSign()
@@ -52,7 +54,16 @@ void testCompressedStack()
   Block<int> block = initBlock<int>(5);
   Levels<int> lvls = initLevels<int>(3, 3);
   Component<int, int> comp(3,5);
-  CompressedStack<int, int> stack = CompressedStack<int, int>(81,3);
+  CompressedStack<int, int> stack (81,3);
+}
+
+// Test problem
+void testProblem()
+{
+  std::string filePath = "../instances/test.csv";
+  Problem<int, int> problem (filePath, 5);
+
+
 }
 
 // Main