Group2 november

README.md

@@ -5,6 +5,17 @@ Spatial database course extension to PostGRES
 Currently the build builds all the implementation files and builds postgres_ext.cpp file which includes all interfaces.
 
 ```bash
+# Get the repo and setup GMP
+git clone [URL]
+cd PostGRES_ext
+wget https://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz
+tar -xf gmp-6.1.2.tar.xz
+cd gmp-6.1.2
+./configure --prefix=$HOME/.local --enable-cxx
+make
+make install
+cd ..
+# Build PostGRES_ext
 make clean
 make
 ./postgres_ext

include/Line2D.h

@@ -1,38 +1,51 @@
 #ifndef LINE2D_H
 #define LINE2D_H
 
-#include "Number.h"
 #include "RGP.h"
+#include "Number.h"
+#include "Line2DImpl.h"
 #include <string>
 #include <vector>
 
 class Line2D{
 public:
 	// Constructors
-	Line2D();
-	Line2D(std::vector<RGPHalfSegment2D> listOfSegments);
 	Line2D(std::string listOfLine2DString);
-	Line2D(std::ifstream& file); // Send in file for constructor
 	~Line2D();
 
+	//iterator to run through the list of half segments
+	class iterator
+	{
+		public:
+			iterator(RGPHalfSegment2D*);
+			RGPHalfSegment2D operator*();
+			RGPHalfSegment2D operator++(int);
+			RGPHalfSegment2D operator++();
+			bool operator!=(const iterator&);
+			bool operator==(const iterator&);
+			RGPHalfSegment2D *ptr;
+	};
+
+	iterator begin(); // return an iterator to the first element
+	iterator end();   // return an iterator to the last element
+
+	bool add(RGPSegment2D rgpSeg2d);	// Adds a new RGPSegment2D
+	bool update(iterator it, RGPSegment2D rgpSeg2d);	// Updates RGPSegment2D existing at specified index
+	bool remove(iterator it);	// Removes a RGPSegment2D at specified index
+
 	// Methods
-	std::string getLineString(); // Get the line as human readable ASCII string
-	static bool isEmptyLine();
-	static bool isValidLine();
+	void printAllLines(); // print all half segments in the vector
+	bool isEmptyLine();
 	int getNumberOfSegments();	// Get the total number of RGPSegment2Ds listed
-	std::vector<RGPSegment2D> getBoundingBox();
+
 	bool operator==(const Line2D &l2d);	// Override of operator == to check equality of two Line2Ds
 	bool operator!=(const Line2D &l2d);	// Override of operator != to check inequality of two Line2Ds
-	bool add(RGPSegment2D rgpSeg2d);	// Adds a new RGPSegment2D 
-	bool update(int index, RGPSegment2D rgpSeg2d);	// Updates RGPSegment2D existing at specified index
-	bool remove(int index);	// Removes a RGPSegment2D at specified index
-	RGPSegment2D operator[](int index);	// Retrieves a RGPSegment2D at specified index
 
+	RGPSegment2D getBoundingBox();
+
 private:
-	class Line2DImpl;
-
-	// Fields
-	Line2DImpl *impl;
+	struct Line2DStore;
+	Line2DStore *handle;
 };
 
 #endif //LINE2D

include/Line2DForProgrammer.h

@@ -0,0 +1,43 @@
+#ifndef LINE2DFORPROGRAMMER_H
+#define LINE2DFORPROGRAMMER_H
+
+#include "Number.h"
+#include "RGP.h"
+#include "RGPSegment2D.h"
+#include <string>
+#include <vector>
+#include <iterator>
+
+class Line2DForProgrammer{
+public:
+	// Constructors
+	Line2DForProgrammer(std::string listOfLine2DString);
+	Line2DForProgrammer(std::ifstream& file); // Send in file for constructor
+	~Line2DForProgrammer();
+
+	//iterator to run through the list of half segments
+	class iterator
+	{
+		public:
+			iterator(RGPHalfSegment2D*);
+			RGPHalfSegment2D operator*();
+			RGPHalfSegment2D operator++(int);
+			RGPHalfSegment2D operator++();
+			bool operator!=(const iterator&);
+			bool operator==(const iterator&);
+			RGPHalfSegment2D *ptr;
+	};
+
+	iterator begin(); // return an iterator to the first element
+	iterator end();   // return an iterator to the last element
+
+	bool add(RGPSegment2D rgpSeg2d);	// Adds a new RGPSegment2D
+	bool update(iterator it, RGPSegment2D rgpSeg2d);	// Updates RGPSegment2D existing at specified index
+	bool remove(iterator it);	// Removes a RGPSegment2D at specified index
+
+private:
+	struct Line2DProgrammerStore;
+	Line2DProgrammerStore *handle;
+};
+
+#endif //LINE2D

include/Line2DImpl.h

@@ -1,21 +1,60 @@
 #ifndef LINE2DIMPL_H
 #define LINE2DIMPL_H
 
-#include "RGP.h"
-#include "Line2D.h"
+#include <string>
 #include <vector>
 
-class Line2DImpl : public Line2D {
-public:
-
-    Line2DImpl();
-    ~Line2DImpl();
-
-    std::vector<RGPHalfSegment2D> getSequence();
+#include "RGP.h"
+#include "RGPSegment2D.h"
+#include "RGPHalfSegment2D.h"
 
-private:
+class Line2DImpl
+{
+	public:	
+		// Constructors
+		Line2DImpl(); // no args
+		Line2DImpl(std::vector<RGPSegment2D> listOfSegments); //send in a vector of segments
+		Line2DImpl(std::string listOfLine2DString); // send in a string
+		~Line2DImpl(); //destructor
 
-    std::vector<RGPHalfSegment2D> sequence;
+		//iterator to run through the list of half segments
+		class iterator
+		{
+			public:
+				iterator(RGPHalfSegment2D*);
+				RGPHalfSegment2D operator*();
+				RGPHalfSegment2D operator++(int);
+				RGPHalfSegment2D operator++();
+				bool operator!=(const iterator&);
+				bool operator==(const iterator&);
+				RGPHalfSegment2D *ptr;
+		};
+
+		iterator begin(); // return an iterator to the first element
+		iterator end();   // return an iterator to the last element
+
+		// Methods
+		void printAllLines(); // print all half segments in the vector
+		bool isEmptyLine(); // checks if the line object is empty
+		int getNumberOfSegments();	// Get the total number of RGPSegment2Ds listed
+		RGPSegment2D getBoundingBox(); // find the bounding box diaginal
+		std::vector<RGPHalfSegment2D> getVectorOfSegments();
+
+		bool add(RGPSegment2D rgpSeg2d);	// Adds a new RGPSegment2D
+		bool update(iterator it, RGPSegment2D rgpSeg2d);	// Updates RGPSegment2D existing at specified index
+		bool remove(iterator it);	// Removes a RGPSegment2D at specified index
+
+		bool operator==(const Line2DImpl &l2d);	// Override of operator == to check equality of two Line2Ds
+		bool operator!=(const Line2DImpl &l2d);	// Override of operator != to check inequality of two Line2Ds
+		Line2DImpl operator[](int index);	// Retrieves a RGPSegment2D at specified index
+		Line2DImpl operator=(const Line2DImpl &l2dImpl);
+
+	private:
+		struct Line2DImplStore;
+		Line2DImplStore *handle;
+		void lineSort(std::vector<RGPHalfSegment2D> &bar);
+		void mergeSort(std::vector<RGPHalfSegment2D> &left, std::vector<RGPHalfSegment2D> &right, std::vector<RGPHalfSegment2D> &bars);
+		bool parseStringToVectorOfLines(std::string st);
 };
 
-#endif //LINE2DIMPL_H
+#endif //POINT2DIMPL_H

include/Number.h

@@ -4,48 +4,53 @@
 #include <iostream>
 #include <string>
 
-
 class Number
 {
 public:
   // Constructors
   // Default number value is 0
   Number();
 
+  // Copy constructor
+  Number(const Number &n);
+
   // The string will be converted to a rational number
   Number(std::string number);
 
   // Destructor
   ~Number();
 
   // Override arithmetic operators
-  Number& operator+(const Number& n) const;
-  Number& operator+=(const Number& n);
-  Number& operator-(const Number& n) const;
-  Number& operator-=(const Number& n);
-  Number& operator*(const Number& n) const;
-  Number& operator*=(const Number& n);
-  Number& operator/(const Number& n) const;
-  Number& operator/=(const Number& n);
-  Number& operator^(const int n) const;
+  Number operator=(const Number &n);
+  Number operator+(const Number &n) const;
+  Number operator+=(const Number &n);
+  Number operator-(const Number &n) const;
+  Number operator-=(const Number &n);
+  Number operator*(const Number &n) const;
+  Number operator*=(const Number &n);
+  Number operator/(const Number &n) const;
+  Number operator/=(const Number &n);
+  Number operator^(const int n) const;
 
   // Override comparison operators
-  bool operator<(const Number& n) const;
-  bool operator<=(const Number& n) const;
-  bool operator>(const Number& n) const;
-  bool operator>=(const Number& n) const;
-  bool operator==(const Number& n) const;
-  bool operator!=(const Number& n) const;
+  bool operator<(const Number &n) const;
+  bool operator<=(const Number &n) const;
+  bool operator>(const Number &n) const;
+  bool operator>=(const Number &n) const;
+  bool operator==(const Number &n) const;
+  bool operator!=(const Number &n) const;
+  Number sqrt() const;
+  Number sqrt(size_t digits) const;
 
-  Number& sqrt() const;
+  std::string to_string(size_t digits) const;
 
   // Overriding the output and input operator
-  friend std::ostream& operator<<(std::ostream& os, const Number& n);
-  friend std::istream& operator>>(std::istream& is, Number& n);
+  friend std::ostream &operator<<(std::ostream &os, const Number &n);
+  friend std::istream &operator>>(std::istream &is, Number &n);
 
 private:
   struct NumberImpl;
-  NumberImpl* p;
+  struct NumberImpl *p;
 };
 
 #endif // NUMBER_H