dimacs.h
authormarci
Thu, 02 Sep 2004 11:20:49 +0000
changeset 784a48964a87141
parent 783 81bf2d766164
child 785 a9b0863c2265
dimacs.h
src/hugo/dimacs.h
src/work/marci/graph_wrapper_time.cc
     1.1 --- a/src/hugo/dimacs.h	Thu Sep 02 10:54:26 2004 +0000
     1.2 +++ b/src/hugo/dimacs.h	Thu Sep 02 11:20:49 2004 +0000
     1.3 @@ -71,16 +71,16 @@
     1.4  	  is >> i >> j >> _cap;
     1.5  	  getline(is, str);
     1.6  	  e=g.addEdge(nodes[i], nodes[j]);
     1.7 -	  capacity.update();
     1.8 +	  //capacity.update();
     1.9  	  capacity.set(e, _cap);
    1.10  	} else {
    1.11  	  if ( problem == "min" ) {
    1.12  	    is >> i >> j >> _cap >> _cost;
    1.13  	    getline(is, str);
    1.14  	    e=g.addEdge(nodes[i], nodes[j]);
    1.15 -	    capacity.update();
    1.16 +	    //capacity.update();
    1.17  	    capacity.set(e, _cap);
    1.18 -	    cost.update();
    1.19 +	    //cost.update();
    1.20  	    cost.set(e, _cost);
    1.21  	  } else {
    1.22  	    is >> i >> j;
     2.1 --- a/src/work/marci/graph_wrapper_time.cc	Thu Sep 02 10:54:26 2004 +0000
     2.2 +++ b/src/work/marci/graph_wrapper_time.cc	Thu Sep 02 11:20:49 2004 +0000
     2.3 @@ -35,6 +35,7 @@
     2.4    typedef MaxFlow<Graph, int, FlowMap, FlowMap> MyMaxFlow;
     2.5    MyMaxFlow max_flow(g, s, t, cap, flow);
     2.6    max_flow.run(MyMaxFlow::NO_FLOW);
     2.7 +  cout << "flow value: " << max_flow.flowValue() << endl;
     2.8    cout << ts << endl;
     2.9  }
    2.10