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 b3a6d73c6244a07629e270b3c827608a66fe80df..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;
@@ -63,19 +65,28 @@ int main(int argc, const char **argv) {
     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[resultsix])) {
-      search(atoi(arg), &results[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, midarch, finarch;
     for (i=0; i<resultsix; i++) {
-      fprintf(stderr,"============== start #%d %s ==============\n",
+      fprintf(stderr,"============== start #%d %s [PARTIAL] ==============\n",
              i, argv[i]);
       PotentialResult ***strat_resultsix= results[i];
       if (!strat_resultsix) continue;
@@ -113,11 +124,11 @@ int main(int argc, const char **argv) {
       int nports;                                                            \
       for (nports=0; nports<MAX_ROUTELEN && ports[nports]>=0; nports++);      \
       int finisle= ports[nports-1]; int finarch= isle2arch(finisle);         \
-      int midisle= ports[nports/2]; int midarch= isle2arch(midisle);         \
+      int midarch= route2midarch(ports,nports);                                      \
       fprintf(stderr,                                                        \
-             " @%2d #%2d | start%3d mid %d:%3d f%d:%3d | %5d %5d %4d |",     \
+             " @%2d #%2d | start%3d mid%d f%d:%3d | %5d %5d %4d |",     \
              pos, nhighscores_##absperl - 1 - pos,                           \
-             ports[0], midarch,midisle, finarch,finisle,                     \
+             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");                                                  \