Changeset 7:79d9c9f6c446 in lemon-benchmark

Timestamp:

03/17/11 18:28:37 (14 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Command line parameter support for netgen

Location:

generators/netgen

Files:

• CMakeLists.txt (modified) (1 diff)
• main.cc (added)
• main.h (added)
• netgen.c (modified) (2 diffs)

generators/netgen/CMakeLists.txt

@@ -9 +9 @@
 
 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")
+
+TARGET_LINK_LIBRARIES(netgen
+  lemon
+)

generators/netgen/netgen.c

@@ -86 +86 @@
 #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 */
@@ -486 +472 @@
                 }
 
-int main()
-{
-  long seed;
-  long problem;
-  long parms[PROBLEM_PARMS];
+int orig_main(long seed,long problem,long *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);