Merge branch 'yago' of https://github.com/Azzaare/CompressedStacks.cpp

Author: Azzaare

.idea/CompressedStacks.cpp.iml

@@ -6,8 +6,9 @@
 #include <fstream>
 #include <sstream>
 #include <string>
-
-
+#include "Point2D.h"
+#include <vector>
+#include <algorithm>
 
 #ifndef SMARTSTACK_CREATETESTINPUT_H
 #define SMARTSTACK_CREATETESTINPUT_H

include/createTestInput.hpp

@@ -0,0 +1,78 @@
+//
+// Created by yago on 16/07/05.
+//
+
+#include "Point2D.h"
+
+Point2D::Point2D() {}
+
+Point2D::Point2D(double xi, double yi) {
+    this->x=xi;
+    this->y=yi;
+}
+
+Point2D::Point2D(const Point2D &other) {
+    this->x=other.x;
+    this->y=other.y;
+}
+
+Point2D::~Point2D() {
+}
+
+void Point2D::Set(const double xi, const double yi) {
+    this->x=xi;
+    this->y=yi;
+}
+
+void Point2D::SetX(double xi) {
+    this->x=xi;
+}
+
+void Point2D::SetY(double yi) {
+    this->y=yi;
+}
+
+double Point2D::GetX() const {
+    return x;
+}
+
+double Point2D::GetY() const {
+    return y;
+}
+
+//std::string Point2D::ToString() const {
+//    return std::string("%f",x)
+//}
+
+void Point2D::operator=(const Point2D &other) {
+    x=other.x;
+    y=other.y;
+}
+
+bool Point2D::operator==(const Point2D &other) const {
+    return (x==other.x)&&(y==other.y);
+}
+
+bool Point2D::operator!=(const Point2D &other) const {
+    return !(*this==other);
+}
+
+// x order
+bool Point2D::operator>(const Point2D &other) const {
+    if(x!=other.x )return x>other.x;
+    else return y>other.y;//equal x
+}
+
+bool Point2D::operator < (const Point2D &other) const {
+    //std::cout<<" comparing "<<x<<" and "<<other.x<<" output "<<(x < other.x)<<std::endl;
+    if(x!=other.x ) return x < other.x;
+    else return y<other.y;//equal x
+}
+
+bool Point2D::operator>=(const Point2D &other) const {
+    return (*this==other)||(*this>other);
+}
+
+bool Point2D::operator<=(const Point2D &other) const {
+    return (*this==other)||(*this<other);
+}

src/Point2D.cpp

@@ -0,0 +1,48 @@
+//
+// Created by yago on 16/07/05.
+//
+
+#include <iostream>
+#include<string>
+
+#ifndef SMARTSTACK_POINT2D_H
+#define SMARTSTACK_POINT2D_H
+
+
+class Point2D {
+
+public:
+        double x;
+        double y;
+
+        Point2D();
+        Point2D(double x, double y);
+        // copy constructor
+        Point2D(const Point2D &other);
+
+        ~Point2D();
+
+        void Set(const double x, const double y);
+
+
+        void SetX(double x);
+        void SetY(double y);
+        double GetX() const;
+        double GetY() const;
+
+      //  std::string ToString() const;
+
+        // assignment operator
+        void operator= (const Point2D &other);
+
+        bool operator== (const Point2D &other) const;
+        bool operator!= (const Point2D &other) const;
+        bool operator> (const Point2D &other) const;
+        bool operator< (const Point2D &other) const;
+        bool operator>= (const Point2D &other) const;
+        bool operator<= (const Point2D &other) const;
+
+};
+
+
+#endif //SMARTSTACK_POINT2D_H

src/Point2D.h

@@ -13,11 +13,12 @@ void createTestInput::createTestInputFiles(int code, string fileName,int n,int p
     ofstream outfile (fileName.c_str());
     srand(time(NULL));
 
+    // First write the problem parameters
+    outfile << n << "," << p << endl;
+
     switch(code){
         case 0  : // push only test
         {
-            // First write the problem parameters
-            outfile << n << "," << p << endl;
             // now create the actual file
             // pairs of elements (x,0 means push ) (0,1) means pop one (-1,-1) means pop the rest of the stack
 
@@ -42,13 +43,10 @@ void createTestInput::createTestInputFiles(int code, string fileName,int n,int p
                 i++;
             }
             outfile << -1 << "," << -1 << endl;
-            break; //optional
+            break;
         }
         case 1 :
         {
-            // First write the problem parameters
-            outfile << n << "," << p << endl;
-
             // now create the actual file
             // pairs of elements (x,0 means push ) (0,y) means pop y times (-1,-1) means pop the rest of the stack
 
@@ -82,11 +80,54 @@ void createTestInput::createTestInputFiles(int code, string fileName,int n,int p
                 outfile << number << "," << numPops << endl;
                 i++;
             }
+            break;
+        }
+        case 2 :
+        {
+            // now create the actual file
+            // pairs of elements (x,0 means push ) (0,1) means pop one (-1,-1) means pop the rest of the stack
 
-            outfile << -1 << "," << -1 << endl;
-            break; //optional
+            std::vector<Point2D>  pointsToSort = vector<Point2D>();
+
+            int i = 0;
+            while (i < n) {
+
+                // create output for the convex hull problem.
+                // in this case, max and min stand for the maximum and minimum values of x and y
+                // generate a random point in the (min,max)2 range
+
+                double randomx = (double) rand() / RAND_MAX;
+                randomx=min+(max-min)*randomx;
+                double randomy = (double) rand() / RAND_MAX;
+                randomy=min+(max-min)*randomy;
+
+          //      cout<<"generated point "<<randomx<<" "<<randomy<<" "<<pointsToSort.size()<<endl;
+
+                pointsToSort.push_back(Point2D(randomx,randomy));
+                i++;
+            }
+
+
+            //sort the vector
+            std::sort(pointsToSort.begin(),pointsToSort.end());
+
+
+
+            // add first the point (min,min)
+            outfile << min << "," << min << endl;
+
+            // add the sorted points
+            for(int i=0;i<pointsToSort.size();i++)
+            {
+                outfile << pointsToSort[i].GetX() << "," << pointsToSort[i].GetY() << endl;
+            }
+
+            // add finally (max,min)
+            outfile << max << "," << min << endl;
+
+            break;
         }
-        default : //Optional
+            default : //Optional
         {throw (" createTestInput::createTestInputFiles WRONG CODE ");}
     }
 

src/createTestInput.cpp

@@ -114,18 +114,14 @@ void testProblem()
 }
 
 // Main
-int main(int argc, char const *argv[]) {
-// Test of different classes composing the stacks
-//  testSign();
-//  testData();
-//  testNormalStack();
-//  testCompressedStack();
+int main() {
   testProblem();
 
 // Intances generation, please comment when not in use
 /*  createTestInput ct=createTestInput();
-  ct.createTestInputFiles(0,"../instances/pushOnlyInput.csv",1000,3, 5, 100, 0.2 );
-  ct.createTestInputFiles(1,"../instances/CTInput.csv",1000,3);
+  ct.createTestInputFiles(0,"/home/yago/code/CompressedStacks.cpp/instances/pushOnlyInput.csv",1000,3, 5, 100, 0.2 );
+  ct.createTestInputFiles(1,"/home/yago/code/CompressedStacks.cpp/instances/CTInput.csv",1000,3);
+  ct.createTestInputFiles(2,"/home/yago/code/CompressedStacks.cpp/instances/CHInput.csv",100,3,-1, 11);
 */
 
   return 0;