routesearch: allow constraining destination island

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

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index 2fc2bdfaeb7819bae3a3993155eb19ecaa99e23c..c76e7da0b9e0132af407a77cc7b05b88b4c324e6 100644 (file)
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -2,6 +2,8 @@
 
 #include "rscommon.h"
 
+#include <ctype.h>
+
 int o_quiet= 0;
 double max_mass=-1, max_volu=-1, max_capi=-1;
 double distance_loss_factor_per_league;
@@ -58,43 +60,82 @@ 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);
+    MCALLOC(results, argc);
+
     max_dist= atoi(*argv++);
+    nhighscores_absolute= atoi(*argv++);
+    nhighscores_perleague= atoi(*argv++);
+    const char *final_isle_spec= *argv++;
+
+    MCALLOC(highscores_absolute, nhighscores_absolute);
+    MCALLOC(highscores_perleague, nhighscores_perleague);
+
     int resultsix= 0;
-    while ((arg= *argv++)) {
-      search(atoi(arg), &results[resultsix]);
+    while ((arg= argv[resultsix])) {
+      int init_isle= atoi(arg);
+      
+      int final_isle;
+      if (!strcmp(final_isle_spec,"circ")) final_isle= init_isle;
+      else if (!strcmp(final_isle_spec,"any")) final_isle= -1;
+      else final_isle= atoi(final_isle_spec);
+      assert(final_isle);
+
+      search(init_isle, final_isle, &results[resultsix]);
       resultsix++;
     }
 
-    int i, midisle, finisle;
+    int i, midarch, finarch;
     for (i=0; i<resultsix; i++) {
-      fprintf(stderr,"================== start #%d ==================\n",i);
+      fprintf(stderr,"============== start #%d %s [PARTIAL] ==============\n",
+             i, argv[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,"  ");
+      for (midarch=0; midarch<narches; midarch++) {
+       fprintf(stderr,"|   mid %d  ",midarch);
       }
       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];
+      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,"|       ");
+           fprintf(stderr,"|          ");
          } else {
-           if (result->absolute < 100) fprintf(stderr,"|  .");
-           else fprintf(stderr,"|%3d",(int)(result->absolute / 100));
+           fprintf(stderr,"|%5d",(int)(result->absolute));
            fprintf(stderr," ");
-           if (result->perleague < 10) fprintf(stderr,"  .");
-           else fprintf(stderr,"%3d",(int)(result->perleague / 10));
+           fprintf(stderr,"%4d",(int)(result->perleague));
          }
        }
        fprintf(stderr,"\n");
       }
     }
+
+    int pos;
+#define OUT(absperl)                                                         \
+    fprintf(stderr,"\n================== " #absperl " ==================\n"); \
+    for (pos=0; pos<nhighscores_##absperl; pos++) {                          \
+      HighScoreEntry *hs= &highscores_##absperl[pos];                        \
+      PotentialResult *pr= hs->pr;                                           \
+      if (!pr) continue;                                                     \
+      const int *const ports= pr->absperl##_ports;                           \
+      int nports;                                                            \
+      for (nports=0; nports<MAX_ROUTELEN && ports[nports]>=0; nports++);      \
+      int finisle= ports[nports-1]; int finarch= isle2arch(finisle);         \
+      int midarch= route2midarch(ports,nports);                                      \
+      fprintf(stderr,                                                        \
+             " @%2d #%2d | start%3d mid%d f%d:%3d | %5d %5d %4d |",     \
+             pos, nhighscores_##absperl - 1 - pos,                           \
+             ports[0], midarch, finarch,finisle,                     \
+             (int)hs->value, (int)pr->absolute, (int)pr->perleague);         \
+      for (i=0; i<nports; i++) fprintf(stderr," %d",ports[i]);               \
+      fprintf(stderr,"\n");                                                  \
+    }
+    OUT(absolute)
+    OUT(perleague)
+    
   } else {
     abort();
   }