Changeset 30:10a3f2e0928c in lemon-0.x for src/work/proba.cc

Timestamp:

01/21/04 15:51:05 (21 years ago)

Author:

jacint

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@43

Message:

is_valid changed to valid

File:

• src/work/proba.cc (modified) (11 diffs)

src/work/proba.cc

@@ -9 +9 @@
 #include <preflow_push_max_flow.hh>
 #include <reverse_bfs.hh>
+//#include <dijkstra.hh>
 
 using namespace marci;
@@ -25 +26 @@
   list_graph flow_test;
  
-  //Ahuja könyv példája, maxflowvalue=13
+  /*  //Ahuja könyv példája, maxflowvalue=13
   node_iterator s=flow_test.add_node();
   node_iterator v1=flow_test.add_node();
@@ -46 +47 @@
   edge_iterator s_v2=flow_test.add_edge(s, v2);
   edge_iterator s_v3=flow_test.add_edge(s, v3);
-  
   edge_iterator v2_v4=flow_test.add_edge(v2, v4);
   edge_iterator v2_v5=flow_test.add_edge(v2, v5);
-
   edge_iterator v3_v5=flow_test.add_edge(v3, v5);
-
   edge_iterator v4_t=flow_test.add_edge(v4, t);
   edge_iterator v5_t=flow_test.add_edge(v5, t);
+  edge_iterator v2_s=flow_test.add_edge(v2, s);
   
   edge_property_vector<list_graph, int> cap(flow_test);  
@@ -64 +63 @@
   cap.put(v4_t, 8);
   cap.put(v5_t, 8);
-
+  cap.put(v2_s, 0);
+*/
 
   
   //Marci példája, maxflowvalue=23
-  /*   node_iterator s=flow_test.add_node();
+     node_iterator s=flow_test.add_node();
   node_iterator v1=flow_test.add_node();
   node_iterator v2=flow_test.add_node();
@@ -98 +98 @@
   edge_iterator v3_v3=flow_test.add_edge(v3, v3);
   edge_iterator s_w=flow_test.add_edge(s, w);
+  edge_iterator v2_s=flow_test.add_edge(v2, s);
   
 
@@ -114 +115 @@
   cap.put(v3_v3, 4);
   cap.put(s_w, 4);
-  */
+  cap.put(v2_s, 0);
 
 
@@ -156 +157 @@
   bfs_test.run();
 
-  for (each_node_iterator w=flow_test.first_node(); w.is_valid(); ++w) {
+  for (each_node_iterator w=flow_test.first_node(); w.valid(); ++w) {
     std::cout <<"The distance of " << w << " is " << bfs_test.dist(w) <<std::endl;
     }
@@ -175 +176 @@
 
   edge_property_vector<list_graph, int> flow=preflow_push_test.allflow();  
-  for (each_edge_iterator e=flow_test.first_edge(); e.is_valid(); ++e) {
+  for (each_edge_iterator e=flow_test.first_edge(); e.valid(); ++e) {
     std::cout <<"Flow on edge " << flow_test.tail(e) <<"-" << flow_test.head(e)<< " is " <<flow.get(e) <<std::endl;
     }
@@ -182 +183 @@
   node_property_vector<list_graph, bool> mincut=preflow_push_test.mincut();
 
-  for (each_node_iterator v=flow_test.first_node(); v.is_valid(); ++v) {
+  for (each_node_iterator v=flow_test.first_node(); v.valid(); ++v) {
       if (mincut.get(v)) std::cout <<node_name.get(v)<< " ";
     }
@@ -202 +203 @@
   node_property_vector<list_graph, bool> mincut2=max_flow_test.mincut();
 
-  for (each_node_iterator v=flow_test.first_node(); v.is_valid(); ++v) {
+  for (each_node_iterator v=flow_test.first_node(); v.valid(); ++v) {
     if (mincut2.get(v)) std::cout <<node_name.get(v)<< " ";
   }
@@ -210 +211 @@
 
 
+//    std::cout << "Testing dijkstra..." << std::endl;
+  
+//    dijkstra<list_graph, int> dijkstra_test(flow_test, s, cap);
+
+//    dijkstra_test.run();
+
+//    for (each_node_iterator w=flow_test.first_node(); w.valid(); ++w) {
+//      std::cout <<"The distance of " << w << " is " << dijkstra_test.dist(w) <<std::endl;
+//      }
+
+
+
+
   return 0;
 }