Skip to content

Commit 191ca77

Browse files
huanchenzhuanchenz
committed
small updates
1 parent 84b5fd4 commit 191ca77

File tree

2 files changed

+28
-32
lines changed

2 files changed

+28
-32
lines changed

‎include/surf.hpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@ class SuRF {
4747
SuRF(const std::vector<std::string>& keys,
4848
const bool include_dense, const uint32_t sparse_dense_ratio,
4949
const SuffixType suffix_type, const level_t suffix_len) {
50-
builder = new SuRFBuilder(include_dense, sparse_dense_ratio, suffix_type, suffix_len);
51-
builder->build(keys);
52-
louds_dense_ = new LoudsDense(builder);
53-
louds_sparse_ = new LoudsSparse(builder);
54-
delete builder;
50+
create(keys, include_dense, sparse_dense_ratio, suffix_type, suffix_len);
5551
}
5652

5753
~SuRF() {

‎test/unitTest/test_surf.cpp

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ TEST_F (SuRFUnitTest, lookupWordTest) {
116116
level_t suffix_len_array[5] = {1, 3, 7, 8, 13};
117117
for (int k = 0; k < 5; k++) {
118118
level_t suffix_len = suffix_len_array[k];
119-
//surf_ = new SuRF(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
120-
surf_ = new SuRF();
121-
surf_->create(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
119+
surf_ = new SuRF(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
120+
//surf_ = new SuRF();
121+
//surf_->create(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
122122
testLookupWord();
123123
delete surf_;
124124
}
@@ -128,9 +128,9 @@ TEST_F (SuRFUnitTest, serializeTest) {
128128
level_t suffix_len_array[5] = {1, 3, 7, 8, 13};
129129
for (int k = 0; k < 5; k++) {
130130
level_t suffix_len = suffix_len_array[k];
131-
//surf_ = new SuRF(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
132-
surf_ = new SuRF();
133-
surf_->create(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
131+
surf_ = new SuRF(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
132+
//surf_ = new SuRF();
133+
//surf_->create(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
134134
testSerialize();
135135
testLookupWord();
136136
}
@@ -140,9 +140,9 @@ TEST_F (SuRFUnitTest, lookupIntTest) {
140140
level_t suffix_len_array[5] = {1, 3, 7, 8, 13};
141141
for (int k = 0; k < 5; k++) {
142142
level_t suffix_len = suffix_len_array[k];
143-
//surf_ = new SuRF(ints_, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
144-
surf_ = new SuRF();
145-
surf_->create(ints_, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
143+
surf_ = new SuRF(ints_, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
144+
//surf_ = new SuRF();
145+
//surf_->create(ints_, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
146146
for (uint64_t i = 0; i < kIntTestBound; i += kIntTestSkip) {
147147
bool key_exist = surf_->lookupKey(surf::uint64ToString(i));
148148
if (i % kIntTestSkip == 0)
@@ -158,9 +158,9 @@ TEST_F (SuRFUnitTest, moveToKeyGreaterThanWordTest) {
158158
level_t suffix_len_array[5] = {1, 3, 7, 8, 13};
159159
for (int k = 0; k < 5; k++) {
160160
level_t suffix_len = suffix_len_array[k];
161-
//surf_ = new SuRF(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
162-
surf_ = new SuRF();
163-
surf_->create(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
161+
surf_ = new SuRF(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
162+
//surf_ = new SuRF();
163+
//surf_->create(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
164164
for (unsigned i = 0; i < words.size(); i++) {
165165
bool inclusive = true;
166166
SuRF::Iter iter = surf_->moveToKeyGreaterThan(words[i], inclusive);
@@ -194,9 +194,9 @@ TEST_F (SuRFUnitTest, moveToKeyGreaterThanIntTest) {
194194
level_t suffix_len_array[5] = {1, 3, 7, 8, 13};
195195
for (int k = 0; k < 5; k++) {
196196
level_t suffix_len = suffix_len_array[k];
197-
//surf_ = new SuRF(ints_, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
198-
surf_ = new SuRF();
199-
surf_->create(ints_, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
197+
surf_ = new SuRF(ints_, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
198+
//surf_ = new SuRF();
199+
//surf_->create(ints_, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
200200
for (uint64_t i = 0; i < kIntTestBound; i++) {
201201
bool inclusive = true;
202202
SuRF::Iter iter = surf_->moveToKeyGreaterThan(surf::uint64ToString(i), inclusive);
@@ -236,9 +236,9 @@ TEST_F (SuRFUnitTest, IteratorIncrementWordTest) {
236236
level_t suffix_len_array[5] = {1, 3, 7, 8, 13};
237237
for (int k = 0; k < 5; k++) {
238238
level_t suffix_len = suffix_len_array[k];
239-
//surf_ = new SuRF(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
240-
surf_ = new SuRF();
241-
surf_->create(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
239+
surf_ = new SuRF(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
240+
//surf_ = new SuRF();
241+
//surf_->create(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
242242
bool inclusive = true;
243243
SuRF::Iter iter = surf_->moveToKeyGreaterThan(words[0], inclusive);
244244
for (unsigned i = 1; i < words.size(); i++) {
@@ -259,9 +259,9 @@ TEST_F (SuRFUnitTest, IteratorIncrementIntTest) {
259259
level_t suffix_len_array[5] = {1, 3, 7, 8, 13};
260260
for (int k = 0; k < 5; k++) {
261261
level_t suffix_len = suffix_len_array[k];
262-
//surf_ = new SuRF(ints_, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
263-
surf_ = new SuRF();
264-
surf_->create(ints_, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
262+
surf_ = new SuRF(ints_, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
263+
//surf_ = new SuRF();
264+
//surf_->create(ints_, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
265265
bool inclusive = true;
266266
SuRF::Iter iter = surf_->moveToKeyGreaterThan(surf::uint64ToString(0), inclusive);
267267
for (uint64_t i = kIntTestSkip; i < kIntTestBound; i += kIntTestSkip) {
@@ -282,9 +282,9 @@ TEST_F (SuRFUnitTest, lookupRangeWordTest) {
282282
level_t suffix_len_array[5] = {1, 3, 7, 8, 13};
283283
for (int k = 0; k < 5; k++) {
284284
level_t suffix_len = suffix_len_array[k];
285-
//surf_ = new SuRF(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
286-
surf_ = new SuRF();
287-
surf_->create(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
285+
surf_ = new SuRF(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
286+
//surf_ = new SuRF();
287+
//surf_->create(words, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
288288

289289
bool exist = surf_->lookupRange(std::string("\1"), true, words[0], true);
290290
ASSERT_TRUE(exist);
@@ -314,9 +314,9 @@ TEST_F (SuRFUnitTest, lookupRangeIntTest) {
314314
level_t suffix_len_array[5] = {1, 3, 7, 8, 13};
315315
for (int k = 0; k < 5; k++) {
316316
level_t suffix_len = suffix_len_array[k];
317-
//surf_ = new SuRF(ints_, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
318-
surf_ = new SuRF();
319-
surf_->create(ints_, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
317+
surf_ = new SuRF(ints_, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
318+
//surf_ = new SuRF();
319+
//surf_->create(ints_, kIncludeDense, kSparseDenseRatio, kSuffixType, suffix_len);
320320
for (uint64_t i = 0; i < kIntTestBound; i++) {
321321
bool exist = surf_->lookupRange(surf::uint64ToString(i), true,
322322
surf::uint64ToString(i), true);

0 commit comments

Comments
 (0)