stefiosif/reachability-algorithms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: Rename adjMatrix to adjList

Browse Source
This commit is contained in:
stefiosif
2022-10-12 16:57:48 +03:00
parent 8b6d341d18
commit c525aeaa43
14 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/algorithm_test.cc
View File

@@ -40,9 +40,9 @@ TEST_SUITE("Algorithm") {
G.insert(13, 9);
G.insert(12, 10);
REQUIRE_EQ(G.adjMatrix.size(), 13);
REQUIRE_EQ(G.V(), 13);
auto SCCs = algo::Tarjan<std::uint16_t>(G.adjMatrix).execute();
auto SCCs = algo::Tarjan<std::uint16_t>(G.adjList).execute();
std::vector<std::vector<std::uint16_t>> expected = {
{9, 10, 11, 12, 13},
@@ -51,7 +51,7 @@ TEST_SUITE("Algorithm") {
};
for (auto i = 0; i < SCCs.size(); i++) {
auto kv = std::views::keys(SCCs[i].adjMatrix);
auto kv = std::views::keys(SCCs[i].adjList);
CHECK_EQ(std::is_permutation(kv.begin(), kv.end(),
expected[i].begin()), true);
}
@@ -67,12 +67,12 @@ TEST_SUITE("Algorithm") {
}
}
auto SCCs = algo::Tarjan<std::uint16_t>(G.adjMatrix).execute();
auto SCCs = algo::Tarjan<std::uint16_t>(G.adjList).execute();
// Testing whether an scc is a 1-vertex scc which after the normalization
// has no edges, in this case we know tgat there exist no 2-vertex sccs
for (auto& scc : SCCs) {
CHECK_EQ(std::all_of(scc.adjMatrix.begin(), scc.adjMatrix.end(),
CHECK_EQ(std::all_of(scc.adjList.begin(), scc.adjList.end(),
[](const auto& p) {
return p.second.size() == 0;
}), true);
@@ -107,7 +107,7 @@ TEST_SUITE("Algorithm") {
G.insert(12, 10);
auto tree =
algo::BreadthFirstSearch<std::uint16_t>(G.adjMatrix).execute(1);
algo::BreadthFirstSearch<std::uint16_t>(G.adjList).execute(1);
std::map<std::uint16_t, std::set<std::uint16_t>> expected = {
{1, {2}},
@@ -155,7 +155,7 @@ TEST_SUITE("Algorithm") {
G.insert(13, 9);
G.insert(12, 10);
algo::BreadthFirstSearch<std::uint16_t> bfs(G.adjMatrix);
algo::BreadthFirstSearch<std::uint16_t> bfs(G.adjList);
CHECK_EQ(bfs.query(1, 5), true);
CHECK_EQ(bfs.query(1, 10), true);

6
test/decremental_reachability_test.cc
View File

@@ -33,7 +33,7 @@ TEST_SUITE("Decremental Reachability Test") {
G.insert(8, 9);
G.insert(9, 5);
REQUIRE_EQ(G.adjMatrix.size(), 9);
REQUIRE_EQ(G.V(), 9);
algo::RodittyZwick<std::uint16_t> rodittyZwick(G);
rodittyZwick.init();
@@ -85,7 +85,7 @@ TEST_SUITE("Decremental Reachability Test") {
G.insert(7, 9);
G.insert(8, 9);
REQUIRE_EQ(G.adjMatrix.size(), 9);
REQUIRE_EQ(G.V(), 9);
algo::Italiano<std::uint16_t> italiano(G);
italiano.init();
@@ -142,7 +142,7 @@ TEST_SUITE("Decremental Reachability Test") {
G.insert(8, 9);
G.insert(9, 5);
REQUIRE_EQ(G.adjMatrix.size(), 9);
REQUIRE_EQ(G.V(), 9);
algo::Frigioni<std::uint16_t> frigioni(G);
frigioni.init();

4
test/dynamic_reachability_test.cc
View File

@@ -28,7 +28,7 @@ TEST_SUITE("Dynamic Reachability Test") {
G.insert(7, 9);
G.insert(8, 9);
REQUIRE_EQ(G.adjMatrix.size(), 9);
REQUIRE_EQ(G.V(), 9);
algo::King<std::uint16_t> king(G);
king.init();
@@ -92,7 +92,7 @@ TEST_SUITE("Dynamic Reachability Test") {
G.insert(8, 9);
G.insert(9, 5);
REQUIRE_EQ(G.adjMatrix.size(), 9);
REQUIRE_EQ(G.V(), 9);
algo::HenzingerKing<std::uint16_t> henzingerKing(G);
henzingerKing.init();

2
test/graph_test.cc
View File

@@ -116,7 +116,7 @@ TEST_SUITE("Graph") {
REQUIRE_EQ(G.V(), 9);
auto SCCs = algo::Tarjan<std::uint16_t>(G.adjMatrix).execute();
auto SCCs = algo::Tarjan<std::uint16_t>(G.adjList).execute();
std::vector<std::vector<std::uint16_t>> expected = {
{5, 6, 7, 8, 9},