1.1 --- a/src/work/jacint/flow_test.cc Mon Feb 16 15:57:59 2004 +0000
1.2 +++ b/src/work/jacint/flow_test.cc Mon Feb 16 16:15:58 2004 +0000
1.3 @@ -2,150 +2,147 @@
1.4 #include <vector>
1.5 #include <string>
1.6
1.7 -#include <marci_list_graph.hh>
1.8 -#include <marci_graph_traits.hh>
1.9 -#include <marci_property_vector.hh>
1.10 -#include <preflow_push_hl.hh>
1.11 -#include <preflow_push_max_flow.hh>
1.12 -#include <reverse_bfs.hh>
1.13 -//#include <dijkstra.hh>
1.14 +#include <list_graph.hh>
1.15 +#include <preflow_push_hl.h>
1.16 +#include <preflow_push_max_flow.h>
1.17 +#include <reverse_bfs.h>
1.18 +//#include <dijkstra.h>
1.19
1.20 using namespace marci;
1.21
1.22
1.23 int main (int, char*[])
1.24 {
1.25 - typedef graph_traits<list_graph>::node_iterator node_iterator;
1.26 - typedef graph_traits<list_graph>::edge_iterator edge_iterator;
1.27 - typedef graph_traits<list_graph>::each_node_iterator each_node_iterator;
1.28 - typedef graph_traits<list_graph>::each_edge_iterator each_edge_iterator;
1.29 - typedef graph_traits<list_graph>::out_edge_iterator out_edge_iterator;
1.30 - typedef graph_traits<list_graph>::in_edge_iterator in_edge_iterator;
1.31 - typedef graph_traits<list_graph>::sym_edge_iterator sym_edge_iterator;
1.32 -
1.33 - list_graph flow_test;
1.34 + typedef ListGraph::NodeIt NodeIt;
1.35 + typedef ListGraph::EdgeIt EdgeIt;
1.36 + typedef ListGraph::EachNodeIt EachNodeIt;
1.37 + typedef ListGraph::EachEdgeIt EachEdgeIt;
1.38 + typedef ListGraph::OutEdgeIt OutEdgeIt;
1.39 + typedef ListGraph::InEdgeIt InEdgeIt;
1.40 +
1.41 + ListGraph flow_test;
1.42
1.43 //Ahuja könyv példája, maxflowvalue=13
1.44 - node_iterator s=flow_test.add_node();
1.45 - node_iterator v1=flow_test.add_node();
1.46 - node_iterator v2=flow_test.add_node();
1.47 - node_iterator v3=flow_test.add_node();
1.48 - node_iterator v4=flow_test.add_node();
1.49 - node_iterator v5=flow_test.add_node();
1.50 - node_iterator t=flow_test.add_node();
1.51 + NodeIt s=flow_test.addNode();
1.52 + NodeIt v1=flow_test.addNode();
1.53 + NodeIt v2=flow_test.addNode();
1.54 + NodeIt v3=flow_test.addNode();
1.55 + NodeIt v4=flow_test.addNode();
1.56 + NodeIt v5=flow_test.addNode();
1.57 + NodeIt t=flow_test.addNode();
1.58
1.59 - node_property_vector<list_graph, std::string> node_name(flow_test);
1.60 - node_name.put(s, "s");
1.61 - node_name.put(v1, "v1");
1.62 - node_name.put(v2, "v2");
1.63 - node_name.put(v3, "v3");
1.64 - node_name.put(v4, "v4");
1.65 - node_name.put(v5, "v5");
1.66 - node_name.put(t, "t");
1.67 + ListGraph::NodeMap<std::string> Node_name(flow_test);
1.68 + Node_name.set(s, "s");
1.69 + Node_name.set(v1, "v1");
1.70 + Node_name.set(v2, "v2");
1.71 + Node_name.set(v3, "v3");
1.72 + Node_name.set(v4, "v4");
1.73 + Node_name.set(v5, "v5");
1.74 + Node_name.set(t, "t");
1.75
1.76 - edge_iterator s_v1=flow_test.add_edge(s, v1);
1.77 - edge_iterator s_v2=flow_test.add_edge(s, v2);
1.78 - edge_iterator s_v3=flow_test.add_edge(s, v3);
1.79 - edge_iterator v2_v4=flow_test.add_edge(v2, v4);
1.80 - edge_iterator v2_v5=flow_test.add_edge(v2, v5);
1.81 - edge_iterator v3_v5=flow_test.add_edge(v3, v5);
1.82 - edge_iterator v4_t=flow_test.add_edge(v4, t);
1.83 - edge_iterator v5_t=flow_test.add_edge(v5, t);
1.84 - edge_iterator v2_s=flow_test.add_edge(v2, s);
1.85 + EdgeIt s_v1=flow_test.addEdge(s, v1);
1.86 + EdgeIt s_v2=flow_test.addEdge(s, v2);
1.87 + EdgeIt s_v3=flow_test.addEdge(s, v3);
1.88 + EdgeIt v2_v4=flow_test.addEdge(v2, v4);
1.89 + EdgeIt v2_v5=flow_test.addEdge(v2, v5);
1.90 + EdgeIt v3_v5=flow_test.addEdge(v3, v5);
1.91 + EdgeIt v4_t=flow_test.addEdge(v4, t);
1.92 + EdgeIt v5_t=flow_test.addEdge(v5, t);
1.93 + EdgeIt v2_s=flow_test.addEdge(v2, s);
1.94
1.95 - edge_property_vector<list_graph, int> cap(flow_test);
1.96 - cap.put(s_v1, 0);
1.97 - cap.put(s_v2, 10);
1.98 - cap.put(s_v3, 10);
1.99 - cap.put(v2_v4, 5);
1.100 - cap.put(v2_v5, 8);
1.101 - cap.put(v3_v5, 5);
1.102 - cap.put(v4_t, 8);
1.103 - cap.put(v5_t, 8);
1.104 - cap.put(v2_s, 0);
1.105 + ListGraph::EdgeMap<int> cap(flow_test);
1.106 + cap.set(s_v1, 0);
1.107 + cap.set(s_v2, 10);
1.108 + cap.set(s_v3, 10);
1.109 + cap.set(v2_v4, 5);
1.110 + cap.set(v2_v5, 8);
1.111 + cap.set(v3_v5, 5);
1.112 + cap.set(v4_t, 8);
1.113 + cap.set(v5_t, 8);
1.114 + cap.set(v2_s, 0);
1.115
1.116
1.117
1.118 //Marci példája, maxflowvalue=23
1.119 - /* node_iterator s=flow_test.add_node();
1.120 - node_iterator v1=flow_test.add_node();
1.121 - node_iterator v2=flow_test.add_node();
1.122 - node_iterator v3=flow_test.add_node();
1.123 - node_iterator v4=flow_test.add_node();
1.124 - node_iterator t=flow_test.add_node();
1.125 - node_iterator w=flow_test.add_node();
1.126 + /* NodeIt s=flow_test.addNode();
1.127 + NodeIt v1=flow_test.addNode();
1.128 + NodeIt v2=flow_test.addNode();
1.129 + NodeIt v3=flow_test.addNode();
1.130 + NodeIt v4=flow_test.addNode();
1.131 + NodeIt t=flow_test.addNode();
1.132 + NodeIt w=flow_test.addNode();
1.133
1.134
1.135 - node_property_vector<list_graph, std::string> node_name(flow_test);
1.136 - node_name.put(s, "s");
1.137 - node_name.put(v1, "v1");
1.138 - node_name.put(v2, "v2");
1.139 - node_name.put(v3, "v3");
1.140 - node_name.put(v4, "v4");
1.141 - node_name.put(t, "t");
1.142 - node_name.put(w, "w");
1.143 + NodeMap<ListGraph, std::string> Node_name(flow_test);
1.144 + Node_name.set(s, "s");
1.145 + Node_name.set(v1, "v1");
1.146 + Node_name.set(v2, "v2");
1.147 + Node_name.set(v3, "v3");
1.148 + Node_name.set(v4, "v4");
1.149 + Node_name.set(t, "t");
1.150 + Node_name.set(w, "w");
1.151
1.152 - edge_iterator s_v1=flow_test.add_edge(s, v1);
1.153 - edge_iterator s_v2=flow_test.add_edge(s, v2);
1.154 - edge_iterator v1_v2=flow_test.add_edge(v1, v2);
1.155 - edge_iterator v2_v1=flow_test.add_edge(v2, v1);
1.156 - edge_iterator v1_v3=flow_test.add_edge(v1, v3);
1.157 - edge_iterator v3_v2=flow_test.add_edge(v3, v2);
1.158 - edge_iterator v2_v4=flow_test.add_edge(v2, v4);
1.159 - edge_iterator v4_v3=flow_test.add_edge(v4, v3);
1.160 - edge_iterator v3_t=flow_test.add_edge(v3, t);
1.161 - edge_iterator v4_t=flow_test.add_edge(v4, t);
1.162 - edge_iterator v3_v3=flow_test.add_edge(v3, v3);
1.163 - edge_iterator s_w=flow_test.add_edge(s, w);
1.164 - // edge_iterator v2_s=flow_test.add_edge(v2, s);
1.165 + EdgeIt s_v1=flow_test.addEdge(s, v1);
1.166 + EdgeIt s_v2=flow_test.addEdge(s, v2);
1.167 + EdgeIt v1_v2=flow_test.addEdge(v1, v2);
1.168 + EdgeIt v2_v1=flow_test.addEdge(v2, v1);
1.169 + EdgeIt v1_v3=flow_test.addEdge(v1, v3);
1.170 + EdgeIt v3_v2=flow_test.addEdge(v3, v2);
1.171 + EdgeIt v2_v4=flow_test.addEdge(v2, v4);
1.172 + EdgeIt v4_v3=flow_test.addEdge(v4, v3);
1.173 + EdgeIt v3_t=flow_test.addEdge(v3, t);
1.174 + EdgeIt v4_t=flow_test.addEdge(v4, t);
1.175 + EdgeIt v3_v3=flow_test.addEdge(v3, v3);
1.176 + EdgeIt s_w=flow_test.addEdge(s, w);
1.177 + // EdgeIt v2_s=flow_test.addEdge(v2, s);
1.178
1.179
1.180
1.181 - edge_property_vector<list_graph, int> cap(flow_test); //serves as length in dijkstra
1.182 - cap.put(s_v1, 16);
1.183 - cap.put(s_v2, 13);
1.184 - cap.put(v1_v2, 10);
1.185 - cap.put(v2_v1, 4);
1.186 - cap.put(v1_v3, 12);
1.187 - cap.put(v3_v2, 9);
1.188 - cap.put(v2_v4, 14);
1.189 - cap.put(v4_v3, 7);
1.190 - cap.put(v3_t, 20);
1.191 - cap.put(v4_t, 4);
1.192 - cap.put(v3_v3, 4);
1.193 - cap.put(s_w, 4);
1.194 - // cap.put(v2_s, 0);
1.195 + EdgeMap<ListGraph, int> cap(flow_test); //serves as length in dijkstra
1.196 + cap.set(s_v1, 16);
1.197 + cap.set(s_v2, 13);
1.198 + cap.set(v1_v2, 10);
1.199 + cap.set(v2_v1, 4);
1.200 + cap.set(v1_v3, 12);
1.201 + cap.set(v3_v2, 9);
1.202 + cap.set(v2_v4, 14);
1.203 + cap.set(v4_v3, 7);
1.204 + cap.set(v3_t, 20);
1.205 + cap.set(v4_t, 4);
1.206 + cap.set(v3_v3, 4);
1.207 + cap.set(s_w, 4);
1.208 + // cap.set(v2_s, 0);
1.209
1.210 */
1.211
1.212 //pelda 3, maxflowvalue=4
1.213 - /* node_iterator s=flow_test.add_node();
1.214 - node_iterator v1=flow_test.add_node();
1.215 - node_iterator v2=flow_test.add_node();
1.216 - node_iterator t=flow_test.add_node();
1.217 - node_iterator w=flow_test.add_node();
1.218 + /* NodeIt s=flow_test.addNode();
1.219 + NodeIt v1=flow_test.addNode();
1.220 + NodeIt v2=flow_test.addNode();
1.221 + NodeIt t=flow_test.addNode();
1.222 + NodeIt w=flow_test.addNode();
1.223
1.224 - node_property_vector<list_graph, std::string> node_name(flow_test);
1.225 - node_name.put(s, "s");
1.226 - node_name.put(v1, "v1");
1.227 - node_name.put(v2, "v2");
1.228 - node_name.put(t, "t");
1.229 - node_name.put(w, "w");
1.230 + NodeMap<ListGraph, std::string> Node_name(flow_test);
1.231 + Node_name.set(s, "s");
1.232 + Node_name.set(v1, "v1");
1.233 + Node_name.set(v2, "v2");
1.234 + Node_name.set(t, "t");
1.235 + Node_name.set(w, "w");
1.236
1.237 - edge_iterator s_v1=flow_test.add_edge(s, v1);
1.238 - edge_iterator v1_v2=flow_test.add_edge(v1, v2);
1.239 - edge_iterator v2_t=flow_test.add_edge(v2, t);
1.240 - edge_iterator v1_v1=flow_test.add_edge(v1, v1);
1.241 - edge_iterator s_w=flow_test.add_edge(s, w);
1.242 + EdgeIt s_v1=flow_test.addEdge(s, v1);
1.243 + EdgeIt v1_v2=flow_test.addEdge(v1, v2);
1.244 + EdgeIt v2_t=flow_test.addEdge(v2, t);
1.245 + EdgeIt v1_v1=flow_test.addEdge(v1, v1);
1.246 + EdgeIt s_w=flow_test.addEdge(s, w);
1.247
1.248
1.249 - edge_property_vector<list_graph, int> cap(flow_test);
1.250 + EdgeMap<ListGraph, int> cap(flow_test);
1.251
1.252 - cap.put(s_v1, 16);
1.253 - cap.put(v1_v2, 10);
1.254 - cap.put(v2_t, 4);
1.255 - cap.put(v1_v1, 3);
1.256 - cap.put(s_w, 5);
1.257 + cap.set(s_v1, 16);
1.258 + cap.set(v1_v2, 10);
1.259 + cap.set(v2_t, 4);
1.260 + cap.set(v1_v1, 3);
1.261 + cap.set(s_w, 5);
1.262 */
1.263
1.264
1.265 @@ -153,11 +150,11 @@
1.266 /*
1.267 std::cout << "Testing reverse_bfs..." << std::endl;
1.268
1.269 - reverse_bfs<list_graph> bfs_test(flow_test, t);
1.270 + reverse_bfs<ListGraph> bfs_test(flow_test, t);
1.271
1.272 bfs_test.run();
1.273
1.274 - for (each_node_iterator w=flow_test.first_node(); w.valid(); ++w) {
1.275 + for (EachNodeIt w=flow_test.first_Node(); w.valid(); ++w) {
1.276 std::cout <<"The distance of " << w << " is " << bfs_test.dist(w) <<std::endl;
1.277 }
1.278
1.279 @@ -167,24 +164,24 @@
1.280
1.281 std::cout << "Testing preflow_push_hl..." << std::endl;
1.282
1.283 - preflow_push_hl<list_graph, int> preflow_push_test(flow_test, s, t, cap);
1.284 + preflow_push_hl<ListGraph, int> preflow_push_test(flow_test, s, t, cap);
1.285
1.286 preflow_push_test.run();
1.287
1.288 std::cout << "Maximum flow value is: " << preflow_push_test.maxflow() << "."<<std::endl;
1.289
1.290 - std::cout<< "The flow on edge s-v1 is "<< preflow_push_test.flowonedge(s_v1) << "."<<std::endl;
1.291 + std::cout<< "The flow on Edge s-v1 is "<< preflow_push_test.flowonEdge(s_v1) << "."<<std::endl;
1.292
1.293 - edge_property_vector<list_graph, int> flow=preflow_push_test.allflow();
1.294 - for (each_edge_iterator e=flow_test.first_edge(); e.valid(); ++e) {
1.295 - std::cout <<"Flow on edge " << flow_test.tail(e) <<"-" << flow_test.head(e)<< " is " <<flow.get(e) <<std::endl;
1.296 + ListGraph::EdgeMap<int> flow=preflow_push_test.allflow();
1.297 + for (EachEdgeIt e=flow_test.template first<EachEdgeIt>(); e.valid(); ++e) {
1.298 + std::cout <<"Flow on Edge " << flow_test.tail(e) <<"-" << flow_test.head(e)<< " is " <<flow.get(e) <<std::endl;
1.299 }
1.300
1.301 std::cout << "A minimum cut: " <<std::endl;
1.302 - node_property_vector<list_graph, bool> mincut=preflow_push_test.mincut();
1.303 + ListGraph::NodeMap<bool> mincut=preflow_push_test.mincut();
1.304
1.305 - for (each_node_iterator v=flow_test.first_node(); v.valid(); ++v) {
1.306 - if (mincut.get(v)) std::cout <<node_name.get(v)<< " ";
1.307 + for (EachNodeIt v=flow_test.template first<EachNodeIt>(); v.valid(); ++v) {
1.308 + if (mincut.get(v)) std::cout <<Node_name.get(v)<< " ";
1.309 }
1.310
1.311 std::cout<<"\n\n"<<std::endl;
1.312 @@ -194,17 +191,17 @@
1.313
1.314 std::cout << "Testing preflow_push_max_flow..." << std::endl;
1.315
1.316 - preflow_push_max_flow<list_graph, int> max_flow_test(flow_test, s, t, cap);
1.317 + preflow_push_max_flow<ListGraph, int> max_flow_test(flow_test, s, t, cap);
1.318
1.319 max_flow_test.run();
1.320
1.321 std::cout << "Maximum flow value is: " << max_flow_test.maxflow() << "."<< std::endl;
1.322
1.323 std::cout << "A minimum cut: " <<std::endl;
1.324 - node_property_vector<list_graph, bool> mincut2=max_flow_test.mincut();
1.325 + ListGraph::NodeMap<bool> mincut2=max_flow_test.mincut();
1.326
1.327 - for (each_node_iterator v=flow_test.first_node(); v.valid(); ++v) {
1.328 - if (mincut2.get(v)) std::cout <<node_name.get(v)<< " ";
1.329 + for (EachNodeIt v=flow_test.template first<EachNodeIt>(); v.valid(); ++v) {
1.330 + if (mincut2.get(v)) std::cout <<Node_name.get(v)<< " ";
1.331 }
1.332
1.333 std::cout << std::endl <<std::endl;
1.334 @@ -213,17 +210,17 @@
1.335 /*
1.336 std::cout << "Testing dijkstra..." << std::endl;
1.337
1.338 - node_iterator root=v2;
1.339 + NodeIt root=v2;
1.340
1.341 - dijkstra<list_graph, int> dijkstra_test(flow_test, root, cap);
1.342 + dijkstra<ListGraph, int> dijkstra_test(flow_test, root, cap);
1.343
1.344 dijkstra_test.run();
1.345
1.346 - for (each_node_iterator w=flow_test.first_node(); w.valid(); ++w) {
1.347 + for (EachNodeIt w=flow_test.first_Node(); w.valid(); ++w) {
1.348 if (dijkstra_test.reach(w)) {
1.349 std::cout <<"The distance of " << w << " is " << dijkstra_test.dist(w);
1.350 if (dijkstra_test.pred(w).valid()) {
1.351 - std::cout <<", a shortest path from the root ends with edge " << dijkstra_test.pred(w) <<std::endl;
1.352 + std::cout <<", a shortest path from the root ends with Edge " << dijkstra_test.pred(w) <<std::endl;
1.353 } else {
1.354 std::cout <<", this is the root."<<std::endl; }
1.355