routesearch: middle arch is middle in list of arches, not arch of middle isle

diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index bdcc15759705bb5667d26583bdbd63315536d642..0933e0fecc9565b2368ebb0d3f4b55284aff5f6b 100644 (file)
--- a/yarrg/rscommon.h
+++ b/yarrg/rscommon.h
@@ -163,5 +163,15 @@ static inline int isle2arch(int isle) {
   return arch;
 }
 
   return arch;
 }
 

+static inline int route2midarch(const int *ports, int nports) {
+  int archs[nports], last_arch=-1, narchs=0, i;
+  for (i=0; i<nports; i++) {
+    int arch= isle2arch(ports[i]);
+    if (arch==last_arch) continue;
+    archs[narchs++]= last_arch= arch;
+  }
+  return archs[narchs/2];
+}
+

 
 #endif /*RSCOMMON_H*/
 
 #endif /*RSCOMMON_H*/

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index b3a6d73c6244a07629e270b3c827608a66fe80df..9283fbc2c002eb8ca70265bf384681fcb4009828 100644 (file)
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -113,11 +113,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 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,                                                        \
       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,                           \
              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");                                                  \
              (int)hs->value, (int)pr->absolute, (int)pr->perleague);         \
       for (i=0; i<nports; i++) fprintf(stderr," %d",ports[i]);               \
       fprintf(stderr,"\n");                                                  \

diff --git a/yarrg/rssearch.c b/yarrg/rssearch.c
index 2c530fd70eeab4219fa4534726129458ff47d474..5c6cc669b183d224923136237528f9eb9261fdb8 100644 (file)
--- a/yarrg/rssearch.c
+++ b/yarrg/rssearch.c
@@ -79,7 +79,7 @@ static double process_route(int nports, int totaldist,
   }
 
   int finisle= ports[nports-1]; int finarch= isle2arch(finisle);
   }
 
   int finisle= ports[nports-1]; int finarch= isle2arch(finisle);

-  int midisle= ports[nports/2]; int midarch= isle2arch(midisle);
+  int midarch= route2midarch(ports,nports);

 
   PotentialResult **strat_fin= ONDEMAND(strat_base[finarch], narches);
   PotentialResult *strat= ONDEMAND(strat_fin[midarch], 1);
 
   PotentialResult **strat_fin= ONDEMAND(strat_base[finarch], narches);
   PotentialResult *strat= ONDEMAND(strat_fin[midarch], 1);


@@ -105,7 +105,7 @@ static double process_route(int nports, int totaldist,
 
   debugf(" SOMEHOW BEST\n");
 
 
   debugf(" SOMEHOW BEST\n");
 

-  fildebugf("final %d:%3d mid %d:%3d ",finarch,finisle,midarch,midisle);
+  fildebugf("final %d:%3d mid %d ",finarch,finisle,midarch);

 
 #define CHK(absperl)                                                         \
   fildebugf(#absperl " %15f", absperl);                                              \
 
 #define CHK(absperl)                                                         \
   fildebugf(#absperl " %15f", absperl);                                              \