X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Frsmain.c;h=0e43d5d471e73114d9e90014d3dfc8eca3db3dca;hp=0982889c8b3f8fc34d2c25e9fb4fe314f3d79a84;hb=cf1aa28767bcecb39ff18b2ee80952ed38f40e0d;hpb=fe2cd54600f099689170bc2d9c47a48559c1d692

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index 0982889..0e43d5d 100644
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -7,6 +7,13 @@ double max_mass=-1, max_volu=-1, max_capi=-1;
 double distance_loss_factor_per_league;
 int max_dist= -1;
 
+#define CTR(x) int ctr_##x;
+  COUNTER_LIST
+#undef CTR
+
+static PotentialResult ****results;
+  /* results[start_isle_ix][finalisle][midisle]-> */
+
 int main(int argc, const char **argv) {
   const char *arg;
 
@@ -28,10 +35,6 @@ int main(int argc, const char **argv) {
     }
   }
 
-  setup_sql();
-  setup_value();
-  setup_search();
-
   max_mass= atof(*argv++);
   max_volu= atof(*argv++);
   max_capi= atof(*argv++);
@@ -39,6 +42,12 @@ 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;
+
+  setup_sql();
+  setup_value();
+  setup_search();
+
+  fprintf(stderr,"setup complete, starting search\n");
   
   arg= *argv++;
   if (!strcmp(arg,"specific")) {
@@ -49,11 +58,50 @@ int main(int argc, const char **argv) {
     double val= value_route(ni, ia, 0);
     printf("route value is %g\n", val);
   } else if (!strcmp(arg,"search")) {
+    results= mcalloc(sizeof(*results)*argc);
     max_dist= atoi(*argv++);
-    while ((arg= *argv++))
-      search(atoi(arg));
+    int resultsix= 0;
+    while ((arg= *argv++)) {
+      search(atoi(arg), &results[resultsix]);
+      resultsix++;
+    }
+
+    int i, midisle, finisle;
+    for (i=0; i<resultsix; i++) {
+      fprintf(stderr,"================== start #%d ==================\n",i);
+      PotentialResult ***strat_resultsix= results[i];
+      if (!strat_resultsix) continue;
+      fprintf(stderr,"    ");
+      for (midisle=0; midisle<islandtablesz; midisle++) {
+	fprintf(stderr,"|mi%-3d",midisle);
+      }
+      fprintf(stderr,"\n");
+      for (finisle=0; finisle<islandtablesz; finisle++) {
+	PotentialResult **strat_finisle= strat_resultsix[finisle];
+	if (!strat_finisle) continue;
+	fprintf(stderr,"f%-3d",finisle);
+	for (midisle=0; midisle<islandtablesz; midisle++) {
+	  PotentialResult *result= strat_finisle[midisle];
+	  if (!result) {
+	    fprintf(stderr,"|     ");
+	  } else {
+	    if (result->absolute < 1000) fprintf(stderr,"| <");
+	    else fprintf(stderr,"|%2d",(int)(result->absolute / 1000));
+	    fprintf(stderr," ");
+	    if (result->perleague < 100) fprintf(stderr," <");
+	    else fprintf(stderr,"%2d",(int)(result->perleague / 100));
+	  }
+	}
+	fprintf(stderr,"\n");
+      }
+    }
   } else {
     abort();
   }
+
+#define CTR(x) fprintf(stderr,"  %-30s %10d\n",#x,ctr_##x);
+  COUNTER_LIST
+#undef CTR
+
   return 0;
 }