Changeset - r847:754272f20318
« 846:9d380b
« 845:a5fc1e
849:1b8db3 »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge #347
0 1 0
merge default
0 files changed with 11 insertions and 8 deletions:
tools/dimacs-solver.cc
11
8
↑ Collapse diff ↑
tools/dimacs-solver.cc
Ignore white space 4 line context
... ... 
@@ -92,5 +92,5 @@
92 92 
}
93 93 

			




	94
	
	
		
template<class Value>


			




	
	94
	
		
template<class Value, class LargeValue>


			




	95
	95
	
		
void solve_min(ArgParser &ap, std::istream &is, std::ostream &,


			




	96
	96
	
		
               Value infty, DimacsDescriptor &desc)


			




	...
	...
	
		
@@ -128,5 +128,6 @@


			




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


			




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


			




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


			




	
	130
	
		
    if (res) std::cerr << "Min flow cost: "


			




	
	131
	
		
                       << ns.template totalCost<LargeValue>() << '\n';


			




	131
	132
	
		
  }


			




	132
	133
	
		
}


			




	...
	...
	
		
@@ -152,5 +153,5 @@


			




	152
	153
	
		

			




	153
	154
	
		

			




	154
	
	
		
template<class Value>


			




	
	155
	
		
template<class Value, class LargeValue>


			




	155
	156
	
		
void solve(ArgParser &ap, std::istream &is, std::ostream &os,


			




	156
	157
	
		
           DimacsDescriptor &desc)


			




	...
	...
	
		
@@ -170,5 +171,5 @@


			




	170
	171
	
		
    {


			




	171
	172
	
		
    case DimacsDescriptor::MIN:


			




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


			




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


			




	173
	174
	
		
      break;


			




	174
	175
	
		
    case DimacsDescriptor::MAX:


			




	...
	...
	
		
@@ -265,12 +266,14 @@


			




	265
	266
	
		
    


			




	266
	267
	
		
  if(ap.given("double"))


			




	267
	
	
		
    solve<double>(ap,is,os,desc);


			




	
	268
	
		
    solve<double, double>(ap,is,os,desc);


			




	268
	269
	
		
  else if(ap.given("ldouble"))


			




	269
	
	
		
    solve<long double>(ap,is,os,desc);


			




	
	270
	
		
    solve<long double, long double>(ap,is,os,desc);


			




	270
	271
	
		
#ifdef LEMON_HAVE_LONG_LONG


			




	271
	272
	
		
  else if(ap.given("long"))


			




	272
	
	
		
    solve<long long>(ap,is,os,desc);


			




	
	273
	
		
    solve<long long, long long>(ap,is,os,desc);


			




	
	274
	
		
  else solve<int, long long>(ap,is,os,desc);


			




	
	275
	
		
#else


			




	
	276
	
		
  else solve<int, long>(ap,is,os,desc);


			




	273
	277
	
		
#endif


			




	274
	
	
		
  else solve<int>(ap,is,os,desc);


			




	275
	278
	
		

			




	276
	279
	
		
  return 0;


			




        

    






    
    



    


    

     
    
0 comments (0 inline)