routesearch: Use correct island pair when eliminating!

[ypp-sc-tools.db-test.git] / yarrg / rsmain.c

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index 7e5e5e8a2af2b06c5e1199ae075c31eb3f0e658c..ed21fe88e441cba93ce1c940b99a7fe5585166e5 100644 (file)
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -10,32 +10,47 @@ int max_dist= -1;
 int main(int argc, const char **argv) {
   const char *arg;
 
+#ifndef debug_flags
   debug_flags= ~( dbg_sql2 );
+#endif
   sysassert( !setvbuf(debug,0,_IOLBF,0) );
+  
+  for (;;) {
+    arg= *++argv;
+    if (arg[0] != '-') break;
+#ifndef debug_flags
+    if (!strcmp(arg,"-DN")) {
+      debug_flags= 0;
+    } else
+#endif
+    {
+      abort();
+    }
+  }
 
-  setup_sql();
-  setup_value();
-  setup_search();
-
-  max_mass= atof(*++argv);
-  max_volu= atof(*++argv);
-  max_capi= atof(*++argv);
-  double loss_per_league= atof(*++argv);
+  max_mass= atof(*argv++);
+  max_volu= atof(*argv++);
+  max_capi= atof(*argv++);
+  double loss_per_league= atof(*argv++);
 
   if (!loss_per_league) loss_per_league= 1e-7;
   distance_loss_factor_per_league= 1.0 - loss_per_league;
+
+  setup_sql();
+  setup_value();
+  setup_search();
   
-  arg= *++argv;
+  arg= *argv++;
   if (!strcmp(arg,"specific")) {
     int ia[argc], ni=0;
-    while ((arg= *++argv))
+    while ((arg= *argv++))
       ia[ni++]= atoi(arg);
 
-    double val= value_route(ni, ia);
+    double val= value_route(ni, ia, 0);
     printf("route value is %g\n", val);
   } else if (!strcmp(arg,"search")) {
-    max_dist= atoi(*++argv);
-    while ((arg= *++argv))
+    max_dist= atoi(*argv++);
+    while ((arg= *argv++))
       search(atoi(arg));
   } else {
     abort();