Skip to content

Commit f2d91df

Browse files
authored
Merge branch 'master' into el_rng
2 parents ea7cbbc + ce40641 commit f2d91df

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

include/graph/views/depth_first_search.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,6 @@ namespace views {
11031103
inline constexpr _Sourced_Edges_DFS::_Cpo sourced_edges_depth_first_search;
11041104
}
11051105

1106-
11071106
} // namespace views
11081107
} // namespace std::graph
11091108

include/graph/views/edgelist.hpp

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

391391
template <class _G, class _UnCV>
392-
concept _Has_adjlist_all_ADL = adjacency_list<_G> //
392+
concept _Has_adjlist_all_ADL = adjacency_list<_G> //
393393
&& requires(_G&& __g) {
394394
{ _Fake_copy_init(edgelist(__g)) }; // intentional ADL
395395
};
@@ -399,23 +399,23 @@ namespace views {
399399
template <class _G, class _UnCV, class EVF>
400400
concept _Has_adjlist_all_evf_ADL = adjacency_list<_G> && invocable<EVF, edge_reference_t<_G>> //
401401
&& requires(_G&& __g, EVF evf) {
402-
{ _Fake_copy_init(edgelist(__g, evf)) }; // intentional ADL
402+
{ _Fake_copy_init(edgelist(__g, evf)) }; // intentional ADL
403403
};
404404
template <class _G, class _UnCV, class EVF>
405405
concept _Can_adjlist_all_evf_eval = adjacency_list<_G> && invocable<EVF, edge_reference_t<_G>>;
406406

407407

408408
template <class _G, class _UnCV>
409-
concept _Has_adjlist_idrng_ADL = adjacency_list<_G> //
409+
concept _Has_adjlist_idrng_ADL = adjacency_list<_G> //
410410
&& requires(_G&& __g, vertex_id_t<_G> uid, vertex_id_t<_G> vid) {
411411
{ _Fake_copy_init(edgelist(__g, uid, vid)) }; // intentional ADL
412412
};
413413
template <class _G, class _UnCV>
414414
concept _Can_adjlist_idrng_eval = adjacency_list<_G>;
415415

416416
template <class _G, class _UnCV, class EVF>
417-
concept _Has_adjlist_idrng_evf_ADL = adjacency_list<_G> //
418-
&& invocable<EVF, edge_reference_t<_G>> //
417+
concept _Has_adjlist_idrng_evf_ADL = adjacency_list<_G> //
418+
&& invocable<EVF, edge_reference_t<_G>> //
419419
&& requires(_G&& __g, vertex_id_t<_G> uid, vertex_id_t<_G> vid, EVF evf) {
420420
{ _Fake_copy_init(edgelist(__g, uid, vid, evf)) }; // intentional ADL
421421
};
@@ -466,7 +466,7 @@ namespace views {
466466
return {_St_adjlist_all::_Non_member,
467467
noexcept(_Fake_copy_init(edgelist(declval<_G>(), declval<EVF>())))}; // intentional ADL
468468
} else if constexpr (_Can_adjlist_all_evf_eval<_G, _UnCV, EVF>) {
469-
return {_St_adjlist_all::_Auto_eval, noexcept(true)}; // default impl (revisit)
469+
return {_St_adjlist_all::_Auto_eval, noexcept(true)}; // default impl (revisit)
470470
} else {
471471
return {_St_adjlist_all::_None};
472472
}
@@ -487,7 +487,7 @@ namespace views {
487487
noexcept(_Fake_copy_init(edgelist(declval<_G>(), declval<vertex_id_t<_G>>(),
488488
declval<vertex_id_t<_G>>())))}; // intentional ADL
489489
} else if constexpr (_Can_adjlist_idrng_eval<_G, _UnCV>) {
490-
return {_St_adjlist_idrng::_Auto_eval, noexcept(true)}; // default impl (revisit)
490+
return {_St_adjlist_idrng::_Auto_eval, noexcept(true)}; // default impl (revisit)
491491
} else {
492492
return {_St_adjlist_idrng::_None};
493493
}
@@ -527,7 +527,7 @@ namespace views {
527527
return {_St_edgelist_all::_Non_member,
528528
noexcept(_Fake_copy_init(edgelist(declval<ELR>(), declval<Proj>())))}; // intentional ADL
529529
} else if constexpr (_Can_edgelist_all_proj_eval<ELR, _UnCV, Proj>) {
530-
return {_St_edgelist_all::_Auto_eval, noexcept(true)}; // default impl (revisit)
530+
return {_St_edgelist_all::_Auto_eval, noexcept(true)}; // default impl (revisit)
531531
} else {
532532
return {_St_edgelist_all::_None};
533533
}

include/graph/views/incidence.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ namespace views {
315315
static constexpr _Choice_t<_St_id> _Choice_id_evf = _Choose_id_evf<_G, EVF>();
316316

317317
public:
318-
/**
318+
/**
319319
* @brief Get the outgoing incidence edges of a vertex id.
320320
*
321321
* Complexity: O(n)
@@ -347,7 +347,7 @@ namespace views {
347347
}
348348
}
349349

350-
/**
350+
/**
351351
* @brief Get the outgoing incidence edges of a vertex id and include an edge value in the result.
352352
*
353353
* Complexity: O(n)

tests/examples_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ TEST_CASE("wrapped vertex-vertex-int types", "[simple][bfs][example][bacon]") {
262262

263263
std::vector<size_t> bacon_number(size(actors));
264264

265-
using G = simple_graph;
266-
G& g = costar_adjacency_list;
265+
using G = simple_graph;
266+
G& g = costar_adjacency_list;
267267

268268
for (auto&& u : std::graph::vertices(costar_adjacency_list)) {
269269
for (auto&& uv : std::graph::edges(costar_adjacency_list, u)) {

0 commit comments

Comments
 (0)