WIP routesearch; stratify by archipelagoes - much better

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

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index ed21fe88e441cba93ce1c940b99a7fe5585166e5..a498022649042309a704165ad2ce4e3a6abf7fd2 100644 (file)
--- 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, midarch, finarch;
+    for (i=0; i<resultsix; i++) {
+      fprintf(stderr,"================== start #%d ==================\n",i);
+      PotentialResult ***strat_resultsix= results[i];
+      if (!strat_resultsix) continue;
+      fprintf(stderr,"  ");
+      for (midarch=0; midarch<narches; midarch++) {
+       fprintf(stderr,"| mid %d ",midarch);
+      }
+      fprintf(stderr,"\n");
+      for (finarch=0; finarch<narches; finarch++) {
+       PotentialResult **strat_finarch= strat_resultsix[finarch];
+       if (!strat_finarch) continue;
+       fprintf(stderr,"f%d",finarch);
+       for (midarch=0; midarch<narches; midarch++) {
+         PotentialResult *result= strat_finarch[midarch];
+         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;
 }