Skip to content

modify TC and CC #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kdeweese merged 1 commit into from
Jan 21, 2025
Merged

modify TC and CC #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions data/tc_test.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ A,E,1
B,C,1
B,D,1
B,E,1
B,F,1
C,D,1
E,C,1
C,E,1
D,E,1
B,F,1
E,F,1
E,G,1
F,H,1
Expand Down
5 changes: 3 additions & 2 deletions include/graph/algorithm/connected_components.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ void kosaraju(G&& g, // graph
template <adjacency_list G,
random_access_range Component>
requires random_access_range<vertex_range_t<G>> && integral<vertex_id_t<G>>
void connected_components(G&& g, // graph
Component& component // out: connected component assignment
size_t connected_components(G&& g, // graph
Component& component // out: connected component assignment
) {
size_t N(size(vertices(g)));
std::vector<bool> visited(N, false);
Expand All @@ -114,6 +114,7 @@ void connected_components(G&& g, // graph
}
++cid;
}
return cid;
}

} // namespace graph
Expand Down
4 changes: 0 additions & 4 deletions include/graph/algorithm/tc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ size_t triangle_count(G&& g) {
auto ie = end(edges(g, uid));
while (i != ie) {
auto&& [vid, uv] = *i;
if (vid < uid) {
++i;
continue;
}
graph::incidence_iterator<G> j(g, vid);

auto je = end(edges(g, vid));
Expand Down
4 changes: 2 additions & 2 deletions tests/tc_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ TEST_CASE("triangle counting test", "[tc]") {
init_console();

using G = routes_vol_graph_type;
auto&& g = load_ordered_graph<G>(TEST_DATA_ROOT_DIR "tc_test.csv", name_order_policy::alphabetical, true);
auto&& g = load_ordered_graph<G>(TEST_DATA_ROOT_DIR "tc_test.csv", name_order_policy::alphabetical);

size_t triangles = graph::triangle_count(g);
REQUIRE(triangles == 11);
}
}
Loading