Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 4b39298

Browse files
committed
Partial Rename of Signature into Block
1 parent e271608 commit 4b39298

File tree

5 files changed

+35
-35
lines changed

5 files changed

+35
-35
lines changed

‎include/block.hpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ template <class T, class D> class Component; // Required for the friendship
2121
template <class T, class D>
2222
class CompressedStack; // Required for the friendship
2323
template <class T, class D> class ClassicStack; // Required for the friendship
24-
template <class T, class D> class Signature {
24+
template <class T, class D> class Block {
2525
friend class Component<T, D>;
2626
friend class CompressedStack<T, D>;
2727
friend class ClassicStack<T, D>;
@@ -32,10 +32,10 @@ template <class T, class D> class Signature {
3232

3333
private:
3434
// Constructors
35-
Signature<T, D>(int index, std::streampos position,
35+
Block<T, D>(int index, std::streampos position,
3636
std::shared_ptr<T> context, Buffer<T, D> buffer);
37-
Signature<T, D>(std::vector<Signature<T, D>> level);
38-
Signature<T, D>();
37+
Block<T, D>(std::vector<Block<T, D>> level);
38+
Block<T, D>();
3939

4040
// Getters
4141
bool single();
@@ -49,18 +49,18 @@ template <class T, class D> class Signature {
4949

5050
/* Derived types: Level and LevelVector */
5151
// A Partially Compressed Level is composed of its blocks
52-
template <class T, class D> using Level = std::vector<Signature<T, D>>;
52+
template <class T, class D> using Level = std::vector<Block<T, D>>;
5353
template <class T, class D> Level<T, D> initLevel(int space);
5454

5555
// Each level of compressed Levels (first and second) are stored in LevelVector
5656
template <class T, class D> using LevelVector = std::vector<Level<T, D>>;
5757
template <class T, class D> LevelVector<T, D> initLevelVector(int space, int depth);
5858

5959
/*==============================================================================
60-
Constructors : Signature, initLevel, initLevelVector
60+
Constructors : Block, initLevel, initLevelVector
6161
==============================================================================*/
6262
template <class T, class D>
63-
Signature<T, D>::Signature(int index, std::streampos position,
63+
Block<T, D>::Block(int index, std::streampos position,
6464
std::shared_ptr<T> context, Buffer<T, D> buffer) {
6565
mFirst = index;
6666
mLast = index;
@@ -69,17 +69,17 @@ Signature<T, D>::Signature(int index, std::streampos position,
6969
mBuffer = buffer;
7070
}
7171

72-
template <class T, class D> Signature<T, D>::Signature(Level<T, D> level) {
73-
Signature<T, D> frontSign = level.front();
74-
Signature<T, D> backSign = level.back();
75-
mFirst = frontSign.mFirst;
76-
mLast = backSign.mLast;
77-
mPosition = frontSign.mPosition;
78-
mContext = frontSign.mContext;
79-
mBuffer = frontSign.mBuffer;
72+
template <class T, class D> Block<T, D>::Block(Level<T, D> level) {
73+
Block<T, D> frontBlock = level.front();
74+
Block<T, D> backBlock = level.back();
75+
mFirst = frontBlock.mFirst;
76+
mLast = backBlock.mLast;
77+
mPosition = frontBlock.mPosition;
78+
mContext = frontBlock.mContext;
79+
mBuffer = frontBlock.mBuffer;
8080
}
8181

82-
template <class T, class D> Signature<T, D>::Signature() {
82+
template <class T, class D> Block<T, D>::Block() {
8383
mFirst = 0;
8484
mLast = 0;
8585
mPosition = std::streampos(0);
@@ -107,14 +107,14 @@ template <class T, class D> LevelVector<T, D> initLevelVector(int space, int dep
107107
/*==============================================================================
108108
Getters : single
109109
==============================================================================*/
110-
template <class T, class D> bool Signature<T, D>::single() {
110+
template <class T, class D> bool Block<T, D>::single() {
111111
return (mLast == mFirst);
112112
}
113113

114114
/*==============================================================================
115115
IO : toString, levelToString
116116
==============================================================================*/
117-
template <class T, class D> std::string Signature<T, D>::toString() {
117+
template <class T, class D> std::string Block<T, D>::toString() {
118118
std::string str;
119119
str = "(" + std::to_string(mFirst) + ",";
120120
str += std::to_string(mLast) + ")";

‎include/buffer.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
==============================================================================*/
2020
template <class T, class D>
2121
class CompressedStack; // Required for the friendship
22-
template <class T, class D> class Signature; // Required for the friendship
22+
template <class T, class D> class Block; // Required for the friendship
2323
template <class T, class D> class Component; // Required for the friendship
2424
template <class T, class D> class ClassicStack; // Required for the friendship
2525
template <class T, class D> class Buffer {
2626
friend class CompressedStack<T, D>;
2727
friend class ClassicStack<T, D>;
28-
friend class Signature<T, D>;
28+
friend class Block<T, D>;
2929
friend class Component<T, D>;
3030

3131
private:

‎include/classicStack.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ template <class T, class D> class ClassicStack : public Stack<T, D> {
5151
Level<T, D> getFirstPartial(int lvl);
5252
Level<T, D> getCompressed();
5353
ExplicitPointer<T, D> getFirstExplicit();
54-
Signature<T, D> getFirstSign();
54+
Block<T, D> getFirstBlock();
5555
int getBufferSize ();
5656
};
5757

@@ -118,10 +118,10 @@ int ClassicStack<T, D>::getBufferSize() {
118118
return 0;
119119
}
120120

121-
template <class T, class D> Signature<T, D> ClassicStack<T, D>::getFirstSign() {
122-
Signature<T, D> sign(0, std::streampos(0), std::shared_ptr<T>(nullptr),
121+
template <class T, class D> Block<T, D> ClassicStack<T, D>::getFirstBlock() {
122+
Block<T, D> block(0, std::streampos(0), std::shared_ptr<T>(nullptr),
123123
Buffer<T, D>(0));
124-
return sign;
124+
return block;
125125
}
126126

127127
/*==============================================================================

‎include/component.hpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Extensions :
1515
Aliases :
1616
Friends -> CompressedStack
17-
<- Data, Signature
17+
<- Data, Block
1818
==============================================================================*/
1919
template <class T, class D>
2020
class CompressedStack; // Required for the friendship
@@ -29,9 +29,9 @@ template <class T, class D> class Component {
2929

3030
// Push and pop
3131
void pushExplicit(SPData<T, D> elt);
32-
void push(Signature<T, D> sign, int lvl);
32+
void push(Block<T, D> block, int lvl);
3333
Data<T, D> top();
34-
Signature<T, D> top(int lvl);
34+
Block<T, D> top(int lvl);
3535
int topIndex(int lvl = 0);
3636

3737
// IO
@@ -42,15 +42,15 @@ template <class T, class D> class Component {
4242

4343
LevelVector<T, D> mPartial;
4444
ExplicitPointer<T, D> mExplicit;
45-
Signature<T, D> mSign;
45+
Block<T, D> mBlock;
4646
};
4747

4848
/*==============================================================================
4949
Constructors
5050
==============================================================================*/
5151
template <class T, class D>
5252
Component<T, D>::Component(int space, int depth)
53-
: mSign(0, std::streampos(0), std::shared_ptr<T>(nullptr),
53+
: mBlock(0, std::streampos(0), std::shared_ptr<T>(nullptr),
5454
Buffer<T, D>(0)) {
5555

5656
LevelVector<T, D> partial = initLevelVector<T, D>(space, depth);
@@ -82,8 +82,8 @@ template <class T, class D> std::string Component<T, D>::toString() {
8282
str = levelsToString(mPartial);
8383
str += "\t\t\tExplicit -> ";
8484
str += explicitPointerToString(mExplicit);
85-
str += "\n\t\t\tSignature -> ";
86-
str += mSign.toString() + "\n";
85+
str += "\n\t\t\tBlock -> ";
86+
str += mBlock.toString() + "\n";
8787
return str;
8888
}
8989

@@ -95,14 +95,14 @@ void Component<T, D>::pushExplicit(SPData<T, D> elt) {
9595
mExplicit.push_back(elt);
9696
}
9797
template <class T, class D>
98-
void Component<T, D>::push(Signature<T, D> sign, int lvl) {
99-
mPartial[lvl - 1].push_back(sign);
98+
void Component<T, D>::push(Block<T, D> block, int lvl) {
99+
mPartial[lvl - 1].push_back(block);
100100
}
101101

102102
template <class T, class D> Data<T, D> Component<T, D>::top() {
103103
return *(mExplicit.back());
104104
}
105-
template <class T, class D> Signature<T, D> Component<T, D>::top(int lvl) {
105+
template <class T, class D> Block<T, D> Component<T, D>::top(int lvl) {
106106
return mPartial[lvl - 1].back();
107107
}
108108

‎include/stack.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ template <class T, class D> class Stack {
3535
virtual Level<T, D> getFirstPartial(int lvl) = 0;
3636
virtual Level<T, D> getCompressed() = 0;
3737
virtual ExplicitPointer<T, D> getFirstExplicit() = 0;
38-
virtual Signature<T, D> getFirstSign() = 0;
38+
virtual Block<T, D> getFirstBlock() = 0;
3939
virtual int getBufferSize() = 0;
4040

4141
// Setters

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /