BlackMATov/flat.hpp
1
0
Fork 0
mirror of https://github.com/BlackMATov/flat.hpp.git synced 2025-12-13 09:45:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

remove O(n^2) complexity from range and initialiser list inserts #7

Browse Source
This commit is contained in:
Matvey Cherevko
2019-05-31 05:29:54 +07:00
parent 36a517d927
commit d906bf57e0
9 changed files with 81 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
headers/flat.hpp/detail/eq_compare.hpp Normal file
View File

@@ -0,0 +1,25 @@
/*******************************************************************************
* This file is part of the "https://github.com/blackmatov/flat.hpp"
* For conditions of distribution and use, see copyright notice in LICENSE.md
* Copyright (C) 2019, by Matvey Cherevko (blackmatov@gmail.com)
******************************************************************************/
#pragma once
namespace flat_hpp::detail
{
template < typename Compare >
class eq_compare : public Compare {
public:
eq_compare() = default;
eq_compare(const Compare& compare)
: Compare(compare) {}
template < typename L, typename R >
bool operator()(const L& l, const R& r) const {
return !Compare::operator()(l, r)
&& !Compare::operator()(r, l);
}
};
}

11
headers/flat.hpp/flat_map.hpp
View File

@@ -15,6 +15,7 @@
#include <type_traits>
#include <initializer_list>
#include "detail/eq_compare.hpp"
#include "detail/pair_compare.hpp"
#include "detail/is_transparent.hpp"
@@ -319,9 +320,13 @@ namespace flat_hpp
template < typename InputIter >
void insert(InputIter first, InputIter last) {
while ( first != last ) {
insert(*first++);
}
const auto mid_iter = data_.insert(data_.end(), first, last);
std::sort(mid_iter, data_.end(), value_comp());
std::inplace_merge(data_.begin(), mid_iter, data_.end());
data_.erase(
std::unique(data_.begin(), data_.end(),
detail::eq_compare<value_compare>(value_comp())),
data_.end());
}
void insert(std::initializer_list<value_type> ilist) {

7
headers/flat.hpp/flat_multimap.hpp
View File

@@ -15,6 +15,7 @@
#include <type_traits>
#include <initializer_list>
#include "detail/eq_compare.hpp"
#include "detail/pair_compare.hpp"
#include "detail/is_transparent.hpp"
@@ -315,9 +316,9 @@ namespace flat_hpp
template < typename InputIter >
void insert(InputIter first, InputIter last) {
while ( first != last ) {
insert(*first++);
}
const auto mid_iter = data_.insert(data_.end(), first, last);
std::sort(mid_iter, data_.end(), value_comp());
std::inplace_merge(data_.begin(), mid_iter, data_.end());
}
void insert(std::initializer_list<value_type> ilist) {

7
headers/flat.hpp/flat_multiset.hpp
View File

@@ -15,6 +15,7 @@
#include <type_traits>
#include <initializer_list>
#include "detail/eq_compare.hpp"
#include "detail/is_transparent.hpp"
namespace flat_hpp
@@ -242,9 +243,9 @@ namespace flat_hpp
template < typename InputIter >
void insert(InputIter first, InputIter last) {
while ( first != last ) {
insert(*first++);
}
const auto mid_iter = data_.insert(data_.end(), first, last);
std::sort(mid_iter, data_.end(), value_comp());
std::inplace_merge(data_.begin(), mid_iter, data_.end());
}
void insert(std::initializer_list<value_type> ilist) {

11
headers/flat.hpp/flat_set.hpp
View File

@@ -15,6 +15,7 @@
#include <type_traits>
#include <initializer_list>
#include "detail/eq_compare.hpp"
#include "detail/is_transparent.hpp"
namespace flat_hpp
@@ -246,9 +247,13 @@ namespace flat_hpp
template < typename InputIter >
void insert(InputIter first, InputIter last) {
while ( first != last ) {
insert(*first++);
}
const auto mid_iter = data_.insert(data_.end(), first, last);
std::sort(mid_iter, data_.end(), value_comp());
std::inplace_merge(data_.begin(), mid_iter, data_.end());
data_.erase(
std::unique(data_.begin(), data_.end(),
detail::eq_compare<value_compare>(value_comp())),
data_.end());
}
void insert(std::initializer_list<value_type> ilist) {

8
untests/flat_map_tests.cpp
View File

@@ -342,6 +342,14 @@ TEST_CASE("flat_map") {
REQUIRE(i6 == s0.end() - 1);
REQUIRE(s0 == map_t{{0,21},{1,42},{2,42},{3,84},{4,84},{5,100500},{6,100500}});
}
{
map_t s0;
s0.insert({{6,2},{4,6},{2,4},{4,2}});
REQUIRE(s0 == map_t{{2,4},{4,6},{6,2}});
s0.insert({{9,3},{7,5},{3,9},{5,3},{5,3}});
REQUIRE(s0 == map_t{{2,4},{3,9},{4,6},{5,3},{6,2},{7,5},{9,3}});
}
}
SECTION("erasers") {
using map_t = flat_map<int, unsigned>;

8
untests/flat_multimap_tests.cpp
View File

@@ -342,6 +342,14 @@ TEST_CASE("flat_multimap") {
REQUIRE(i6 == s0.end() - 1);
REQUIRE(s0 == map_t{{0,21},{1,42},{1,21},{2,42},{3,84},{4,84},{5,100500},{6,100500}});
}
{
map_t s0;
s0.insert({{6,2},{4,6},{2,4},{4,2}});
REQUIRE(s0 == map_t{{2,4},{4,6},{4,2},{6,2}});
s0.insert({{9,3},{7,5},{3,9},{5,3},{5,3}});
REQUIRE(s0 == map_t{{2,4},{3,9},{4,6},{4,2},{5,3},{5,3},{6,2},{7,5},{9,3}});
}
}
SECTION("erasers") {
using map_t = flat_multimap<int, unsigned>;

8
untests/flat_multiset_tests.cpp
View File

@@ -318,6 +318,14 @@ TEST_CASE("flat_multiset") {
s0.emplace_hint(s0.cend(), 6); // 1,2,3,3,4,5,6
REQUIRE(s0 == set_t{1,2,3,3,4,5,6});
}
{
set_t s0;
s0.insert({6,4,2,4});
REQUIRE(s0 == set_t{2,4,4,6});
s0.insert({9,7,3,5,5});
REQUIRE(s0 == set_t{2,3,4,4,5,5,6,7,9});
}
}
SECTION("erasers") {
using set_t = flat_multiset<int>;

8
untests/flat_set_tests.cpp
View File

@@ -318,6 +318,14 @@ TEST_CASE("flat_set") {
s0.emplace_hint(s0.cend(), 6);
REQUIRE(s0 == set_t{1,2,3,4,5,6});
}
{
set_t s0;
s0.insert({6,4,2,4});
REQUIRE(s0 == set_t{2,4,6});
s0.insert({9,7,3,5,5});
REQUIRE(s0 == set_t{2,3,4,5,6,7,9});
}
}
SECTION("erasers") {
using set_t = flat_set<int>;