tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use implicitly namespace td in set with position tests.

Browse Source
This commit is contained in:
levlam 2022-01-16 22:34:38 +03:00
parent 338292c278
commit 90e130f03c
1 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
test/set_with_position.cpp
View File

@ -17,8 +17,6 @@
#include <set> #include <set>
#include <utility> #include <utility>
using namespace td;
template <class T> template <class T>
class OldSetWithPosition { class OldSetWithPosition {
public: public:
@ -33,7 +31,7 @@ class OldSetWithPosition {
if (it == values_.end()) { if (it == values_.end()) {
return; return;
} }
size_t i = it - values_.begin(); std::size_t i = it - values_.begin();
values_.erase(it); values_.erase(it);
if (pos_ > i) { if (pos_ > i) {
pos_--; pos_--;
@ -51,25 +49,25 @@ class OldSetWithPosition {
} }
void merge(OldSetWithPosition &&other) { void merge(OldSetWithPosition &&other) {
OldSetWithPosition res; OldSetWithPosition res;
for (size_t i = 0; i < pos_; i++) { for (std::size_t i = 0; i < pos_; i++) {
res.add(values_[i]); res.add(values_[i]);
} }
for (size_t i = 0; i < other.pos_; i++) { for (std::size_t i = 0; i < other.pos_; i++) {
res.add(other.values_[i]); res.add(other.values_[i]);
} }
res.pos_ = res.values_.size(); res.pos_ = res.values_.size();
for (size_t i = pos_; i < values_.size(); i++) { for (std::size_t i = pos_; i < values_.size(); i++) {
res.add(values_[i]); res.add(values_[i]);
} }
for (size_t i = other.pos_; i < other.values_.size(); i++) { for (std::size_t i = other.pos_; i < other.values_.size(); i++) {
res.add(other.values_[i]); res.add(other.values_[i]);
} }
*this = std::move(res); *this = std::move(res);
} }
private: private:
std::vector<T> values_; td::vector<T> values_;
size_t pos_{0}; std::size_t pos_{0};
}; };
template <class T, template <class> class SetWithPosition> template <class T, template <class> class SetWithPosition>
@ -126,25 +124,24 @@ class CheckedSetWithPosition {
} }
s_.merge(std::move(other.s_)); s_.merge(std::move(other.s_));
} }
size_t size() const { std::size_t size() const {
return checked_.size() + not_checked_.size(); return checked_.size() + not_checked_.size();
} }
private: private:
std::set<T> checked_; std::set<T> checked_;
std::set<T> not_checked_; std::set<T> not_checked_;
SetWithPosition<T> s_; td::SetWithPosition<T> s_;
}; };
template <template <class> class RawSet> template <template <class> class RawSet>
static void test_hands() { static void test_hands() {
using Set = CheckedSetWithPosition<int, RawSet>; CheckedSetWithPosition<int, RawSet> a;
Set a;
a.add(1); a.add(1);
a.add(2); a.add(2);
a.next(); a.next();
Set b;
CheckedSetWithPosition<int, RawSet> b;
b.add(1); b.add(1);
b.add(3); b.add(3);
@ -157,12 +154,12 @@ static void test_hands() {
#if !TD_CLANG #if !TD_CLANG
template <template <class> class RawSet> template <template <class> class RawSet>
static void test_stress() { static void test_stress() {
Random::Xorshift128plus rnd(123); td::Random::Xorshift128plus rnd(123);
using Set = CheckedSetWithPosition<int, RawSet>; using Set = CheckedSetWithPosition<int, RawSet>;
for (int t = 0; t < 10; t++) { for (int t = 0; t < 10; t++) {
std::vector<unique_ptr<Set>> sets(100); td::vector<td::unique_ptr<Set>> sets(100);
for (auto &s : sets) { for (auto &s : sets) {
s = make_unique<Set>(); s = td::make_unique<Set>();
} }
int n; int n;
auto merge = [&] { auto merge = [&] {
@ -202,7 +199,7 @@ static void test_stress() {
std::function<void()> func; std::function<void()> func;
td::uint32 weight; td::uint32 weight;
}; };
std::vector<Step> steps{{merge, 1}, {next, 10}, {add, 10}, {remove, 10}, {reset_position, 5}}; td::vector<Step> steps{{merge, 1}, {next, 10}, {add, 10}, {remove, 10}, {reset_position, 5}};
td::uint32 steps_sum = 0; td::uint32 steps_sum = 0;
for (auto &step : steps) { for (auto &step : steps) {
steps_sum += step.weight; steps_sum += step.weight;
@ -228,13 +225,13 @@ static void test_stress() {
template <template <class> class RawSet> template <template <class> class RawSet>
static void test_speed() { static void test_speed() {
Random::Xorshift128plus rnd(123); td::Random::Xorshift128plus rnd(123);
using Set = CheckedSetWithPosition<int, RawSet>; using Set = CheckedSetWithPosition<int, RawSet>;
const size_t total_size = 1 << 13; const size_t total_size = 1 << 13;
std::vector<unique_ptr<Set>> sets(total_size); td::vector<td::unique_ptr<Set>> sets(total_size);
for (size_t i = 0; i < sets.size(); i++) { for (size_t i = 0; i < sets.size(); i++) {
sets[i] = make_unique<Set>(); sets[i] = td::make_unique<Set>();
sets[i]->add(narrow_cast<int>(i)); sets[i]->add(td::narrow_cast<int>(i));
} }
for (size_t d = 1; d < sets.size(); d *= 2) { for (size_t d = 1; d < sets.size(); d *= 2) {
for (size_t i = 0; i < sets.size(); i += 2 * d) { for (size_t i = 0; i < sets.size(); i += 2 * d) {
@ -247,20 +244,20 @@ static void test_speed() {
} }
TEST(SetWithPosition, hands) { TEST(SetWithPosition, hands) {
test_hands<FastSetWithPosition>(); test_hands<td::FastSetWithPosition>();
test_hands<OldSetWithPosition>(); test_hands<OldSetWithPosition>();
test_hands<SetWithPosition>(); test_hands<td::SetWithPosition>();
} }
#if !TD_CLANG #if !TD_CLANG
TEST(SetWithPosition, stress) { TEST(SetWithPosition, stress) {
test_stress<FastSetWithPosition>(); test_stress<td::FastSetWithPosition>();
test_stress<OldSetWithPosition>(); test_stress<OldSetWithPosition>();
test_stress<SetWithPosition>(); test_stress<td::SetWithPosition>();
} }
#endif #endif
TEST(SetWithPosition, speed) { TEST(SetWithPosition, speed) {
test_speed<FastSetWithPosition>(); test_speed<td::FastSetWithPosition>();
test_speed<SetWithPosition>(); test_speed<td::SetWithPosition>();
} }