X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;ds=sidebyside;f=yarrg%2Frsmain.c;h=4b7dea9907678a6840d778d92891f919e8f2d24c;hb=7cadaf1a332c11a000970a044bd103b8e1865545;hp=ed176354e902ed8a402be49eed313240abb00bc9;hpb=8aaade51e5904619daf638d496ce1162138d940f;p=ypp-sc-tools.db-test.git

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index ed17635..4b7dea9 100644
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -5,12 +5,16 @@
 int o_quiet= 0;
 double max_mass=-1, max_volu=-1, max_capi=-1;
 double distance_loss_factor_per_league;
+int max_dist= -1;
 
 int main(int argc, const char **argv) {
-  int ia[argc], ni=0;
+  const char *arg;
+
+  debug_flags= ~( dbg_sql2 );
 
-  debug_flags= ~0UL;
-  setup();
+  setup_sql();
+  setup_value();
+  setup_search();
 
   max_mass= atof(*++argv);
   max_volu= atof(*++argv);
@@ -20,10 +24,20 @@ int main(int argc, const char **argv) {
   if (!loss_per_league) loss_per_league= 1e-7;
   distance_loss_factor_per_league= 1.0 - loss_per_league;
   
-  const char *arg;
-  while ((arg= *++argv)) {
-    ia[ni++]= atoi(arg);
+  arg= *++argv;
+  if (!strcmp(arg,"specific")) {
+    int ia[argc], ni=0;
+    while ((arg= *++argv))
+      ia[ni++]= atoi(arg);
+
+    double val= value_route(ni, ia);
+    printf("route value is %g\n", val);
+  } else if (!strcmp(arg,"search")) {
+    max_dist= atoi(*++argv);
+    while ((arg= *++argv))
+      search(atoi(arg));
+  } else {
+    abort();
   }
-  value_route(ni, ia);
   return 0;
 }