Changeset - r661:19b6f20e0ea2
« 660:b1811c
662:e3d9bf »
gravatar
kpeter (Peter Kovacs)
kpeter@inf.elte.hu
Support LEQ and GEQ supply constraints in dimacs-solver (#234, #219)
0 1 0
default
1 file changed with 24 insertions and 6 deletions:
tools/dimacs-solver.cc
24
6
↑ Collapse diff ↑
tools/dimacs-solver.cc
Show white space 2 line context
... ... 
@@ -95,3 +95,3 @@
95 95 
void solve_min(ArgParser &ap, std::istream &is, std::ostream &,
96 
               DimacsDescriptor &desc)
96 
               Value infty, DimacsDescriptor &desc)
97 97 
{
... ... 
@@ -102,5 +102,19 @@
102 102 
  Timer ti;
103 

			




	103
	104
	
		
  ti.restart();


			




	104
	
	
		
  readDimacsMin(is, g, lower, cap, cost, sup, 0, desc);


			




	
	105
	
		
  readDimacsMin(is, g, lower, cap, cost, sup, infty, desc);


			




	
	106
	
		
  ti.stop();


			




	
	107
	
		
  Value sum_sup = 0;


			




	
	108
	
		
  for (Digraph::NodeIt n(g); n != INVALID; ++n) {


			




	
	109
	
		
    sum_sup += sup[n];


			




	
	110
	
		
  }


			




	
	111
	
		
  if (report) {


			




	
	112
	
		
    std::cerr << "Sum of supply values: " << sum_sup << "\n";


			




	
	113
	
		
    if (sum_sup <= 0)


			




	
	114
	
		
      std::cerr << "GEQ supply contraints are used for NetworkSimplex\n\n";


			




	
	115
	
		
    else


			




	
	116
	
		
      std::cerr << "LEQ supply contraints are used for NetworkSimplex\n\n";


			




	
	117
	
		
  }


			




	105
	118
	
		
  if (report) std::cerr << "Read the file: " << ti << '\n';


			




	
	119
	
		

			




	106
	120
	
		
  ti.restart();


			




	...
	...
	
		
@@ -108,7 +122,11 @@


			




	108
	122
	
		
  ns.lowerMap(lower).capacityMap(cap).costMap(cost).supplyMap(sup);


			




	
	123
	
		
  if (sum_sup > 0) ns.problemType(ns.LEQ);


			




	109
	124
	
		
  if (report) std::cerr << "Setup NetworkSimplex class: " << ti << '\n';


			




	110
	125
	
		
  ti.restart();


			




	111
	
	
		
  ns.run();


			




	112
	
	
		
  if (report) std::cerr << "Run NetworkSimplex: " << ti << '\n';


			




	113
	
	
		
  if (report) std::cerr << "\nMin flow cost: " << ns.totalCost() << '\n';


			




	
	126
	
		
  bool res = ns.run();


			




	
	127
	
		
  if (report) {


			




	
	128
	
		
    std::cerr << "Run NetworkSimplex: " << ti << "\n\n";


			




	
	129
	
		
    std::cerr << "Feasible flow: " << (res ? "found" : "not found") << '\n';


			




	
	130
	
		
    if (res) std::cerr << "Min flow cost: " << ns.totalCost() << '\n';


			




	
	131
	
		
  }


			




	114
	132
	
		
}


			




	...
	...
	
		
@@ -153,3 +171,3 @@


			




	153
	171
	
		
    case DimacsDescriptor::MIN:


			




	154
	
	
		
      solve_min<Value>(ap,is,os,desc);


			




	
	172
	
		
      solve_min<Value>(ap,is,os,infty,desc);


			




	155
	173
	
		
      break;


			




        

    






    
    



    


    

     
    
0 comments (0 inline)