X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=yarrg%2Frsmain.c;h=2fc2bdfaeb7819bae3a3993155eb19ecaa99e23c;hp=ed21fe88e441cba93ce1c940b99a7fe5585166e5;hb=2204eb5e3fb843a426dbc0858fa91ce72d63cc73;hpb=2388148ea6c557995767e4391088838946c2f238

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index ed21fe8..2fc2bdf 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;
 
@@ -39,6 +46,8 @@ int main(int argc, const char **argv) {
   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 < 100) fprintf(stderr,"|  .");
+	    else fprintf(stderr,"|%3d",(int)(result->absolute / 100));
+	    fprintf(stderr," ");
+	    if (result->perleague < 10) fprintf(stderr,"  .");
+	    else fprintf(stderr,"%3d",(int)(result->perleague / 10));
+	  }
+	}
+	fprintf(stderr,"\n");
+      }
+    }
   } else {
     abort();
   }
+
+#define CTR(x) fprintf(stderr,"  %-30s %10d\n",#x,ctr_##x);
+  COUNTER_LIST
+#undef CTR
+
   return 0;
 }