X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2Frsmain.c;fp=yarrg%2Frsmain.c;h=c76e7da0b9e0132af407a77cc7b05b88b4c324e6;hp=9283fbc2c002eb8ca70265bf384681fcb4009828;hb=85fced6311966d8533ce8186f4f98ff8b6303619;hpb=706d75804688b94f51b806adc44f10269c35b0db

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index 9283fbc..c76e7da 100644
--- 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;