Skip to content

Rcsp cleanup #449

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

Draft
andreacassioli wants to merge 6 commits into
base: develop
Choose a base branch
from
+88 −135
Draft

Rcsp cleanup #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c7f4e59
removed unused edge map; some code modernization
andreacassioli Jan 4, 2026
aa61084
using std::tie
andreacassioli Jan 15, 2026
47d6276
add some more const
andreacassioli Jan 15, 2026
c68c5d1
docs
andreacassioli Jan 17, 2026
f3aa923
use empty instead of casting size
andreacassioli Jan 17, 2026
1f0acf1
few more using
andreacassioli Jan 18, 2026
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
13 changes: 0 additions & 13 deletions doc/r_c_shortest_paths.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@ <h1><a name="sec:espprc"></a>

template&lt;class Graph,
class VertexIndexMap,
class EdgeIndexMap,
class Resource_Container,
class Resource_Extension_Function,
class Dominance_Function,
class Label_Allocator,
class Visitor&gt;
void r_c_shortest_paths( const Graph&amp; g,
const VertexIndexMap&amp; vertex_index_map,
const EdgeIndexMap&amp; edge_index_map,
typename graph_traits&lt;Graph&gt;::vertex_descriptor s,
typename graph_traits&lt;Graph&gt;::vertex_descriptor t,
std::vector&lt;std::vector&lt;typename graph_traits&lt;Graph&gt;::edge_descriptor&gt; &gt;&amp; pareto_optimal_solutions,
Expand All @@ -45,15 +43,13 @@ <h1><a name="sec:espprc"></a>

template&lt;class Graph,
class VertexIndexMap,
class EdgeIndexMap,
class Resource_Container,
class Resource_Extension_Function,
class Dominance_Function,
class Label_Allocator,
class Visitor&gt;
void r_c_shortest_paths( const Graph&amp; g,
const VertexIndexMap&amp; vertex_index_map,
const EdgeIndexMap&amp; edge_index_map,
typename graph_traits&lt;Graph&gt;::vertex_descriptor s,
typename graph_traits&lt;Graph&gt;::vertex_descriptor t,
std::vector&lt;typename graph_traits&lt;Graph&gt;::edge_descriptor&gt;&amp; pareto_optimal_solution,
Expand All @@ -66,13 +62,11 @@ <h1><a name="sec:espprc"></a>

template&lt;class Graph,
class VertexIndexMap,
class EdgeIndexMap,
class Resource_Container,
class Resource_Extension_Function,
class Dominance_Function&gt;
void r_c_shortest_paths( const Graph&amp; g,
const VertexIndexMap&amp; vertex_index_map,
const EdgeIndexMap&amp; edge_index_map,
typename graph_traits&lt;Graph&gt;::vertex_descriptor s,
typename graph_traits&lt;Graph&gt;::vertex_descriptor t,
std::vector&lt;std::vector&lt;typename graph_traits&lt;Graph&gt;::edge_descriptor&gt; &gt;&amp; pareto_optimal_solutions,
Expand All @@ -83,13 +77,11 @@ <h1><a name="sec:espprc"></a>

template&lt;class Graph,
class VertexIndexMap,
class EdgeIndexMap,
class Resource_Container,
class Resource_Extension_Function,
class Dominance_Function&gt;
void r_c_shortest_paths( const Graph&amp; g,
const VertexIndexMap&amp; vertex_index_map,
const EdgeIndexMap&amp; edge_index_map,
typename graph_traits&lt;Graph&gt;::vertex_descriptor s,
typename graph_traits&lt;Graph&gt;::vertex_descriptor t,
std::vector&lt;typename graph_traits&lt;Graph&gt;::edge_descriptor&gt;&amp; pareto_optimal_solution,
Expand Down Expand Up @@ -370,7 +362,6 @@ <h4>DominanceFunction</h4>
<pre>
r_c_shortest_paths( g,
vertex_index_map,
edge_index_map,
s,
t,
pareto_optimal_solutions,
Expand Down Expand Up @@ -427,10 +418,6 @@ <h3>Parameters</h3>
<blockquote>
A <a href="../../property_map/doc/ReadablePropertyMap.html">ReadablePropertyMap</a> mapping vertex descriptors to integers in [0, <tt>num_vertices(g)</tt>).
</blockquote>
IN: <tt>const EdgeIndexMap&amp; edge_index_map</tt>
<blockquote>
A <a href="../../property_map/doc/ReadablePropertyMap.html">ReadablePropertyMap</a> mapping edge descriptors to integers in [0, <tt>num_edges(g)</tt>).
</blockquote>
IN: <tt>typename graph_traits&lt;Graph&gt;::vertex_descriptor s</tt>
<blockquote>
A vertex descriptor describing the start vertex of the path.
Expand Down
6 changes: 2 additions & 4 deletions example/r_c_shortest_paths_example.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,7 @@ int main()
opt_solutions;
std::vector< spp_no_rc_res_cont > pareto_opt_rcs_no_rc;

r_c_shortest_paths(g, get(&SPPRC_Example_Graph_Vert_Prop::num, g),
get(&SPPRC_Example_Graph_Arc_Prop::num, g), s, t, opt_solutions,
r_c_shortest_paths(g, get(&SPPRC_Example_Graph_Vert_Prop::num, g), s, t, opt_solutions,
pareto_opt_rcs_no_rc, spp_no_rc_res_cont(0), ref_no_res_cont(),
dominance_no_res_cont(),
std::allocator< r_c_shortest_paths_label< SPPRC_Example_Graph,
Expand Down Expand Up @@ -277,8 +276,7 @@ int main()
opt_solutions_spptw;
std::vector< spp_spptw_res_cont > pareto_opt_rcs_spptw;

r_c_shortest_paths(g, get(&SPPRC_Example_Graph_Vert_Prop::num, g),
get(&SPPRC_Example_Graph_Arc_Prop::num, g), s, t, opt_solutions_spptw,
r_c_shortest_paths(g, get(&SPPRC_Example_Graph_Vert_Prop::num, g), s, t, opt_solutions_spptw,
pareto_opt_rcs_spptw, spp_spptw_res_cont(0, 0), ref_spptw(),
dominance_spptw(),
std::allocator< r_c_shortest_paths_label< SPPRC_Example_Graph,
Expand Down
Loading