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

Make class Graph abstract and make derived classes Digraph and SCC

Browse Source
This commit is contained in:
stefiosif
2022-06-12 00:49:42 +03:00
parent b5b031db7f
commit 72741a6a5b
7 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
test/algorithm_test.cc
View File

@@ -1,17 +1,19 @@
#include <doctest/doctest.h>
#include "graph/graph.h"
using namespace graph;
#include "graph/digraph.h"
#include "graph/scc.h"
#include "algorithm/tarjan.h"
#include "algorithm/bfs.h"
using namespace graph;
TEST_SUITE("Algorithm.") {
TEST_CASE("Tarjan T_1") {
// 1 --> 2 --> 4 --> 1
// 2 --> 3 --> 5 --> 7 --> 3
// 5 --> 9 --> 6 --> 8 --> 9
Graph<std::uint16_t> G;
Digraph<std::uint16_t> G;
G.insert(1, 2);
G.insert(2, 3);
G.insert(2, 4);
@@ -28,26 +30,23 @@ TEST_SUITE("Algorithm.") {
algo::Tarjan<std::uint16_t> tarjan(G);
auto result = tarjan.run();
std::sort(result.begin(), result.end());
std::for_each(result.begin(), result.end(), [&](std::vector<std::uint16_t>& row) {
std::sort(row.begin(), row.end());
});
for (auto& scc : result) {
scc.output();
}
std::vector<std::vector<std::uint16_t>> expected{
{1, 2, 4},
{3, 5, 7},
{6, 8, 9}
};
CHECK_EQ(expected, result);
}
TEST_CASE("Tarjan T_2") {
// 1 --> 2 --> 5 --> 7 --> 2
// 1 --> 4 --> 3 --> 1
// 4 --> 6 --> 3
Graph<std::uint16_t> G;
Digraph<std::uint16_t> G;
G.insert(1, 2);
G.insert(1, 4);
G.insert(2, 5);
@@ -63,24 +62,17 @@ TEST_SUITE("Algorithm.") {
algo::Tarjan<std::uint16_t> tarjan(G);
auto result = tarjan.run();
std::sort(result.begin(), result.end());
std::for_each(result.begin(), result.end(), [&](std::vector<std::uint16_t>& row) {
std::sort(row.begin(), row.end());
});
std::vector<std::vector<std::uint16_t>> expected{
{1, 3, 4, 6},
{2, 5, 7}
};
CHECK_EQ(expected, result);
}
TEST_CASE("BFS T_1") {
// 1 --> 2 --> 5 --> 7 --> 2
// 1 --> 4 --> 3 --> 1
// 4 --> 6 --> 3
Graph<std::uint16_t> G;
Digraph<std::uint16_t> G;
G.insert(1, 2);
G.insert(1, 4);
G.insert(2, 5);

16
test/graph_test.cc
View File

@@ -1,16 +1,20 @@
#include <doctest/doctest.h>
#include "graph/scc.h"
using namespace graph;
#include "graph/digraph.h"
#include "algorithm/tarjan.h"
#include <vector>
using namespace graph;
TEST_SUITE("Graph.") {
TEST_CASE("SCC") {
// 1 --> 2 --> 4 --> 1
// 2 --> 3 --> 5 --> 7 --> 3
// 5 --> 9 --> 6 --> 8 --> 9
Graph<std::uint16_t> G;
Digraph<std::uint16_t> G;
G.insert(1, 2);
G.insert(2, 3);
G.insert(2, 4);
@@ -24,12 +28,6 @@ TEST_SUITE("Graph.") {
G.insert(9, 6);
algo::Tarjan<std::uint16_t> tarjan(G);
auto tarjanOutput = tarjan.run();
std::vector<SCC<std::uint16_t>> SCCs;
for (const auto& scc : tarjanOutput) {
SCCs.push_back(scc);
}
auto SCCs = tarjan.run();
}
}