Added buffer in the signature and merge Yago's

Author: Azzaare

src/Point2D.h include/Point2D.hppsrc/Point2D.h renamed to include/Point2D.hpp

@@ -5,8 +5,8 @@
 #include <iostream>
 #include<string>
 
-#ifndef SMARTSTACK_POINT2D_H
-#define SMARTSTACK_POINT2D_H
+#ifndef SMARTSTACK_POINT2D
+#define SMARTSTACK_POINT2D
 
 
 class Point2D {
@@ -45,4 +45,4 @@ class Point2D {
 };
 
 
-#endif //SMARTSTACK_POINT2D_H
+#endif //SMARTSTACK_POINT2D

include/buffer.hpp

@@ -18,9 +18,13 @@
             <-
 ==============================================================================*/
 template <class T, class D> class CompressedStack; // Required for the friendship
+template <class T, class D> class Signature; // Required for the friendship
+template <class T, class D> class Component; // Required for the friendship
 template <class T, class D>
 class Buffer{
   friend class CompressedStack<T,D>;
+  friend class Signature<T,D>;
+  friend class Component<T,D>;
 
 private:
   // Constructor

include/component.hpp

@@ -52,7 +52,7 @@ class Component{
 ==============================================================================*/
 template <class T, class D>
 Component<T,D>::Component(int space, int depth)
-:mSign(0, std::streampos (0), std::shared_ptr<T>(nullptr)){
+:mSign(0, std::streampos (0), std::shared_ptr<T>(nullptr), Buffer<T,D>(0)){
 
   Levels<T,D> partial = initLevels<T,D>(space, depth);
   mPartial = partial;

include/compressedStack.hpp

@@ -214,7 +214,7 @@ template <class T, class D>
 void CompressedStack<T,D>::pushExplicit(std::shared_ptr<Data<T,D>> elt){
   int index = elt->mIndex;
   std::shared_ptr<Data<T,D>> eltPtr = elt;
-  Signature<T,D> sign (index, mPosition, mContext);
+  Signature<T,D> sign (index, mPosition, mContext, mBuffer);
 
   // If the explicit datas of component 1 are empty we push
   if (mFirst.isExplicitEmpty()) {
@@ -252,7 +252,7 @@ void CompressedStack<T,D>::pushCompressed(std::shared_ptr<Data<T,D>> elt, int lv
   int distSubBlock = std::pow(mSpace,(mDepth - lvl));
   int distBlock = distSubBlock * mSpace;
   int index = elt->mIndex;
-  Signature<T,D> sign (index, position, mContext);
+  Signature<T,D> sign (index, position, mContext, mBuffer);
 
   if (mFirst.isempty(lvl)) {
     mFirst.push(sign, lvl);

include/createTestInput.hpp

@@ -6,7 +6,7 @@
 #include <fstream>
 #include <sstream>
 #include <string>
-#include "Point2D.h"
+#include "Point2D.hpp"
 #include <vector>
 #include <algorithm>
 

include/sign.hpp

@@ -8,6 +8,7 @@
 #include <string>
 #include <iostream>
 #include <memory>
+#include "buffer.hpp"
 
 /*==============================================================================
   Class      : template (T context, D datas)
@@ -29,13 +30,14 @@ class Signature{
 
 private:
   // Constructors
-  Signature<T,D>(int index, std::streampos position, std::shared_ptr<T> context);
+  Signature<T,D>(int index, std::streampos position, std::shared_ptr<T> context, Buffer<T,D> buffer);
   Signature<T,D>(std::vector<Signature<T,D>> block);
 
   int mFirst;
   int mLast;
   std::streampos mPosition;
   std::shared_ptr<T> mContext;
+  Buffer<T,D> mBuffer;
 };
 
 /* Derived types: Block and Levels */
@@ -51,11 +53,12 @@ template<class T, class D> Levels<T,D> initLevels(int space, int depth);
   Constructors : Signature, initBlock, initLevels
 ==============================================================================*/
 template <class T, class D>
-Signature<T,D>::Signature(int index, std::streampos position, std::shared_ptr<T> context){
+Signature<T,D>::Signature(int index, std::streampos position, std::shared_ptr<T> context, Buffer<T,D> buffer){
   mFirst = index;
   mLast = index;
   mPosition = position;
   mContext = context;
+  mBuffer = buffer;
 }
 
 template <class T, class D>
@@ -66,6 +69,7 @@ Signature<T,D>::Signature(Block<T,D> block){
   mLast = backSign.mLast;
   mPosition = frontSign.mPosition;
   mContext = frontSign.mContext;
+  mBuffer = frontSign.mBuffer;
 }
 
 template <class T, class D>

src/Point2D.cpp

@@ -2,7 +2,7 @@
 // Created by yago on 16/07/05.
 //
 
-#include "Point2D.h"
+#include "../include/Point2D.hpp"
 
 Point2D::Point2D() {}
 

src/createTestInput.cpp

@@ -117,9 +117,9 @@ void createTestInput::createTestInputFiles(int code, string fileName,int n,int p
             outfile << min << "," << min << endl;
 
             // add the sorted points
-            for(int i=0;i<pointsToSort.size();i++)
+            for(int j=0;j< (int) pointsToSort.size();j++)
             {
-                outfile << pointsToSort[i].GetX() << "," << pointsToSort[i].GetY() << endl;
+                outfile << pointsToSort[j].GetX() << "," << pointsToSort[j].GetY() << endl;
             }
 
             // add finally (max,min)