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");