From 70c7e2998caa77c01e6c605f88257f468b5929e1 Mon Sep 17 00:00:00 2001 From: stefiosif Date: Tue, 11 Oct 2022 15:25:17 +0300 Subject: [PATCH] Add Eext removal in frigioni and tests --- algorithm/frigioni.h | 54 +++++++++++++---- test/decremental_reachability_test.cc | 87 +++++++++++++++------------ 2 files changed, 89 insertions(+), 52 deletions(-) diff --git a/algorithm/frigioni.h b/algorithm/frigioni.h index e782d53..9cb6c78 100644 --- a/algorithm/frigioni.h +++ b/algorithm/frigioni.h @@ -94,7 +94,6 @@ void Frigioni::remove(const std::vector>& edges) { std::vector> Eint; std::vector> Eext; - // Put incoming edge removal requests in the corresponding collection for (const auto& [u, v] : edges) { if (rodittyZwick.query(u, v)) Eint.push_back({ u, v }); @@ -103,25 +102,40 @@ void Frigioni::remove(const std::vector>& edges) { } std::map> H; - - // Handle SCC internal edge removals for (const auto& [u, v] : Eint) { this->G.remove(u, v); rodittyZwick.remove(u, v); if (!rodittyZwick.query(u, v)) { + TC[u][v] = false; auto C = rodittyZwick.getSCCs(); - auto D = E[u]; // or E[v], the component that's been split - E.erase(u); + + E[C[u].id].inc.erase({ u, v }); + E[C[u].id].out.erase({ u, v }); + E[C[u].id].in.erase({ u, v }); + auto D = E[C[u].id]; + E.erase(C[u].id); + + for (const auto& id : std::views::keys(C)) { + if (RT[id].contains(id, v)) { + if (E[C[v].id].inc.size() > 1) + H[id].push(C[v].id); + else { + for (const auto& w : C[id].vertices()) + TC[w][v] = false; + for (const auto& c : E[v].out) + H[id].push(C[c.second].id); + } + RT[id].adjMatrix[u].erase(v); + } + } for (const auto& [w, z] : D.inc) { E[C[z].id].inc.insert({ w, z }); - // check if scc needs hook } for (const auto& [w, z] : D.out) { - E[C[z].id].out.insert({ w, z }); - // check if scc needs hook + E[C[w].id].out.insert({ w, z }); } for (const auto& [w, z] : D.in) { @@ -137,13 +151,26 @@ void Frigioni::remove(const std::vector>& edges) { } } - // Handle SCC external edge removals for (const auto& [u, v] : Eext) { this->G.remove(u, v); - // TODO + auto C = rodittyZwick.getSCCs(); + + for (const auto& id : std::views::keys(C)) { + if (RT[id].contains(id, v)) { + if (E[C[v].id].inc.size() > 1) + H[id].push(C[v].id); + else { + for (const auto& w : C[id].vertices()) + TC[w][v] = false; + for (const auto& c : E[v].out) + H[id].push(C[c.second].id); + } + RT[id].adjMatrix[u].erase(v); + } + } } - // Repair the trees + auto C = rodittyZwick.getSCCs(); for (const auto& id : std::views::keys(rodittyZwick.getSCCs())) { while (H[id].size() > 0) { const auto& h = H[id].top(); @@ -158,7 +185,10 @@ void Frigioni::remove(const std::vector>& edges) { } H[id].pop(); if (!found) { - TC[id][h] = false; + auto C = rodittyZwick.getSCCs(); + for (const auto& w : C[id].vertices()) + TC[w][h] = false; + for (const auto& [u, v] : E[h].out) { H[id].push(v); } diff --git a/test/decremental_reachability_test.cc b/test/decremental_reachability_test.cc index ca41977..12c6731 100644 --- a/test/decremental_reachability_test.cc +++ b/test/decremental_reachability_test.cc @@ -9,58 +9,58 @@ using namespace graph; TEST_SUITE("Decremental Reachability Test") { TEST_CASE("RodittyZwick") { - // 1 --> 2 --> 3 --> 1 - // 3 --> 4 --> 5 --> 3 - // 2 --> 6 --> 7 --> 8 --> 6 - // 7 --> 9 - // 6 --> 9 --> 10 --> 11 --> 12 --> 13 --> 9 - // 12 --> 10 + // 1 --> 2 --> 4 --> 6 --> 8 --> 9 --> 5 + // 4 --> 5 --> 7 --> 8 + // 5 --> 6 + // 7 --> 9 + // 2 --> 3 --> 1 + // 3 --> 5 + // 3 --> 9 Digraph G; G.insert(1, 2); + G.insert(2, 4); G.insert(2, 3); G.insert(3, 1); - G.insert(3, 4); + G.insert(3, 5); + G.insert(3, 9); G.insert(4, 5); - G.insert(5, 3); - G.insert(2, 6); - G.insert(6, 7); + G.insert(4, 6); + G.insert(5, 6); + G.insert(5, 7); + G.insert(6, 8); G.insert(7, 8); G.insert(7, 9); - G.insert(8, 6); - G.insert(6, 9); - G.insert(9, 10); - G.insert(10, 11); - G.insert(11, 12); - G.insert(12, 13); - G.insert(13, 9); - G.insert(12, 10); + G.insert(8, 9); + G.insert(9, 5); - REQUIRE_EQ(G.adjMatrix.size(), 13); + REQUIRE_EQ(G.adjMatrix.size(), 9); algo::RodittyZwick rodittyZwick(G); rodittyZwick.init(); SUBCASE("RodittyZwick::query") { - CHECK_EQ(rodittyZwick.query(1, 5), true); - CHECK_EQ(rodittyZwick.query(1, 7), false); - CHECK_EQ(rodittyZwick.query(1, 9), false); + CHECK_EQ(rodittyZwick.query(1, 2), true); + CHECK_EQ(rodittyZwick.query(1, 4), false); + CHECK_EQ(rodittyZwick.query(3, 9), false); } SUBCASE("RodittyZwick::remove") { - rodittyZwick.remove(12, 10); + rodittyZwick.remove(7, 8); - CHECK_EQ(rodittyZwick.query(12, 10), true); - CHECK_EQ(rodittyZwick.query(11, 10), true); + CHECK_EQ(rodittyZwick.query(7, 8), true); + CHECK_EQ(rodittyZwick.query(4, 8), false); - rodittyZwick.remove(9, 10); + rodittyZwick.remove(6, 8); - CHECK_EQ(rodittyZwick.query(12, 13), false); - CHECK_EQ(rodittyZwick.query(10, 12), false); + CHECK_EQ(rodittyZwick.query(5, 7), true); + CHECK_EQ(rodittyZwick.query(6, 8), false); + CHECK_EQ(rodittyZwick.query(5, 6), false); - rodittyZwick.remove(2, 6); + rodittyZwick.remove(3, 1); - CHECK_EQ(rodittyZwick.query(5, 8), false); - CHECK_EQ(rodittyZwick.query(6, 8), true); + CHECK_EQ(rodittyZwick.query(1, 2), false); + CHECK_EQ(rodittyZwick.query(1, 3), false); + CHECK_EQ(rodittyZwick.query(2, 3), false); } } @@ -156,17 +156,24 @@ TEST_SUITE("Decremental Reachability Test") { CHECK_EQ(frigioni.query(5, 4), false); CHECK_EQ(frigioni.query(6, 1), false); } - /* + SUBCASE("Frigioni::remove") { - frigioni.remove(4, 6); - - CHECK_EQ(frigioni.query(1, 8), true); - CHECK_EQ(frigioni.query(3, 6), true); - - frigioni.remove(4, 6); + frigioni.remove({ {7, 8}, {6, 8}, {3, 1} }); + CHECK_EQ(frigioni.query(1, 3), true); CHECK_EQ(frigioni.query(1, 9), true); - CHECK_EQ(frigioni.query(1, 6), false); - }*/ + CHECK_EQ(frigioni.query(4, 5), true); + CHECK_EQ(frigioni.query(3, 1), false); + CHECK_EQ(frigioni.query(6, 8), false); + CHECK_EQ(frigioni.query(7, 8), false); + CHECK_EQ(frigioni.query(1, 8), false); + CHECK_EQ(frigioni.query(8, 4), false); + + frigioni.remove({ {4, 5}, {5, 6} }); + + CHECK_EQ(frigioni.query(2, 9), true); + CHECK_EQ(frigioni.query(9, 6), false); + CHECK_EQ(frigioni.query(4, 6), false); + } } } \ No newline at end of file