-
Notifications
You must be signed in to change notification settings - Fork 1
Range min max tree baseline #5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
ec3d5f2
range min max tree baseline
6c88648
added descriptions to plot_rmm.py
29ec53a
removed alias and made better field names
b5b7948
replaced struct on class
ed073dd
add descriptions for all methods
71afb04
some organizing
bc36bf0
started using std::popcount
29420d0
removed rmq/rMq shortcuts
9f17e6a
renamed fuzzer
9bd1a90
gtest and benchmark
1e73689
resolved merge conflict with gitignore
cc389f1
Merge branch 'main' into rmM-tree
RSMT98 626de26
clang formatting
45439f1
copy-pasted some tests from unittests
RSMT98 22f2b07
made csv output in bench_rmm optional
RSMT98 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,3 +2,4 @@ build/ | |
| .vscode/ | ||
| Testing/ | ||
| plans/* | ||
| venv/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,279 @@ | ||
| #pragma once | ||
|
RSMT98 marked this conversation as resolved.
|
||
| #include <algorithm> | ||
| #include <cstdint> | ||
| #include <limits> | ||
| #include <string> | ||
| #include <vector> | ||
|
|
||
| class NaiveRmM { | ||
| std::vector<uint8_t> bits; | ||
| std::size_t num_bits = 0; | ||
|
|
||
| public: | ||
| static constexpr std::size_t npos = std::numeric_limits<std::size_t>::max(); | ||
|
|
||
| NaiveRmM() = default; | ||
| explicit NaiveRmM(const std::string& s) { build_from_string(s); } | ||
| NaiveRmM(const std::vector<std::uint64_t>& words, std::size_t nbits) { | ||
| build_from_words(words, nbits); | ||
| } | ||
|
|
||
| private: | ||
| void build_from_string(const std::string& s) { | ||
| num_bits = s.size(); | ||
| bits.resize(num_bits); | ||
| for (std::size_t i = 0; i < num_bits; i++) { | ||
| bits[i] = (s[i] == '1'); | ||
| } | ||
| } | ||
| void build_from_words(const std::vector<std::uint64_t>& words, | ||
| std::size_t nbits) { | ||
| num_bits = nbits; | ||
| bits.assign(num_bits, 0); | ||
| for (std::size_t i = 0; i < num_bits; i++) { | ||
| const std::size_t w = (i >> 6); | ||
| bits[i] = static_cast<uint8_t>( | ||
| ((w < words.size() ? words[w] : 0ull) >> (i & 63)) & 1u); | ||
| } | ||
| } | ||
|
|
||
| inline int bit(std::size_t i) const { return bits[i]; } | ||
|
|
||
| public: | ||
| std::size_t rank1(std::size_t i) const { | ||
| if (i > num_bits) { | ||
| i = num_bits; | ||
| } | ||
| std::size_t c = 0; | ||
| for (std::size_t p = 0; p < i; p++) { | ||
| c += (bits[p] != 0); | ||
| } | ||
| return c; | ||
| } | ||
| std::size_t rank0(std::size_t i) const { return i - rank1(i); } | ||
|
|
||
| // 1-based | ||
| std::size_t select1(std::size_t k) const { | ||
| if (k == 0) { | ||
| return npos; | ||
| } | ||
| for (std::size_t p = 0; p < num_bits; p++) { | ||
| if (bits[p]) { | ||
| if (--k == 0) { | ||
| return p; | ||
| } | ||
| } | ||
| } | ||
| return npos; | ||
| } | ||
|
|
||
| // 1-based | ||
| std::size_t select0(std::size_t k) const { | ||
| if (k == 0) { | ||
| return npos; | ||
| } | ||
| for (std::size_t p = 0; p < num_bits; p++) { | ||
| if (!bits[p]) { | ||
| if (--k == 0) { | ||
| return p; | ||
| } | ||
| } | ||
| } | ||
| return npos; | ||
| } | ||
|
|
||
| std::size_t rank10(std::size_t i) const { | ||
| if (i <= 1) { | ||
| return 0; | ||
| } | ||
| std::size_t c = 0; | ||
| for (std::size_t p = 0; p + 1 < i; ++p) { | ||
| if (bits[p] == 1 && bits[p + 1] == 0) { | ||
| ++c; | ||
| } | ||
| } | ||
| return c; | ||
| } | ||
|
|
||
| // 1-based | ||
| std::size_t select10(std::size_t k) const { | ||
| if (k == 0) { | ||
| return npos; | ||
| } | ||
| for (std::size_t p = 0; p + 1 < num_bits; ++p) { | ||
| if (bits[p] == 1 && bits[p + 1] == 0) { | ||
| if (--k == 0) { | ||
| return p; | ||
| } | ||
| } | ||
| } | ||
| return npos; | ||
| } | ||
|
|
||
| int excess(std::size_t i) const { | ||
| return int(2 * static_cast<long long>(rank1(i)) - | ||
| static_cast<long long>(i)); | ||
| } | ||
|
|
||
| std::size_t fwdsearch(std::size_t i, int d) const { | ||
| if (i >= num_bits) { | ||
| return npos; | ||
| } | ||
| int target = excess(i) + d; | ||
| int cur = excess(i); | ||
| for (std::size_t p = i; p < num_bits; ++p) { | ||
| cur += bits[p] ? +1 : -1; | ||
| if (cur == target) { | ||
| return p; | ||
| } | ||
| } | ||
| return npos; | ||
| } | ||
|
|
||
| std::size_t bwdsearch(std::size_t i, int d) const { | ||
| if (i > num_bits) { | ||
| return npos; | ||
| } | ||
| if (i == 0) { | ||
| return npos; | ||
| } | ||
| int target = excess(i) + d; | ||
|
|
||
| int cur = excess(i); | ||
| for (std::size_t p = i; p > 0;) { | ||
| --p; | ||
| cur += bits[p] ? -1 : +1; | ||
| if (cur == target) { | ||
| return p; | ||
| } | ||
| } | ||
| return npos; | ||
| } | ||
|
|
||
| std::size_t range_min_query_pos(std::size_t i, std::size_t j) const { | ||
| if (i > j || j >= num_bits) { | ||
| return npos; | ||
| } | ||
| int cur = 0, mn = std::numeric_limits<int>::max(); | ||
| std::size_t pos = npos; | ||
| for (std::size_t p = i; p <= j; ++p) { | ||
| cur += bits[p] ? +1 : -1; | ||
| if (cur < mn) { | ||
| mn = cur; | ||
| pos = p; | ||
| } | ||
| } | ||
| return pos; | ||
| } | ||
|
|
||
| int range_min_query_val(std::size_t i, std::size_t j) const { | ||
| if (i > j || j >= num_bits) { | ||
| return 0; | ||
| } | ||
| int cur = 0, mn = std::numeric_limits<int>::max(); | ||
| for (std::size_t p = i; p <= j; ++p) { | ||
| cur += bits[p] ? +1 : -1; | ||
| if (cur < mn) { | ||
| mn = cur; | ||
| } | ||
| } | ||
| return mn; | ||
| } | ||
|
|
||
| std::size_t range_max_query_pos(std::size_t i, std::size_t j) const { | ||
| if (i > j || j >= num_bits) { | ||
| return npos; | ||
| } | ||
| int cur = 0, mx = std::numeric_limits<int>::min(); | ||
| std::size_t pos = npos; | ||
| for (std::size_t p = i; p <= j; ++p) { | ||
| cur += bits[p] ? +1 : -1; | ||
| if (cur > mx) { | ||
| mx = cur; | ||
| pos = p; | ||
| } | ||
| } | ||
| return pos; | ||
| } | ||
|
|
||
| int range_max_query_val(std::size_t i, std::size_t j) const { | ||
| if (i > j || j >= num_bits) { | ||
| return 0; | ||
| } | ||
| int cur = 0, mx = std::numeric_limits<int>::min(); | ||
| for (std::size_t p = i; p <= j; ++p) { | ||
| cur += bits[p] ? +1 : -1; | ||
| if (cur > mx) { | ||
| mx = cur; | ||
| } | ||
| } | ||
| return mx; | ||
| } | ||
|
|
||
| std::size_t mincount(std::size_t i, std::size_t j) const { | ||
| if (i > j || j >= num_bits) { | ||
| return 0; | ||
| } | ||
| int cur = 0, mn = std::numeric_limits<int>::max(); | ||
| for (std::size_t p = i; p <= j; ++p) { | ||
| cur += bits[p] ? +1 : -1; | ||
| if (cur < mn) { | ||
| mn = cur; | ||
| } | ||
| } | ||
| std::size_t cnt = 0; | ||
| cur = 0; | ||
| for (std::size_t p = i; p <= j; ++p) { | ||
| cur += bits[p] ? +1 : -1; | ||
| if (cur == mn) { | ||
| ++cnt; | ||
| } | ||
| } | ||
| return cnt; | ||
| } | ||
|
|
||
| // (1-based q) | ||
| std::size_t minselect(std::size_t i, std::size_t j, std::size_t q) const { | ||
| if (i > j || j >= num_bits || q == 0) { | ||
| return npos; | ||
| } | ||
| int cur = 0, mn = std::numeric_limits<int>::max(); | ||
| for (std::size_t p = i; p <= j; ++p) { | ||
| cur += bits[p] ? +1 : -1; | ||
| if (cur < mn) { | ||
| mn = cur; | ||
| } | ||
| } | ||
| cur = 0; | ||
| for (std::size_t p = i; p <= j; ++p) { | ||
| cur += bits[p] ? +1 : -1; | ||
| if (cur == mn) { | ||
| if (--q == 0) { | ||
| return p; | ||
| } | ||
| } | ||
| } | ||
| return npos; | ||
| } | ||
|
|
||
| std::size_t close(std::size_t i) const { | ||
| if (i >= num_bits) { | ||
| return npos; | ||
| } | ||
| return fwdsearch(i, -1); | ||
| } | ||
| std::size_t open(std::size_t i) const { | ||
| if (i == 0 || i > num_bits) { | ||
| return npos; | ||
| } | ||
| auto r = bwdsearch(i, 0); | ||
| return (r == npos ? npos : r + 1); | ||
| } | ||
| std::size_t enclose(std::size_t i) const { | ||
| if (i == 0 || i > num_bits) { | ||
| return npos; | ||
| } | ||
| auto r = bwdsearch(i, -2); | ||
| return (r == npos ? npos : r + 1); | ||
| } | ||
| }; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.