From 119ade14dd338781580e6f0134b231f5cebe98c0 Mon Sep 17 00:00:00 2001 From: Maxim Pimenov Date: Tue, 4 Aug 2015 20:11:43 +0300 Subject: [PATCH] [omim] [coding] Moved current implementation of compressed bit vectors. --- coding/coding.pro | 3 ++- coding/coding_tests/coding_tests.pro | 2 +- ...test.cpp => old_compressed_bit_vector_test.cpp} | 2 +- ...it_vector.cpp => old_compressed_bit_vector.cpp} | 8 ++++---- ...it_vector.hpp => old_compressed_bit_vector.hpp} | 2 +- indexer/string_file_values.hpp | 2 +- xcode/coding/coding.xcodeproj/project.pbxproj | 14 +++++++------- 7 files changed, 17 insertions(+), 16 deletions(-) rename coding/coding_tests/{compressed_bit_vector_test.cpp => old_compressed_bit_vector_test.cpp} (98%) rename coding/{compressed_bit_vector.cpp => old_compressed_bit_vector.cpp} (99%) rename coding/{compressed_bit_vector.hpp => old_compressed_bit_vector.hpp} (99%) diff --git a/coding/coding.pro b/coding/coding.pro index 71b5bdee05..237fb51f21 100644 --- a/coding/coding.pro +++ b/coding/coding.pro @@ -16,6 +16,7 @@ SOURCES += \ # blob_indexer.cpp \ # blob_storage.cpp \ compressed_bit_vector.cpp \ + old_compressed_bit_vector.cpp \ # compressed_varnum_vector.cpp \ file_container.cpp \ file_name_utils.cpp \ @@ -51,7 +52,7 @@ HEADERS += \ byte_stream.hpp \ coder.hpp \ coder_util.hpp \ - compressed_bit_vector.hpp \ + old_compressed_bit_vector.hpp \ # compressed_varnum_vector.hpp \ constants.hpp \ dd_vector.hpp \ diff --git a/coding/coding_tests/coding_tests.pro b/coding/coding_tests/coding_tests.pro index 3cffa4501f..634cb43432 100644 --- a/coding/coding_tests/coding_tests.pro +++ b/coding/coding_tests/coding_tests.pro @@ -17,7 +17,7 @@ SOURCES += ../../testing/testingmain.cpp \ bit_streams_test.cpp \ # blob_storage_test.cpp \ coder_util_test.cpp \ - compressed_bit_vector_test.cpp \ + old_compressed_bit_vector_test.cpp \ # compressed_varnum_vector_test.cpp \ dd_vector_test.cpp \ diff_test.cpp \ diff --git a/coding/coding_tests/compressed_bit_vector_test.cpp b/coding/coding_tests/old_compressed_bit_vector_test.cpp similarity index 98% rename from coding/coding_tests/compressed_bit_vector_test.cpp rename to coding/coding_tests/old_compressed_bit_vector_test.cpp index 7ab0a82a21..599eaa1acc 100644 --- a/coding/coding_tests/compressed_bit_vector_test.cpp +++ b/coding/coding_tests/old_compressed_bit_vector_test.cpp @@ -1,6 +1,6 @@ #include "testing/testing.hpp" -#include "coding/compressed_bit_vector.hpp" +#include "coding/old_compressed_bit_vector.hpp" #include "coding/reader.hpp" #include "coding/writer.hpp" diff --git a/coding/compressed_bit_vector.cpp b/coding/old_compressed_bit_vector.cpp similarity index 99% rename from coding/compressed_bit_vector.cpp rename to coding/old_compressed_bit_vector.cpp index d9a24d598b..1c1b2c546c 100644 --- a/coding/compressed_bit_vector.cpp +++ b/coding/old_compressed_bit_vector.cpp @@ -1,4 +1,4 @@ -#include "coding/compressed_bit_vector.hpp" +#include "coding/old_compressed_bit_vector.hpp" #include "coding/arithmetic_codec.hpp" #include "coding/bit_streams.hpp" @@ -154,7 +154,7 @@ void BuildCompressedBitVector(Writer & writer, vector const & posOnes, else if (encType == 2) { // Diffs-Arith encoding. - + // Encode encoding type plus number of freqs in the table. VarintEncode(writer, encType + (nonzeroDiffsSizesFreqsEnd << 2)); // Encode freqs table. @@ -214,7 +214,7 @@ void BuildCompressedBitVector(Writer & writer, vector const & posOnes, else if (encType == 1) { // Ranges-Varint encoding. - + // If bit vector starts with 1. bool isFirstOne = posOnes.size() > 0 && posOnes.front() == 0; // Encode encoding type plus flag if first is 1. @@ -435,7 +435,7 @@ vector DecodeCompressedBitVector(Reader & reader) { else if (encType == 1) { // Ranges-Varint encoding. - + // If bit vector starts with 1. bool isFirstOne = ((header >> 2) & 1) == 1; uint64_t sum = 0; diff --git a/coding/compressed_bit_vector.hpp b/coding/old_compressed_bit_vector.hpp similarity index 99% rename from coding/compressed_bit_vector.hpp rename to coding/old_compressed_bit_vector.hpp index 78b459429a..c66628dc82 100644 --- a/coding/compressed_bit_vector.hpp +++ b/coding/old_compressed_bit_vector.hpp @@ -86,7 +86,7 @@ vector BitVectorsOr(It1T begin1, It1T end1, It2T begin2, It2T end2) else if (pos1 < pos2) { result.push_back(pos1); - ++it1; + ++it1; } else // pos1 > pos2 { diff --git a/indexer/string_file_values.hpp b/indexer/string_file_values.hpp index ca04a43198..d75e449371 100644 --- a/indexer/string_file_values.hpp +++ b/indexer/string_file_values.hpp @@ -1,6 +1,6 @@ #pragma once -#include "coding/compressed_bit_vector.hpp" +#include "coding/old_compressed_bit_vector.hpp" #include "coding/read_write_utils.hpp" #include "coding/write_to_sink.hpp" diff --git a/xcode/coding/coding.xcodeproj/project.pbxproj b/xcode/coding/coding.xcodeproj/project.pbxproj index beeff513cd..d4fd7ad1b3 100644 --- a/xcode/coding/coding.xcodeproj/project.pbxproj +++ b/xcode/coding/coding.xcodeproj/project.pbxproj @@ -36,8 +36,8 @@ 6753428C1A3F588C00A0A8C3 /* byte_stream.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675342351A3F588B00A0A8C3 /* byte_stream.hpp */; }; 6753428F1A3F588C00A0A8C3 /* coder_util.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675342381A3F588B00A0A8C3 /* coder_util.hpp */; }; 675342901A3F588C00A0A8C3 /* coder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675342391A3F588B00A0A8C3 /* coder.hpp */; }; - 675342911A3F588C00A0A8C3 /* compressed_bit_vector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753423A1A3F588B00A0A8C3 /* compressed_bit_vector.cpp */; }; - 675342921A3F588C00A0A8C3 /* compressed_bit_vector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753423B1A3F588B00A0A8C3 /* compressed_bit_vector.hpp */; }; + 675342911A3F588C00A0A8C3 /* old_compressed_bit_vector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753423A1A3F588B00A0A8C3 /* old_compressed_bit_vector.cpp */; }; + 675342921A3F588C00A0A8C3 /* old_compressed_bit_vector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753423B1A3F588B00A0A8C3 /* old_compressed_bit_vector.hpp */; }; 675342931A3F588C00A0A8C3 /* compressed_varnum_vector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753423C1A3F588B00A0A8C3 /* compressed_varnum_vector.cpp */; }; 675342941A3F588C00A0A8C3 /* compressed_varnum_vector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753423D1A3F588B00A0A8C3 /* compressed_varnum_vector.hpp */; }; 675342951A3F588C00A0A8C3 /* constants.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6753423E1A3F588B00A0A8C3 /* constants.hpp */; }; @@ -182,8 +182,8 @@ 675342351A3F588B00A0A8C3 /* byte_stream.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = byte_stream.hpp; sourceTree = ""; }; 675342381A3F588B00A0A8C3 /* coder_util.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = coder_util.hpp; sourceTree = ""; }; 675342391A3F588B00A0A8C3 /* coder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = coder.hpp; sourceTree = ""; }; - 6753423A1A3F588B00A0A8C3 /* compressed_bit_vector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = compressed_bit_vector.cpp; sourceTree = ""; }; - 6753423B1A3F588B00A0A8C3 /* compressed_bit_vector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = compressed_bit_vector.hpp; sourceTree = ""; }; + 6753423A1A3F588B00A0A8C3 /* old_compressed_bit_vector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = old_compressed_bit_vector.cpp; sourceTree = ""; }; + 6753423B1A3F588B00A0A8C3 /* old_compressed_bit_vector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = old_compressed_bit_vector.hpp; sourceTree = ""; }; 6753423C1A3F588B00A0A8C3 /* compressed_varnum_vector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = compressed_varnum_vector.cpp; sourceTree = ""; }; 6753423D1A3F588B00A0A8C3 /* compressed_varnum_vector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = compressed_varnum_vector.hpp; sourceTree = ""; }; 6753423E1A3F588B00A0A8C3 /* constants.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = constants.hpp; sourceTree = ""; }; @@ -411,8 +411,8 @@ 675342351A3F588B00A0A8C3 /* byte_stream.hpp */, 675342381A3F588B00A0A8C3 /* coder_util.hpp */, 675342391A3F588B00A0A8C3 /* coder.hpp */, - 6753423A1A3F588B00A0A8C3 /* compressed_bit_vector.cpp */, - 6753423B1A3F588B00A0A8C3 /* compressed_bit_vector.hpp */, + 6753423A1A3F588B00A0A8C3 /* old_compressed_bit_vector.cpp */, + 6753423B1A3F588B00A0A8C3 /* old_compressed_bit_vector.hpp */, 6753423C1A3F588B00A0A8C3 /* compressed_varnum_vector.cpp */, 6753423D1A3F588B00A0A8C3 /* compressed_varnum_vector.hpp */, 6753423E1A3F588B00A0A8C3 /* constants.hpp */, @@ -690,7 +690,7 @@ 675342871A3F588C00A0A8C3 /* blob_indexer.cpp in Sources */, 675342D31A3F588C00A0A8C3 /* zip_reader.cpp in Sources */, 675342931A3F588C00A0A8C3 /* compressed_varnum_vector.cpp in Sources */, - 675342911A3F588C00A0A8C3 /* compressed_bit_vector.cpp in Sources */, + 675342911A3F588C00A0A8C3 /* old_compressed_bit_vector.cpp in Sources */, 6753429F1A3F588C00A0A8C3 /* file_reader.cpp in Sources */, 675342C51A3F588C00A0A8C3 /* uri.cpp in Sources */, 675342BB1A3F588C00A0A8C3 /* reader.cpp in Sources */,