# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1300382917 -3600
# Node ID 79d9c9f6c44638da83561e1e6c20bd8ccb327e8a
# Parent  a3ef33a8694ab99191623f6b948fdbd5926fb212
Command line parameter support for netgen

diff -r a3ef33a8694a -r 79d9c9f6c446 generators/netgen/CMakeLists.txt
--- a/generators/netgen/CMakeLists.txt	Fri Nov 26 19:23:47 2010 +0100
+++ b/generators/netgen/CMakeLists.txt	Thu Mar 17 18:28:37 2011 +0100
@@ -8,7 +8,11 @@
 )
 
 ADD_EXECUTABLE(netgen
-        netgen.c index.c random.c
+  main.cc netgen.c index.c random.c
 )
 
-SET_TARGET_PROPERTIES(netgen PROPERTIES COMPILE_DEFINITIONS "DIMACS")
\ No newline at end of file
+SET_TARGET_PROPERTIES(netgen PROPERTIES COMPILE_DEFINITIONS "DIMACS")
+
+TARGET_LINK_LIBRARIES(netgen
+  lemon
+)
diff -r a3ef33a8694a -r 79d9c9f6c446 generators/netgen/main.cc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/generators/netgen/main.cc	Thu Mar 17 18:28:37 2011 +0100
@@ -0,0 +1,51 @@
+#include <lemon/arg_parser.h>
+#include "main.h"
+
+int main(int argc, char **argv)
+{
+  int seed=1;
+  int problem=0;
+  int parms[PROBLEM_PARMS];
+  
+  lemon::ArgParser ap(argc,argv);
+  ap.refOption("seed","Random seed (default: 1)",seed)
+    .refOption("problem","Problem type (default: 0)",problem)
+    .refOption("nodes","Number of nodes (default: 10)",NODES)
+    .refOption("sources","Source nodes (default: 3)",SOURCES)
+    .refOption("sinks","Sink nodes (default: 3)",SINKS)
+    .refOption("density","Number of arcs (default: 30)",DENSITY)
+    .refOption("mincost","Minimum arc cost (default: 10)",MINCOST)
+    .refOption("maxcost","Maximum arc cost (default: 99)",MAXCOST)
+    .refOption("supply","Total supply (default: 1000)",SUPPLY)
+    .refOption("tsources","Transshipment sources (default: 0)",TSOURCES)
+    .refOption("tsinks","Transshipment sinks (default: 0)",TSINKS)
+    .refOption("hicost",
+               "Percent of skeleton arcs given maximum cost (default: 0)",
+               HICOST)
+    .refOption("capacitated","Percent of arcs to be capacitated (default: 100)",
+               CAPACITATED)
+    .refOption("mincap","Minimum arc capacity (default: 100)",MINCAP)
+    .refOption("maxcap","Maximum arc capacity (default: 1000)",MAXCAP);
+
+  NODES=10;
+  SOURCES=3;
+  SINKS=3;
+  DENSITY=30;
+  MINCOST=10;
+  MAXCOST=99;
+  SUPPLY=1000;
+  TSOURCES=0;
+  TSINKS=0;
+  HICOST=0;
+  CAPACITATED=100;
+  MINCAP=100;
+  MAXCAP=1000;
+
+  ap.run();
+  
+  long lparms[PROBLEM_PARMS];
+  for(int i=0;i<PROBLEM_PARMS;i++) lparms[i]=parms[i];
+
+  return orig_main(seed,problem,lparms);  
+}
+
diff -r a3ef33a8694a -r 79d9c9f6c446 generators/netgen/main.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/generators/netgen/main.h	Thu Mar 17 18:28:37 2011 +0100
@@ -0,0 +1,30 @@
+#ifndef NETGEN_MAIN_H
+#define NETGEN_MAIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define PROBLEM_PARMS 13		/* aliases for generation parameters */
+#define NODES	    parms[0]		/* number of nodes */
+#define SOURCES     parms[1]		/* number of sources (including transshipment) */
+#define SINKS	    parms[2]		/* number of sinks (including transshipment) */
+#define DENSITY     parms[3]		/* number of (requested) arcs */
+#define MINCOST     parms[4]		/* minimum cost of arcs */
+#define MAXCOST     parms[5]		/* maximum cost of arcs */
+#define SUPPLY	    parms[6]		/* total supply */
+#define TSOURCES    parms[7]		/* transshipment sources */
+#define TSINKS	    parms[8]		/* transshipment sinks */
+#define HICOST	    parms[9]		/* percent of skeleton arcs given maximum cost */
+#define CAPACITATED parms[10]		/* percent of arcs to be capacitated */
+#define MINCAP	    parms[11]		/* minimum capacity for capacitated arcs */
+#define MAXCAP	    parms[12]		/* maximum capacity for capacitated arcs */
+
+  int orig_main(long seed,long problem,long *parms);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff -r a3ef33a8694a -r 79d9c9f6c446 generators/netgen/netgen.c
--- a/generators/netgen/netgen.c	Fri Nov 26 19:23:47 2010 +0100
+++ b/generators/netgen/netgen.c	Thu Mar 17 18:28:37 2011 +0100
@@ -85,21 +85,7 @@
 #define ALLOCATE_NETWORK
 #include "netgen.h"
 
-#define PROBLEM_PARMS 13		/* aliases for generation parameters */
-#define NODES	    parms[0]		/* number of nodes */
-#define SOURCES     parms[1]		/* number of sources (including transshipment) */
-#define SINKS	    parms[2]		/* number of sinks (including transshipment) */
-#define DENSITY     parms[3]		/* number of (requested) arcs */
-#define MINCOST     parms[4]		/* minimum cost of arcs */
-#define MAXCOST     parms[5]		/* maximum cost of arcs */
-#define SUPPLY	    parms[6]		/* total supply */
-#define TSOURCES    parms[7]		/* transshipment sources */
-#define TSINKS	    parms[8]		/* transshipment sinks */
-#define HICOST	    parms[9]		/* percent of skeleton arcs given maximum cost */
-#define CAPACITATED parms[10]		/* percent of arcs to be capacitated */
-#define MINCAP	    parms[11]		/* minimum capacity for capacitated arcs */
-#define MAXCAP	    parms[12]		/* maximum capacity for capacitated arcs */
-
+#include "main.h"
 
 /*** Private interfaces */
 
@@ -485,23 +471,13 @@
 			exit(0);						\
 		}
 
-int main()
+int orig_main(long seed,long problem,long *parms)
 {
-  long seed;
-  long problem;
-  long parms[PROBLEM_PARMS];
   long arcs;
   int i;
 
 /*** Read problem parameters and generate networks */
-
-  while (1) {
-    READ(seed);
-    if (seed <= 0) exit(0);
-    READ(problem);
-    if (problem <= 0) exit(0);
-    for (i = 0; i < PROBLEM_PARMS; i++)
-      READ(parms[i]);
+  {
     printf("c NETGEN flow network generator (C version)\n");
     printf("c  Problem %2ld input parameters\n", problem);
     printf("c  ---------------------------\n");