Skip to content

Commit 8aae16f

Browse files
pratzlgithub-actions[bot]
pratzl
authored and
github-actions[bot]
committed
:octocat: Applied clang-format.
1 parent 0eece7b commit 8aae16f

File tree

9 files changed

+79
-81
lines changed

9 files changed

+79
-81
lines changed

‎include/graph/algorithm/dijkstra_clrs.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ void dijkstra_clrs(
140140
}
141141
}
142142

143-
#else // using Identifiers
143+
#else // using Identifiers
144144
145145
template <adjacency_list G,
146146
random_access_range Distance,

‎include/graph/algorithm/mst.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ void kruskal(IELR&& e, // graph
168168
CompareOp compare // edge value comparitor
169169
) {
170170
using edge_info = range_value_t<IELR>;
171-
using VId = remove_const_t<typename edge_info::source_id_type>;
172-
using EV = edge_info::value_type;
171+
using VId = remove_const_t<typename edge_info::source_id_type>;
172+
using EV = edge_info::value_type;
173173

174174
std::vector<tuple<VId, VId, EV>> e_copy;
175175
std::ranges::transform(e, back_inserter(e_copy),
@@ -242,7 +242,7 @@ void inplace_kruskal(IELR&& e, // graph
242242
CompareOp compare // edge value comparitor
243243
) {
244244
using edge_info = range_value_t<IELR>;
245-
using VId = remove_const_t<typename edge_info::source_id_type>;
245+
using VId = remove_const_t<typename edge_info::source_id_type>;
246246

247247
VId N = 0;
248248
auto outer_compare = [&](auto&& i, auto&& j) {

‎include/graph/detail/graph_cpo.hpp

Lines changed: 41 additions & 41 deletions
Large diffs are not rendered by default.

‎include/graph/views/breadth_first_search.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ namespace views {
689689
# endif // ^^^ workaround ^^^
690690

691691
template <class _G, class _Alloc>
692-
concept _Has_ref_ADL = _HasClassOrEnumType<_G> //
692+
concept _Has_ref_ADL = _HasClassOrEnumType<_G> //
693693
&& requires(_G&& __g, const vertex_id_t<_G>& uid, _Alloc alloc) {
694694
{ _Fake_copy_init(vertices_breadth_first_search(__g, uid, alloc)) }; // intentional ADL
695695
};
@@ -776,7 +776,7 @@ namespace views {
776776
constexpr _St_ref _Strat_ref = _Choice_ref<_G&, _Alloc>._Strategy;
777777

778778
if constexpr (_Strat_ref == _St_ref::_Non_member) {
779-
return vertices_breadth_first_search(__g, seed, alloc); // intentional ADL
779+
return vertices_breadth_first_search(__g, seed, alloc); // intentional ADL
780780
} else if constexpr (_Strat_ref == _St_ref::_Auto_eval) {
781781
return vertices_breadth_first_search_view<_G, void>(__g, seed, alloc); // default impl
782782
} else {
@@ -809,7 +809,7 @@ namespace views {
809809
constexpr _St_ref_vvf _Strat_ref_vvf = _Choice_ref_vvf<_G&, _VVF, _Alloc>._Strategy;
810810

811811
if constexpr (_Strat_ref_vvf == _St_ref_vvf::_Non_member) {
812-
return vertices_breadth_first_search(__g, seed, vvf, alloc); // intentional ADL
812+
return vertices_breadth_first_search(__g, seed, vvf, alloc); // intentional ADL
813813
} else if constexpr (_Strat_ref_vvf == _St_ref_vvf::_Auto_eval) {
814814
return vertices_breadth_first_search_view<_G, _VVF>(__g, seed, vvf, alloc); // default impl
815815
} else {
@@ -838,7 +838,7 @@ namespace views {
838838
# endif // ^^^ workaround ^^^
839839

840840
template <class _G, class _Alloc>
841-
concept _Has_ref_ADL = _HasClassOrEnumType<_G> //
841+
concept _Has_ref_ADL = _HasClassOrEnumType<_G> //
842842
&& requires(_G&& __g, const vertex_id_t<_G>& uid, _Alloc alloc) {
843843
{ _Fake_copy_init(edges_breadth_first_search(__g, uid, alloc)) }; // intentional ADL
844844
};
@@ -927,7 +927,7 @@ namespace views {
927927
constexpr _St_ref _Strat_ref = _Choice_ref<_G&, _Alloc>._Strategy;
928928

929929
if constexpr (_Strat_ref == _St_ref::_Non_member) {
930-
return edges_breadth_first_search(__g, seed, alloc); // intentional ADL
930+
return edges_breadth_first_search(__g, seed, alloc); // intentional ADL
931931
} else if constexpr (_Strat_ref == _St_ref::_Auto_eval) {
932932
return edges_breadth_first_search_view<_G, void, false>(__g, seed, alloc); // default impl
933933
} else {
@@ -960,7 +960,7 @@ namespace views {
960960
constexpr _St_ref_evf _Strat_ref_evf = _Choice_ref_evf<_G&, _EVF, _Alloc>._Strategy;
961961

962962
if constexpr (_Strat_ref_evf == _St_ref_evf::_Non_member) {
963-
return edges_breadth_first_search(__g, seed, alloc); // intentional ADL
963+
return edges_breadth_first_search(__g, seed, alloc); // intentional ADL
964964
} else if constexpr (_Strat_ref_evf == _St_ref_evf::_Auto_eval) {
965965
return edges_breadth_first_search_view<_G, _EVF, false>(__g, seed, evf, alloc); // default impl
966966
} else {
@@ -1080,7 +1080,7 @@ namespace views {
10801080
constexpr _St_ref _Strat_ref = _Choice_ref<_G&, _Alloc>._Strategy;
10811081

10821082
if constexpr (_Strat_ref == _St_ref::_Non_member) {
1083-
return sourced_edges_breadth_first_search(__g, seed, alloc); // intentional ADL
1083+
return sourced_edges_breadth_first_search(__g, seed, alloc); // intentional ADL
10841084
} else if constexpr (_Strat_ref == _St_ref::_Auto_eval) {
10851085
return edges_breadth_first_search_view<_G, void, true>(__g, seed, alloc); // default impl
10861086
} else {
@@ -1113,7 +1113,7 @@ namespace views {
11131113
constexpr _St_ref_evf _Strat_ref_evf = _Choice_ref_evf<_G&, _EVF, _Alloc>._Strategy;
11141114

11151115
if constexpr (_Strat_ref_evf == _St_ref_evf::_Non_member) {
1116-
return sourced_edges_breadth_first_search(__g, seed, alloc); // intentional ADL
1116+
return sourced_edges_breadth_first_search(__g, seed, alloc); // intentional ADL
11171117
} else if constexpr (_Strat_ref_evf == _St_ref_evf::_Auto_eval) {
11181118
return edges_breadth_first_search_view<_G, _EVF, true>(__g, seed, evf, alloc); // default impl
11191119
} else {

‎include/graph/views/depth_first_search.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ namespace views {
651651
# endif // ^^^ workaround ^^^
652652

653653
template <class _G, class _Alloc>
654-
concept _Has_ref_ADL = _HasClassOrEnumType<_G> //
654+
concept _Has_ref_ADL = _HasClassOrEnumType<_G> //
655655
&& requires(_G&& __g, const vertex_id_t<_G>& uid, _Alloc alloc) {
656656
{ _Fake_copy_init(vertices_depth_first_search(__g, uid, alloc)) }; // intentional ADL
657657
};
@@ -739,7 +739,7 @@ namespace views {
739739
constexpr _St_ref _Strat_ref = _Choice_ref<_G&, _Alloc>._Strategy;
740740

741741
if constexpr (_Strat_ref == _St_ref::_Non_member) {
742-
return vertices_depth_first_search(__g, seed, alloc); // intentional ADL
742+
return vertices_depth_first_search(__g, seed, alloc); // intentional ADL
743743
} else if constexpr (_Strat_ref == _St_ref::_Auto_eval) {
744744
return vertices_depth_first_search_view<_G, void>(__g, seed, alloc); // default impl
745745
} else {
@@ -772,7 +772,7 @@ namespace views {
772772
constexpr _St_ref_vvf _Strat_ref_vvf = _Choice_ref_vvf<_G&, _VVF, _Alloc>._Strategy;
773773

774774
if constexpr (_Strat_ref_vvf == _St_ref_vvf::_Non_member) {
775-
return vertices_depth_first_search(__g, seed, vvf, alloc); // intentional ADL
775+
return vertices_depth_first_search(__g, seed, vvf, alloc); // intentional ADL
776776
} else if constexpr (_Strat_ref_vvf == _St_ref_vvf::_Auto_eval) {
777777
return vertices_depth_first_search_view<_G, _VVF>(__g, seed, vvf, alloc); // default impl
778778
} else {
@@ -801,7 +801,7 @@ namespace views {
801801
# endif // ^^^ workaround ^^^
802802

803803
template <class _G, class _Alloc>
804-
concept _Has_ref_ADL = _HasClassOrEnumType<_G> //
804+
concept _Has_ref_ADL = _HasClassOrEnumType<_G> //
805805
&& requires(_G&& __g, const vertex_id_t<_G>& uid, _Alloc alloc) {
806806
{ _Fake_copy_init(edges_depth_first_search(__g, uid, alloc)) }; // intentional ADL
807807
};
@@ -890,7 +890,7 @@ namespace views {
890890
constexpr _St_ref _Strat_ref = _Choice_ref<_G&, _Alloc>._Strategy;
891891

892892
if constexpr (_Strat_ref == _St_ref::_Non_member) {
893-
return edges_depth_first_search(__g, seed, alloc); // intentional ADL
893+
return edges_depth_first_search(__g, seed, alloc); // intentional ADL
894894
} else if constexpr (_Strat_ref == _St_ref::_Auto_eval) {
895895
return edges_depth_first_search_view<_G, void, false>(__g, seed, alloc); // default impl
896896
} else {
@@ -923,7 +923,7 @@ namespace views {
923923
constexpr _St_ref_evf _Strat_ref_evf = _Choice_ref_evf<_G&, _EVF, _Alloc>._Strategy;
924924

925925
if constexpr (_Strat_ref_evf == _St_ref_evf::_Non_member) {
926-
return edges_depth_first_search(__g, seed, alloc); // intentional ADL
926+
return edges_depth_first_search(__g, seed, alloc); // intentional ADL
927927
} else if constexpr (_Strat_ref_evf == _St_ref_evf::_Auto_eval) {
928928
return edges_depth_first_search_view<_G, _EVF, false>(__g, seed, evf, alloc); // default impl
929929
} else {
@@ -1043,7 +1043,7 @@ namespace views {
10431043
constexpr _St_ref _Strat_ref = _Choice_ref<_G&, _Alloc>._Strategy;
10441044

10451045
if constexpr (_Strat_ref == _St_ref::_Non_member) {
1046-
return sourced_edges_depth_first_search(__g, seed, alloc); // intentional ADL
1046+
return sourced_edges_depth_first_search(__g, seed, alloc); // intentional ADL
10471047
} else if constexpr (_Strat_ref == _St_ref::_Auto_eval) {
10481048
return edges_depth_first_search_view<_G, void, true>(__g, seed, alloc); // default impl
10491049
} else {
@@ -1077,7 +1077,7 @@ namespace views {
10771077
constexpr _St_ref_evf _Strat_ref_evf = _Choice_ref_evf<_G&, _EVF, _Alloc>._Strategy;
10781078

10791079
if constexpr (_Strat_ref_evf == _St_ref_evf::_Non_member) {
1080-
return sourced_edges_depth_first_search(__g, seed, alloc); // intentional ADL
1080+
return sourced_edges_depth_first_search(__g, seed, alloc); // intentional ADL
10811081
} else if constexpr (_Strat_ref_evf == _St_ref_evf::_Auto_eval) {
10821082
return edges_depth_first_search_view<_G, _EVF, true>(__g, seed, evf, alloc); // default impl
10831083
} else {

‎include/graph/views/edgelist.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,8 @@ class edgelist_iterator : public edgelist_iterator_base<G> {
144144
protected:
145145
// avoid difficulty in undefined vertex reference value in value_type
146146
// shadow_vertex_value_type: ptr if vertex_value_type is ref or ptr, value otherwise
147-
using shadow_edge_type = remove_reference_t<edge_reference_type>;
148-
using shadow_value_type =
149-
edge_info<vertex_id_type, true, shadow_edge_type*, _detail::ref_to_ptr<edge_value_type>>;
147+
using shadow_edge_type = remove_reference_t<edge_reference_type>;
148+
using shadow_value_type = edge_info<vertex_id_type, true, shadow_edge_type*, _detail::ref_to_ptr<edge_value_type>>;
150149

151150
union internal_value {
152151
value_type value_;

‎include/graph/views/neighbors.hpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ class neighbor_iterator
5151
using edge_type = edge_t<graph_type>;
5252

5353
using iterator_category = forward_iterator_tag;
54-
using value_type = neighbor_info<const vertex_id_type, Sourced, vertex_reference_type, vertex_value_type>;
55-
using difference_type = range_difference_t<edge_range>;
56-
using pointer = value_type*;
57-
using const_pointer = const value_type*;
58-
using reference = value_type&;
59-
using const_reference = const value_type&;
60-
using rvalue_reference = value_type&&;
54+
using value_type = neighbor_info<const vertex_id_type, Sourced, vertex_reference_type, vertex_value_type>;
55+
using difference_type = range_difference_t<edge_range>;
56+
using pointer = value_type*;
57+
using const_pointer = const value_type*;
58+
using reference = value_type&;
59+
using const_reference = const value_type&;
60+
using rvalue_reference = value_type&&;
6161

6262
public:
6363
neighbor_iterator(graph_type& g, vertex_iterator ui, edge_iterator iter, const VVF& value_fn)
@@ -165,13 +165,13 @@ class neighbor_iterator<G, Sourced, void>
165165
using edge_type = edge_t<graph_type>;
166166

167167
using iterator_category = forward_iterator_tag;
168-
using value_type = neighbor_info<const vertex_id_type, Sourced, vertex_reference_type, vertex_value_type>;
169-
using difference_type = range_difference_t<edge_range>;
170-
using pointer = value_type*;
171-
using const_pointer = const value_type*;
172-
using reference = value_type&;
173-
using const_reference = const value_type&;
174-
using rvalue_reference = value_type&&;
168+
using value_type = neighbor_info<const vertex_id_type, Sourced, vertex_reference_type, vertex_value_type>;
169+
using difference_type = range_difference_t<edge_range>;
170+
using pointer = value_type*;
171+
using const_pointer = const value_type*;
172+
using reference = value_type&;
173+
using const_reference = const value_type&;
174+
using rvalue_reference = value_type&&;
175175

176176
protected:
177177
// avoid difficulty in undefined vertex reference value in value_type

‎tests/descriptor_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -819,4 +819,4 @@ auto vertices(const G& g) {
819819

820820
# endif // 0
821821

822-
#endif // ENABLE_DESCRIPTOR_TESTS
822+
#endif // ENABLE_DESCRIPTOR_TESTS

‎tests/incidence_tests.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,7 @@ TEST_CASE("incidence test", "[csr][incidence]") {
204204
using view_t = decltype(graph::views::incidence(g, uid));
205205
static_assert(forward_range<view_t>, "incidence(g) is not a forward_range");
206206
size_t cnt = 0;
207-
for (auto&& [vid, uv] :
208-
graph::views::incidence(g, uid)) { // edge_info<vertex_id_t<G>, false, edge_t<G>, void>
207+
for (auto&& [vid, uv] : graph::views::incidence(g, uid)) { // edge_info<vertex_id_t<G>, false, edge_t<G>, void>
209208
++cnt;
210209
}
211210
REQUIRE(cnt == size(edges(g, u)));

0 commit comments

Comments
 (0)