Renamed Levels into LevelVector

Azzaare · Azzaare · commit 5e1737ee0c40 · 2016-09-27T12:36:23.000+09:00
diff --git a/include/block.hpp b/include/block.hpp
@@ -13,7 +13,7 @@
 /*==============================================================================
   Class      : template (T context, D datas)
   Extensions :
-  Aliases    : Block, Levels
+  Aliases    : Block, LevelVector
   Friends   -> Component, CompressedStack
             <-
 ==============================================================================*/
@@ -47,17 +47,17 @@ template <class T, class D> class Signature {
   Buffer<T, D> mBuffer;
 };
 
-/* Derived types: Block and Levels */
+/* Derived types: Block and LevelVector */
 // A Partially Compressed Block is composed of the signatures of its SubBlocks
 template <class T, class D> using Block = std::vector<Signature<T, D>>;
 template <class T, class D> Block<T, D> initBlock(int space);
 
-// Each level of compressed Blocks (first and second) are stored in Levels
-template <class T, class D> using Levels = std::vector<Block<T, D>>;
-template <class T, class D> Levels<T, D> initLevels(int space, int depth);
+// Each level of compressed Blocks (first and second) are stored in LevelVector
+template <class T, class D> using LevelVector = std::vector<Block<T, D>>;
+template <class T, class D> LevelVector<T, D> initLevelVector(int space, int depth);
 
 /*==============================================================================
-  Constructors : Signature, initBlock, initLevels
+  Constructors : Signature, initBlock, initLevelVector
 ==============================================================================*/
 template <class T, class D>
 Signature<T, D>::Signature(int index, std::streampos position,
@@ -93,8 +93,8 @@ template <class T, class D> Block<T, D> initBlock(int space) {
   return block;
 }
 
-template <class T, class D> Levels<T, D> initLevels(int space, int depth) {
-  Levels<T, D> levels;
+template <class T, class D> LevelVector<T, D> initLevelVector(int space, int depth) {
+  LevelVector<T, D> levels;
   for (int lvl = 1; lvl < depth; lvl++) {
     Block<T, D> block = initBlock<T, D>(space);
     levels.push_back(block);
diff --git a/include/component.hpp b/include/component.hpp
@@ -40,7 +40,7 @@ template <class T, class D> class Component {
   // State
   bool single(int lvl);
 
-  Levels<T, D> mPartial;
+  LevelVector<T, D> mPartial;
   ExplicitPointer<T, D> mExplicit;
   Signature<T, D> mSign;
 };
@@ -53,7 +53,7 @@ Component<T, D>::Component(int space, int depth)
     : mSign(0, std::streampos(0), std::shared_ptr<T>(nullptr),
             Buffer<T, D>(0)) {
 
-  Levels<T, D> partial = initLevels<T, D>(space, depth);
+  LevelVector<T, D> partial = initLevelVector<T, D>(space, depth);
   mPartial = partial;
 
   ExplicitPointer<T, D> xplicit = initExplicitPointer<T, D>();
@@ -64,11 +64,11 @@ Component<T, D>::Component(int space, int depth)
 /*==============================================================================
   IO : levelsToStringInComponent, toString
 ==============================================================================*/
-template <class T, class D> std::string levelsToString(Levels<T, D> levels) {
+template <class T, class D> std::string levelsToString(LevelVector<T, D> levels) {
   std::string str;
   str = "";
   int index = 0;
-  for (typename Levels<T, D>::iterator it = levels.begin(); it != levels.end();
+  for (typename LevelVector<T, D>::iterator it = levels.begin(); it != levels.end();
        ++it) {
     index++;
     str += "\t\t\tLevel " + std::to_string(index) + "   ->";
