allow removal of nodes!

main
Brett 2024-07-30 02:38:47 -04:00
parent b328c17a13
commit 780c8ac25a
4 changed files with 39 additions and 5 deletions

View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.25) cmake_minimum_required(VERSION 3.25)
project(graphs VERSION 0.1.7) project(graphs VERSION 0.1.8)
option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF) option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF)
option(ENABLE_UBSAN "Enable the ub sanitizer" OFF) option(ENABLE_UBSAN "Enable the ub sanitizer" OFF)

View File

@ -75,6 +75,8 @@ struct node_t
struct edge_t struct edge_t
{ {
// fuck you too :3
friend selector_t;
float ideal_spring_length = conf::DEFAULT_SPRING_LENGTH; float ideal_spring_length = conf::DEFAULT_SPRING_LENGTH;
float thickness = conf::DEFAULT_THICKNESS; float thickness = conf::DEFAULT_THICKNESS;
blt::color4 color = conf::EDGE_COLOR; blt::color4 color = conf::EDGE_COLOR;

View File

@ -98,7 +98,7 @@ std::optional<loader_t> loader_t::load_for(engine_t& engine, const blt::gfx::win
auto ideal_length = load_with_default(edge, "length", conf::DEFAULT_SPRING_LENGTH); auto ideal_length = load_with_default(edge, "length", conf::DEFAULT_SPRING_LENGTH);
auto thickness = load_with_default(edge, "thickness", conf::DEFAULT_THICKNESS); auto thickness = load_with_default(edge, "thickness", conf::DEFAULT_THICKNESS);
::edge_t e{graph.names_to_node[index1], graph.names_to_node[index2]}; edge_t e{graph.names_to_node[index1], graph.names_to_node[index2]};
e.ideal_spring_length = ideal_length; e.ideal_spring_length = ideal_length;
e.thickness = thickness; e.thickness = thickness;

View File

@ -192,13 +192,45 @@ void selector_t::destroy_node(blt::i64 node)
{ {
auto& node_v = graph.nodes[node]; auto& node_v = graph.nodes[node];
graph.names_to_node.erase(node_v.name); graph.names_to_node.erase(node_v.name);
erase_if(graph.edges, [node](const edge_t& v) { erase_if(graph.edges, [node](const edge_t& e) {
return static_cast<blt::i64>(v.getFirst()) == node || static_cast<blt::i64>(v.getSecond()) == node; return static_cast<blt::i64>(e.getFirst()) == node || static_cast<blt::i64>(e.getSecond()) == node;
}); });
std::vector<edge_t> corrected_edges;
for (const edge_t& v : graph.edges)
{
auto copy = v;
auto c = static_cast<blt::u64>(node);
if (copy.i1 > c)
copy.i1--;
if (copy.i2 > c)
copy.i2--;
if (v.i1 > c || v.i2 > c)
corrected_edges.push_back(copy);
}
erase_if(graph.edges, [node](const edge_t& e) {
return static_cast<blt::i64>(e.getFirst()) > node || static_cast<blt::i64>(e.getSecond()) > node;
});
for (const auto& v : corrected_edges)
graph.edges.insert(v);
graph.connected_nodes.erase(node); graph.connected_nodes.erase(node);
for (auto& v : graph.connected_nodes) for (auto& v : graph.connected_nodes)
{ {
v.second.erase(node); auto& map = v.second;
// generate the list of corrected nodes.
std::vector<blt::u64> corrected_nodes;
for (auto& n : map)
{
// shift back then nodes after this one by one
if (static_cast<blt::i64>(n) > node)
{
corrected_nodes.push_back(n - 1);
}
}
erase_if(map, [node](blt::u64 n) {
return static_cast<blt::i64>(n) > node;
});
for (const auto& n : corrected_nodes)
map.insert(n);
} }
graph.nodes.erase(graph.nodes.begin() + node); graph.nodes.erase(graph.nodes.begin() + node);