Changeset - r579:997a75bac45a
« 577:1c5d6e
580:6643fc »
gravatar
kpeter (Peter Kovacs)
kpeter@inf.elte.hu
Small improvements in DIMACS solver (#226)
0 1 0
default
1 file changed with 5 insertions and 12 deletions:
tools/dimacs-solver.cc
5
12
↑ Collapse diff ↑
tools/dimacs-solver.cc
Ignore white space 6 line context
... ... 
@@ -18,10 +18,9 @@
18 18 

			




	19
	19
	
		
///\ingroup tools


			




	20
	20
	
		
///\file


			




	21
	
	
		
///\brief DIMACS to LGF converter.


			




	
	21
	
		
///\brief DIMACS problem solver.


			




	22
	22
	
		
///


			




	23
	
	
		
/// This program converts various DIMACS formats to the LEMON Digraph Format


			




	24
	
	
		
/// (LGF).


			




	
	23
	
		
/// This program solves various problems given in DIMACS format.


			




	25
	24
	
		
///


			




	26
	25
	
		
/// See


			




	27
	26
	
		
/// \verbatim


			




	...
	...
	
		
@@ -120,8 +119,7 @@


			




	120
	119
	
		
    {


			




	121
	120
	
		
    case DimacsDescriptor::MIN:


			




	122
	121
	
		
      std::cerr <<


			




	123
	
	
		
        "\n\n Sorry, the min. cost flow solver is not yet available.\n"


			




	124
	
	
		
                << std::endl;


			




	
	122
	
		
        "\n\n Sorry, the min. cost flow solver is not yet available.\n";


			




	125
	123
	
		
      break;


			




	126
	124
	
		
    case DimacsDescriptor::MAX:


			




	127
	125
	
		
      solve_max<Value>(ap,is,os,desc);


			




	...
	...
	
		
@@ -141,11 +139,6 @@


			




	141
	139
	
		
  typedef SmartDigraph Digraph;


			




	142
	140
	
		

			




	143
	141
	
		
  typedef Digraph::Arc Arc;


			




	144
	
	
		
  typedef Digraph::Node Node;


			




	145
	
	
		
  typedef Digraph::ArcIt ArcIt;


			




	146
	
	
		
  typedef Digraph::NodeIt NodeIt;


			




	147
	
	
		
  typedef Digraph::ArcMap<double> DoubleArcMap;


			




	148
	
	
		
  typedef Digraph::NodeMap<double> DoubleNodeMap;


			




	149
	142
	
		

			




	150
	143
	
		
  std::string inputName;


			




	151
	144
	
		
  std::string outputName;


			




	...
	...
	
		
@@ -188,7 +181,7 @@


			




	188
	181
	
		
    default:


			




	189
	182
	
		
      std::cerr << ap.commandName() << ": too many arguments\n";


			




	190
	183
	
		
      return 1;


			




	191
	
	
		
  }


			




	
	184
	
		
    }


			




	192
	185
	
		
  std::istream& is = (ap.files().size()<1 ? std::cin : input);


			




	193
	186
	
		
  std::ostream& os = (ap.files().size()<2 ? std::cout : output);


			




	194
	187
	
		

			




	...
	...
	
		
@@ -216,7 +209,7 @@


			




	216
	209
	
		
        }


			




	217
	210
	
		
      std::cout << "\nNum of nodes: " << desc.nodeNum;


			




	218
	211
	
		
      std::cout << "\nNum of arcs:  " << desc.edgeNum;


			




	219
	
	
		
      std::cout << '\n' << std::endl;


			




	
	212
	
		
      std::cout << "\n\n";


			




	220
	213
	
		
    }


			




	221
	214
	
		
    


			




	222
	215
	
		
  if(ap.given("double"))


			




        

    






    
    



    


    

     
    
0 comments (0 inline)