Merge branch 'compressedPush'

Author: Azzaare

.gitignore

@@ -26,6 +26,7 @@
 *.exe
 *.out
 *.app
+*/smartstack
 
 
 CMakeCache.txt

CMakeLists.txt

@@ -4,6 +4,10 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 # Project Name
 project(smartstack)
 
+STRING(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+# Select the build path in function of the build type: release, debug, ...
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/${CMAKE_BUILD_TYPE_LOWER})
+
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
 CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
@@ -15,6 +19,29 @@ else()
         message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
 endif()
 
+# Default build mode is Release with debug information
+IF(NOT CMAKE_BUILD_TYPE)
+  SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
+      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
+      FORCE)
+ENDIF(NOT CMAKE_BUILD_TYPE)
+
+## Configure the different type of build
+# Release
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+# Debug
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+# RelWithDebInfo
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+# MinSizeRel
+set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}")
+
+# Basic options for all builds
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Weffc++ -Wshadow -ansi")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Wshadow")
+# Might need to be fixed for retrocompatibility or temporary
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++0x-compat -Wno-unused")
+
 #Bring the headers into the project
 include_directories(${PROJECT_SOURCE_DIR}/include)
 
@@ -27,3 +54,25 @@ message("inc_dirs = ${inc_dirs}")
 
 # Executable
 add_executable(smartstack ${SOURCES})
+
+
+# Description of the different builds
+# +---------------+--------------+--------------+----------|
+# |               | optimization | assert works | stripped |
+# +---------------+--------------+--------------+----------|
+# |     Debug     |     no       |     yes      |    no    |
+# |    Release    |    full      |      no      |   yes    |
+# | RelWithDebInfo|    good      |      no      |    no    |
+# |   MinSizeRel  |    size      |      no      |   yes    |
+# +---------------+--------------+--------------+----------|
+
+# Alias for cmake commands
+# alias cmakedebug='cmake $1 -DCMAKE_BUILD_TYPE=DEBUG'
+# alias cmakerelease='cmake $1 -DCMAKE_BUILD_TYPE=RELEASE'
+# alias cmakerelwithdebinfo='cmake $1 -DCMAKE_BUILD_TYPE=RELWITHDEBINFO'
+# alias cmakeminsizerel='cmake $1 -DCMAKE_BUILD_TYPE=MINSIZEREL'
+
+# Example for debug (first line only if the directory doesn't exist)
+# mkdir build_directory
+# cd build_directory
+# cmakedebug ..

build/cmakereadme.txt

