EmaMaker
/
voxel-engine
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intervalmap: solve bugs with insertion, printing and retrival

vertex-deduplication
EmaMaker 2023-03-20 22:56:29 +01:00
parent 8040868055
commit e18a2cca05
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/intervalmap.hpp
View File

@ -26,14 +26,9 @@ public:
const auto &tmp = treemap.lower_bound(end); const auto &tmp = treemap.lower_bound(end);
const auto &end_prev_entry = tmp != treemap.begin() && tmp != treemap.end() ? std::prev(tmp) : tmp; // first element before end const auto &end_prev_entry = tmp != treemap.begin() && tmp != treemap.end() ? std::prev(tmp) : tmp; // first element before end
const auto &end_next_entry = treemap.upper_bound(end); // first element after end const auto &end_next_entry = tmp; // first element after end
const auto &tmp1 = treemap.lower_bound(start);
const auto &start_entry = tmp1 != treemap.begin() && tmp1 != treemap.end() ? std::prev(tmp1) : tmp1; // first element before start
V v{}; V v{};
// insert the start key. Replaces whatever value is already there. Do not place if the element before is of the same value
treemap[start] = value;
if (end_next_entry == treemap.end()) if (end_next_entry == treemap.end())
{ {
if (end_prev_entry != treemap.end() && end_prev_entry->first > start) if (end_prev_entry != treemap.end() && end_prev_entry->first > start)
@ -43,11 +38,13 @@ public:
} }
else else
{ {
if (end_next_entry->first > end + 1) if(end_next_entry->first != end)
treemap[end] = (V)(end_prev_entry->second); treemap[end] = end_prev_entry->second;
} }
// insert the start key. Replaces whatever value is already there. Do not place if the element before is of the same value
treemap[start] = value;
treemap.erase(treemap.upper_bound(start), treemap.lower_bound(end)); treemap.erase(treemap.upper_bound(start), treemap.lower_bound(end));
} }
void remove(int at) void remove(int at)
@ -57,14 +54,16 @@ public:
V at(int index) V at(int index)
{ {
return treemap.lower_bound(index)->second; const auto tmp = treemap.lower_bound(index);
const auto r = tmp != treemap.begin() && tmp->first!=index ? std::prev(tmp) : tmp;
return r->second;
} }
void print() void print()
{ {
for (auto i = treemap.begin(); i != treemap.end(); i++) for (auto i = treemap.begin(); i != treemap.end(); i++)
std::cout << i->first << ": " << (int)(i->second) << "\n"; std::cout << i->first << ": " << (int)(i->second) << "\n";
std::cout << "end key: " << std::prev(treemap.end())->first << "\n"; if(!treemap.empty()) std::cout << "end key: " << std::prev(treemap.end())->first << "\n";
} }
std::unique_ptr<V[]> toArray(int *length) std::unique_ptr<V[]> toArray(int *length)