Changed input so it is always read from file, modified constructors

Author: nicill

.idea/CompressedStacks.cpp.iml

@@ -11,6 +11,7 @@
 #include <vector>
 #include <string>
 #include <memory>
+#include <exception>
 
 /*==============================================================================
   Class      : abstract, template (T context, D datas)
@@ -26,8 +27,9 @@ class Problem{
 
 public:
   // Members functions
-  Problem<T,D>(std::string fileName, int size);
-  Problem<T,D>(std::string fileName, int size, int space, int buffer);
+  Problem<T,D>(std::string fileName);
+  //Problem<T,D>(std::string fileName, int size);
+  //Problem<T,D>(std::string fileName, int size, int space, int buffer);
   virtual ~Problem<T,D>() {}
 
   // Running the stack
@@ -54,6 +56,7 @@ class Problem{
 protected:
   void initStackIntern();
   std::vector<std::string> readLine();
+  std::vector<std::string> readHeader();
   int mIndex;
 
 private:
@@ -80,6 +83,44 @@ class Problem{
   Constructors : with NormalStack or CompressedStack
 ==============================================================================*/
 template <class T, class D>
+Problem<T,D>::Problem(std::string fileName)
+        : mIndex(0)
+        , mContext(nullptr) {
+   mInput.open(fileName, std::ifstream::in);
+
+  std::vector<std::string> parameters=readHeader();
+
+  int n,p,b;
+  bool foundP=false;
+  bool foundBuffer=false;
+
+  for(unsigned int i=0;i<parameters.size();i=i+2)
+  {
+    if(parameters[i].compare("n")==0) n=stoi(parameters[i+1]);
+    if(parameters[i].compare("p")==0)
+    {
+      foundP=true;
+      p=stoi(parameters[i+1]);
+    }
+    if(parameters[i].compare("b")==0)
+    {
+      foundBuffer=true;
+      b=stoi(parameters[i+1]);
+    }
+  }
+
+//  std::cout << "reading all shit n,p,b,foundP,foundBuffer "<<n<<" "<<p<<" "<<b<<" "<<foundP<<" "<<foundBuffer<<std::endl;
+
+  if(foundBuffer&&!foundP)throw("Problem<T,D>::Problem(std::string fileName), wrong header format ");
+  if(!foundP) mStack= std::shared_ptr<Stack<T,D>> (new NormalStack<T,D> (n)); //space not provided, normal stack
+  else // space was provided, compressed stack
+  {
+    if(!foundBuffer) b=0;
+    mStack = std::shared_ptr<Stack<T,D>> (new CompressedStack<T,D> (n, p, b, mContext));
+  }
+}
+
+/*template <class T, class D>
 Problem<T,D>::Problem(std::string fileName, int size)
 : mIndex(0)
 , mContext(nullptr)
@@ -94,7 +135,8 @@ Problem<T,D>::Problem(std::string fileName, int size, int space, int buffer)
   mInput.open(fileName, std::ifstream::in);
   std::streampos position = mInput.tellg();
   mStack = std::shared_ptr<Stack<T,D>> (new CompressedStack<T,D> (size, space, buffer, mContext));
-}
+
+}*/
 
 /*==============================================================================
   IO : toString, print, println
@@ -138,6 +180,25 @@ std::vector<std::string> Problem<T,D>::readLine(){
   return line;
 }
 
+template <class T, class D>
+std::vector<std::string> Problem<T,D>::readHeader(){
+  std::string str;
+  std::vector<std::string> line;
+  size_t pos=std::string::npos;
+
+  getline(mInput,str); // to read the first HEADER LINE
+
+  getline(mInput,str);
+  while (str.compare("/HEADER ")!=0){
+    pos=str.find_first_of(" ");
+    line.push_back(str.substr(0,pos));
+    line.push_back(str.substr(pos+1,str.size()-pos-1));
+    getline(mInput,str);
+
+  }
+  return line;
+}
+
 
 /*==============================================================================
   Stack Functions: run, push, pop, top
@@ -150,7 +211,7 @@ void Problem<T,D>::run(){
     if ( (line.front()== "-1") || (line.front()=="") ) {
       break;
     }
-    D data = readInput(line);
+     D data = readInput(line);
     mIndex++; // Might have to move
     while ( (emptystack()) && (popCondition(data)) ) {
       Data<T,D> elt = pop();
@@ -161,6 +222,7 @@ void Problem<T,D>::run(){
       pushAction(elt);
       push(elt);
     }
+
   }
 }
 

include/problem.hpp

@@ -14,7 +14,10 @@ void createTestInput::createTestInputFiles(int code, string fileName,int n,int p
     srand(time(NULL));
 
     // First write the problem parameters
-    outfile << n << "," << p << endl;
+    outfile << "HEADER " << endl;
+    outfile <<"n "<< n<< endl;
+    outfile <<"p "<< p<< endl;
+    outfile << "/HEADER " << endl;
 
     switch(code){
         case 0  : // push only test

src/createTestInput.cpp

@@ -14,23 +14,28 @@
 ==============================================================================*/
 class Instance: public Problem<int,int>{
 public:
-  Instance(std::string filePath, int size):Problem<int,int>(filePath, size){}
-  Instance(std::string filePath, int size, int space, int buffer):Problem<int,int>(filePath, size, space, buffer){}
+  Instance(std::string filePath):Problem<int,int>(filePath){ }
+/*  Instance(std::string filePath, int size):Problem<int,int>(filePath, size){
+
+  }
+  Instance(std::string filePath, int size, int space, int buffer):Problem<int,int>(filePath, size, space, buffer){
+   }*/
 private:
   // Functions to run the stack
   int readInput(std::vector<std::string> line){
     int value = std::stoi(line[0]);
     setContext(std::stoi(line[1]));
+
     return value;
 
   }
   std::shared_ptr<int> initStack(){
     std::shared_ptr<int> context (new int (10));
-    std::vector<std::string> line = readLine(); // Temporary measure to get rid of the first line
+
     return context;
   }
   bool popCondition(int data){
-    if (getContext() > 0) {
+    if ((getContext() > 0) && !emptystack() ){
       return true;
     }
     return false;
@@ -40,41 +45,69 @@ class Instance: public Problem<int,int>{
   }
   bool pushCondition(int data){
     if (data > 0) {
+
       return true;
     }
     return false;
   }
   void pushAction(Data<int,int> elt){
-    std::cout << "Implement mPushAction for your instance" << std::endl;
+    //std::cout << "Implement mPushAction for your instance" << std::endl;
   }
 };
 
 /*==============================================================================
   Test functions
 ==============================================================================*/
 // Test problem
-void testProblem()
+void testProblem(std::string filePath)
 {
-  std::string filePath = "../instances/pushOnlyInput.csv";
 
   // Test on normal stack
 //  Instance testNS(filePath, 1000);
 //  testNS.run();
 //  testNS.println();
 
   // Test on CompressedStack
-  Instance testCS(filePath, 1000, 3, 0);
-  testCS.println();
+  Instance testCS(filePath);
+//  testCS.println();
   testCS.run();
-  testCS.println();
+
+//  testCS.println();
 }
 
 /*==============================================================================
   Main function
 ==============================================================================*/
 // Main //int main(int argc, char const *argv[]) {
-int main() {
-  testProblem();
+int main(int argc, char *argv[]) {
+
+  // argv[0] is the file name, argv[1] is the code of what is to be done, 0 run the example contained in the file, others are create input: 1 push only, 2 CT, 3 CH
+  createTestInput ct=createTestInput();
+  std::string filename=argv[1];
+
+  switch(atoi(argv[2]))
+  {
+    case 0:
+          testProblem(filename);
+    break;
+    case 1:
+      ct.createTestInputFiles(0,filename,atoi(argv[3]),atoi(argv[4]), atoi(argv[5]), atoi(argv[6]), atof(argv[7]) );
+
+         break;
+    case 2:
+      ct.createTestInputFiles(1,filename,atoi(argv[3]),atoi(argv[4]));
+
+      break;
+    case 3:
+      ct.createTestInputFiles(2,filename,atoi(argv[3]),atoi(argv[4]), atoi(argv[5]), atoi(argv[6]));
+
+     break;
+     default:
+          std::cout << "WRONG PROGRAM CODE";
+          exit(-1);
+      break;
+  }
+
 
 // Intances generation, please comment when not in use
 /*  createTestInput ct=createTestInput();
@@ -83,5 +116,6 @@ int main() {
   ct.createTestInputFiles(2,"/home/yago/code/CompressedStacks.cpp/instances/CHInput.csv",100,3,-1, 11);
 */
 
+
   return 0;
 }