From 8840131daf4fb1578adc25d0b362e8a05a428f3f Mon Sep 17 00:00:00 2001 From: Jeremy Siek Date: Tue, 5 Nov 2002 17:57:06 +0000 Subject: [PATCH] added tests that exhibit bug from Pavel [SVN r16118] --- example/max_flow.cpp | 4 ++-- example/max_flow2.dat | 4 ++++ example/max_flow3.dat | 46 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 example/max_flow2.dat create mode 100644 example/max_flow3.dat diff --git a/example/max_flow.cpp b/example/max_flow.cpp index eada07f5..f6c8ea89 100644 --- a/example/max_flow.cpp +++ b/example/max_flow.cpp @@ -81,8 +81,6 @@ main() rev = get(edge_reverse, g); property_map::type residual_capacity = get(edge_residual_capacity, g); - property_map::type - indexmap = get(vertex_index, g); Traits::vertex_descriptor s, t; read_dimacs_max_flow(g, capacity, rev, s, t); @@ -90,6 +88,8 @@ main() long flow; #if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 // Use non-named parameter version + property_map::type + indexmap = get(vertex_index, g); flow = push_relabel_max_flow(g, s, t, capacity, residual_capacity, rev, indexmap); #else flow = push_relabel_max_flow(g, s, t); diff --git a/example/max_flow2.dat b/example/max_flow2.dat new file mode 100644 index 00000000..d607777d --- /dev/null +++ b/example/max_flow2.dat @@ -0,0 +1,4 @@ +p max 2 1 +n 1 s +n 2 t +a 1 2 5 diff --git a/example/max_flow3.dat b/example/max_flow3.dat new file mode 100644 index 00000000..1340a4e8 --- /dev/null +++ b/example/max_flow3.dat @@ -0,0 +1,46 @@ +p max 12 43 +n 10 s +n 11 t +a 1 6 43 +a 1 3 18 +a 1 2 66 +a 1 8 115 +a 2 6 22 +a 2 5 41 +a 2 4 42 +a 2 3 84 +a 2 1 66 +a 2 9 163 +a 3 4 41 +a 3 7 60 +a 3 9 79 +a 3 2 84 +a 3 1 18 +a 4 5 84 +a 4 2 42 +a 4 9 121 +a 4 3 41 +a 4 7 102 +a 5 6 64 +a 5 2 41 +a 5 4 84 +a 6 8 158 +a 6 1 43 +a 6 2 22 +a 6 5 64 +a 6 11 701 +a 7 4 102 +a 7 3 60 +a 8 6 158 +a 8 1 115 +a 9 4 121 +a 9 3 79 +a 9 2 163 +a 10 12 701 +a 12 1 100 +a 12 3 100 +a 12 4 100 +a 12 5 100 +a 12 6 100 +a 12 7 100 +a 12 8 100