@@ -0,0 +1,114 @@
+#ifndef BUFFER
+#define BUFFER
+
+/*==============================================================================
+  Includes
+==============================================================================*/
+#include "data.hpp"
+#include <vector>
+#include <string>
+#include <iostream>
+#include <memory>
+
+/*==============================================================================
+  Class      : template (D datas)
+  Extensions :
+  Aliases    :
+  Friends   -> CompressedStack
+            <-
+==============================================================================*/
+template <class T, class D> class CompressedStack; // Required for the friendship
+template <class T, class D>
+class Buffer{
+  friend class CompressedStack<T,D>;
+
+private:
+  // Constructor
+  Buffer<T,D>(int size = 0);
+
+  // Getters
+  Data<T,D> top(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();
+
+  // IO
+  std::string toString();
+
+  // Members
+  int mSize;
+  int mStart;
+  ExplicitPointer<T,D> mExplicit;
+};
+
+/*==============================================================================
+  Constructors
+==============================================================================*/
+template <class T, class D>
+Buffer<T,D>::Buffer(int size){
+  mSize = size;
+  mStart = 0;
+
+  ExplicitPointer<T,D> xplicit = initExplicitPointer<T,D>();
+  xplicit.reserve(size);
+  mExplicit = xplicit;
+}
+
+/*==============================================================================
+  Getters
+==============================================================================*/
+template <class T, class D>
+Data<T,D> Buffer<T,D>::top(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
+==============================================================================*/
+template <class T, class D>
+void Buffer<T,D>::setStart(){
+  mStart = (mStart + 1) % mSize;
+}
+template <class T, class D>
+void Buffer<T,D>::setData(std::shared_ptr<Data<T,D>> elt, int id){
+  int index = (id + mStart - 1) % mSize; // -1 match the start of vectors at 0
+  mExplicit[index] = elt;
+}
+
+/*==============================================================================
+  Stack Functions: push, pop
+==============================================================================*/
+template <class T, class D>
+void Buffer<T,D>::push(std::shared_ptr<Data<T,D>> elt){
+  if (mSize > 0) {
+    setData(elt, mStart+1);
+  }
+}
+
+template <class T, class D>
+void Buffer<T,D>::pop(){
+  setStart();
+}
+
+/*==============================================================================
+  IO : toString
+==============================================================================*/
+template <class T, class D>
+std::string Buffer<T,D>::toString(){
+  std::string str;
+  str = "\t\tBuffer size is " + std::to_string(mSize);
+  str += " and start at index " + std::to_string(mStart) + "\n";
+  str += explicitPointerToString(mExplicit);
+  return str;
+}
+
+#endif /* BUFFER */

include/buffer.hpp

@@ -1,56 +1,76 @@
 #ifndef COMPONENT
 #define COMPONENT
 
-/**** Compressed Stack: declarations ****/
+/*==============================================================================
+  Includes
+==============================================================================*/
 #include "sign.hpp"
 #include "stack.hpp"
 #include <string>
+#include <memory>
 
-/* Component of a Compressed Stack */
+/*==============================================================================
+  Class      : template (T context, D datas)
+  Extensions :
+  Aliases    :
+  Friends   -> CompressedStack
+            <- Data, Signature
+==============================================================================*/
+template <class T, class D> class CompressedStack; // Required for the friendship
 template <class T, class D>
-class Component
-{
-public:
+class Component{
+  friend class CompressedStack<T,D>;
+
+private:
   Component<T,D>(int space, int depth);
 
   // Setters
-  void setSignature(Signature<T> sign);
-  void setLastSign(int index);
+  void clearExplicit(int space);
+
+  // Push and pop
+  void pushExplicit(std::shared_ptr<Data<T,D>> elt);
+  void push(Signature<T,D> sign, int lvl);
+  Data<T,D> top();
+  Signature<T,D> top(int lvl);
+  int topIndex(int lvl = 0);
 
   // IO
   std::string toString();
-  void print();
-  void println();
 
-private:
-  Levels<T> mPartial;
-  Explicit<D> mExplicit;
-  Signature<T>* mSign;
+  // State
+  bool isempty();
+  bool isempty(int lvl);
+  bool isExplicitEmpty();
+
+  Levels<T,D> mPartial;
+  ExplicitPointer<T,D> mExplicit;
+  Signature<T,D> mSign;
 };
 
-/** Constructors **/
+/*==============================================================================
+  Constructors
+==============================================================================*/
 template <class T, class D>
 Component<T,D>::Component(int space, int depth)
-{
-  mSign = nullptr;
+:mSign(0, std::streampos (0), std::shared_ptr<T>(nullptr)){
 
-  Levels<T> partial = initLevels<T>(space, depth);
+  Levels<T,D> partial = initLevels<T,D>(space, depth);
   mPartial = partial;
 
-  Explicit<D> xplicit;
-  xplicit = initExplicit<D>();
+  ExplicitPointer<T,D> xplicit = initExplicitPointer<T,D>();
   xplicit.reserve(space);
   mExplicit = xplicit;
 }
 
-/** IO **/
-template <class T>
-std::string levelsToStringInComponent(Levels<T> levels)
-{
+/*==============================================================================
+  IO : levelsToStringInComponent, toString
+==============================================================================*/
+template <class T, class D>
+std::string levelsToString(Levels<T,D> levels){
   std::string str;
   str = "";
   int index = 0;
-  for (typename Levels<T>::iterator it = levels.begin() ; it != levels.end(); ++it)
+  for (typename Levels<T,D>::iterator it = levels.begin() ; it != levels.end(); ++it)
   {
     index++;
     str += "\t\t\tLevel" + std::to_string(index) + "->\n";
@@ -60,15 +80,75 @@ std::string levelsToStringInComponent(Levels<T> levels)
 }
 
 template <class T, class D>
-std::string Component<T,D>::toString()
-{
+std::string Component<T,D>::toString(){
   std::string str;
-  str = levelsToStringInComponent(mPartial);
+  str = levelsToString(mPartial);
   str += "\t\t\tExplicit->\n";
-  str += explicitToString(mExplicit);
+  str += explicitPointerToString(mExplicit);
   str += "\t\t\tSignature->\n";
   //str += (&mSign).toString() + "\n";
   return str;
 }
 
+/*==============================================================================
+  Stack Functions: push, pop, top, topIndex, isempty, isExplicitEmpty
+==============================================================================*/
+template <class T, class D>
+bool Component<T,D>::isempty(){
+  bool b = bool (mSign.mContext);
+  return !b;
+}
+
+template <class T, class D>
+bool Component<T,D>::isempty(int lvl){
+  bool b;
+  if (lvl > int(mPartial.size())) {
+    b = isExplicitEmpty();
+  } else {
+    b = (mPartial[lvl]).empty();
+  }
+  return b;
+}
+
+template <class T, class D>
+bool Component<T,D>::isExplicitEmpty(){
+  return (mExplicit.empty());
+}
+
+template <class T, class D>
+void Component<T,D>::pushExplicit(std::shared_ptr<Data<T,D>> elt){
+  mExplicit.push_back(elt);
+}
+template <class T, class D>
+void Component<T,D>::push(Signature<T,D> sign, int lvl){
+  mPartial[lvl].push_back(sign);
+}
+
+template <class T, class D>
+Data<T,D> Component<T,D>::top(){
+  return *(mExplicit.back());
+}
+template <class T, class D>
+Signature<T,D> Component<T,D>::top(int lvl){
+  return mPartial[lvl].back();
+}
+
+template <class T, class D>
+int Component<T,D>::topIndex(int lvl){
+  if (lvl == 0) {
+    return top().mIndex;
+  } else {
+    return top(lvl).mLast;
+  }
+}
+
+/*==============================================================================
+  Setters
+==============================================================================*/
+template <class T, class D>
+void Component<T,D>::clearExplicit(int space){
+  mExplicit.clear();
+  mExplicit.reserve(space);
+}
+
 #endif /* COMPONENT */