Changeset 887:ec6a528dafd2 in lemon-0.x for src/test

Timestamp:

09/20/04 10:27:34 (20 years ago)

Author:

jacint

Branch:

default

Phase:

public

Convert:

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

Message:

new test graph

Location:

src/test

Files:

• preflow_graph.dim (added)
• preflow_graph.inp (deleted)
• preflow_test.cc (modified) (5 diffs)

src/test/preflow_test.cc

@@ -72 +72 @@
   std::string f_name;
   if( getenv("srcdir") ) {
-    f_name = std::string(getenv("srcdir")) + "/preflow_graph.inp";
+    f_name = std::string(getenv("srcdir")) + "/preflow_graph.dim";
   }
   else {
-    f_name = "preflow_graph.inp";
+    f_name = "preflow_graph.dim";
   }
   
@@ -88 +88 @@
 
   FlowMap flow(G,0);
+
  
+
   PType preflow_test(G, s, t, cap, flow);
   preflow_test.run(PType::ZERO_FLOW);
- 
-   
+    
   CutMap mincut(G,false);
   preflow_test.minCut(mincut); 
@@ -113 +114 @@
 
 
+
   for(EdgeIt e(G); e!=INVALID; ++e) cap[e]=2*cap[e]; 
   preflow_test.setCap(cap);  
-
-  NodeIt tmp_node(G,t);
-  ++tmp_node;
-  t=tmp_node;
-  
-  preflow_test.setTarget(t); //the max flow value remains 2*flow_value
-  //warning: ++t must be a valid node. In preflow_graph, it is.
 
   preflow_test.phase1(PType::PRE_FLOW);
@@ -142 +137 @@
   preflow_test.minMinCut(minmincut2); 
   min_min_cut_value=cut_value(G,minmincut2,cap);
-
  
   preflow_test.maxMinCut(maxmincut); 
-  
   max_min_cut_value=cut_value(G,maxmincut,cap);
 
@@ -154 +147 @@
         "The max flow value or the three min cut values were not doubled");
 
+
+
   EdgeIt e(G);
-  for( int i=1; i==1000; ++i ) {
-    flow[e]=0;
+  for( int i=1; i==10; ++i ) {
+    flow.set(e,0);
     ++e;
   }
 
   preflow_test.setFlow(flow); 
+
+  NodeIt tmp1(G,s);
+  ++tmp1;
+  if ( tmp1 != INVALID ) s=tmp1;
+
+  NodeIt tmp2(G,t);
+  ++tmp2;
+  if ( tmp2 != INVALID ) t=tmp2;
+
   preflow_test.setSource(s);
-
+  preflow_test.setTarget(t); 
+  
   preflow_test.run();