Added pop function to Buffer

Author: Azzaare

include/buffer.hpp

@@ -32,14 +32,15 @@ class Buffer{
 
   // Getters
   Data<T,D> top(int k);
+  std::shared_ptr<Data<T,D>> getPointer(int k);
 
   // Setters
   void setStart();
   void setData(std::shared_ptr<Data<T,D>> elt, int index);
 
   // Push and Pop
   void push(std::shared_ptr<Data<T,D>> elt);
-  void pop();
+  void pop(std::shared_ptr<Data<T,D>> elt);
 
   // IO
   std::string toString();
@@ -75,6 +76,15 @@ Data<T,D> Buffer<T,D>::top(int k){
   throw "Access to a top element bigger than the size of the buffer";
 }
 
+template <class T, class D>
+std::shared_ptr<Data<T,D>> Buffer<T,D>::getPointer(int k){
+  if (k < mSize) {
+    int index = (k + mStart - 1) % mSize; // -1 match the start of vectors at 0
+    return mExplicit[index];
+  }
+  throw "Access to a top element bigger than the size of the buffer";
+}
+
 /*==============================================================================
   Setters
 ==============================================================================*/
@@ -99,8 +109,9 @@ void Buffer<T,D>::push(std::shared_ptr<Data<T,D>> elt){
 }
 
 template <class T, class D>
-void Buffer<T,D>::pop(){
+void Buffer<T,D>::pop(std::shared_ptr<Data<T,D>> elt){
   setStart();
+  setData(elt, mSize);
 }
 
 /*==============================================================================

include/compressedStack.hpp

@@ -45,6 +45,7 @@ class CompressedStack: public Stack<T,D>{
   Block<T,D> getFirstPartial(int lvl);
   Block<T,D> getCompressed();
   ExplicitPointer<T,D> getFirstExplicit();
+  std::shared_ptr<Data<T,D>> getExplicitData(int k);
 
   // IO
   std::string toString();
@@ -58,6 +59,7 @@ class CompressedStack: public Stack<T,D>{
   void resetBlock(Signature<T,D> sign, int lvl);
 
   // Pop Internals
+  void popBuffer();
   void reconstruct(Problem<T,D> &problem);
   void reconstruct(Problem<T,D> &problem,const Signature<T,D> &sign, int lvl);
   void popFirst();
@@ -143,6 +145,15 @@ ExplicitPointer<T,D> CompressedStack<T,D>::getFirstExplicit(){
   return mFirst.mExplicit;
 }
 
+template <class T, class D>
+std::shared_ptr<Data<T,D>> CompressedStack<T,D>::getExplicitData(int k){
+  if (k <= (int) mFirst.mExplicit.size()) {
+    return mFirst.mExplicit[k-1];
+  } else {
+    return mFirst.mSign.mBuffer.getPointer(k - 1 - mFirst.mExplicit.size());
+  }
+}
+
 /*==============================================================================
   IO : toString
 ==============================================================================*/
@@ -424,8 +435,15 @@ void CompressedStack<T,D>::reconstruct(Problem<T,D> &problem, const Signature<T,
   mSecond.mExplicit = (*auxStack).getFirstExplicit();
 }
 
+template <class T, class D>
+void CompressedStack<T,D>::popBuffer(){
+  std::shared_ptr<Data<T,D>> elt = getExplicitData(mBuffer.mSize);
+  mBuffer.pop(elt);
+}
+
 template <class T, class D>
 Data<T,D> CompressedStack<T,D>::pop(Problem<T,D> &problem){
+  popBuffer();
   std::shared_ptr<Data<T,D>> elt;
   if (mFirst.mExplicit.empty()) {
     if (mSecond.mExplicit.empty()) {