X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=yarrg%2Frssearch.c;fp=yarrg%2Frssearch.c;h=2c530fd70eeab4219fa4534726129458ff47d474;hp=6674c02952a263dde69b7c4c1838e737f2a8a63d;hb=4ed298fb2ac975783ad1a350659f5ae22825e24e;hpb=d0f65e91f071ebb0fbc6791ee168e2be5ba8e5ae

diff --git a/yarrg/rssearch.c b/yarrg/rssearch.c
index 6674c02..2c530fd 100644
--- a/yarrg/rssearch.c
+++ b/yarrg/rssearch.c
@@ -40,12 +40,6 @@ static Neighbour *get_neighbours(int isle) {
 static PotentialResult ***strat_base;
 
 
-static inline int isle2arch(int isle) {
-  int arch= islandid2arch[isle];
-  assert(arch>=0);
-  return arch;
-}
-
 static double process_route(int nports, int totaldist,
 			    double overestimate_excepting_tail) {
   int i;
@@ -58,16 +52,11 @@ static double process_route(int nports, int totaldist,
     debugf(" %d",ports[i]);
   debugf("\n");
 
-  int finisle= ports[nports-1]; int finarch= isle2arch(finisle);
-  int midisle= ports[nports/2]; int midarch= isle2arch(midisle);
-
-  PotentialResult **strat_fin= ONDEMAND(strat_base[finarch], narches);
-  PotentialResult *strat= ONDEMAND(strat_fin[midarch], 1);
-
+  double guess_absolute=0, guess_perleague=0;
   if (nports>=2) {
     int pair[2], i;
     pair[1]= ports[nports-1];
-    double guess_absolute= overestimate_excepting_tail;
+    guess_absolute= overestimate_excepting_tail;
     
     for (i=0; i<nports; i++) {
       pair[0]= ports[i];
@@ -79,11 +68,26 @@ static double process_route(int nports, int totaldist,
       }
       guess_absolute += ip->route_tail_value;
     }
-    double guess_perleague= guess_absolute / leagues_divisor;
+    guess_perleague= guess_absolute / leagues_divisor;
 
+    if (guess_absolute <= highscores_absolute[0].value &&
+	guess_perleague <= highscores_perleague[0].value) {
+      ctr_routes_quickelim++;
+      debugf(" QELIM %f %f\n", guess_absolute, guess_perleague);
+      return guess_absolute;
+    }
+  }
+
+  int finisle= ports[nports-1]; int finarch= isle2arch(finisle);
+  int midisle= ports[nports/2]; int midarch= isle2arch(midisle);
+
+  PotentialResult **strat_fin= ONDEMAND(strat_base[finarch], narches);
+  PotentialResult *strat= ONDEMAND(strat_fin[midarch], 1);
+
+  if (nports>=2) {
     if (guess_absolute <= strat->absolute &&
 	guess_perleague <= strat->perleague) {
-      ctr_routes_eliminated++;
+      ctr_routes_stratelim++;
       debugf(" ELIM %f %f\n", guess_absolute, guess_perleague);
       return guess_absolute;
     }
@@ -103,14 +107,35 @@ static double process_route(int nports, int totaldist,
 
   fildebugf("final %d:%3d mid %d:%3d ",finarch,finisle,midarch,midisle);
 
-#define CHK(absperl)							\
-  fildebugf(#absperl " %15f", absperl);					\
-  if (absperl < strat->absperl) {					\
-    debugf("   ");							\
-  } else {								\
-    strat->absperl= absperl;						\
-    memcpy(strat->absperl##_ports, ports, sizeof(*ports) * nports);	\
-    fildebugf("** ");							\
+#define CHK(absperl)							      \
+  fildebugf(#absperl " %15f", absperl);					      \
+  if (absperl < strat->absperl) {					      \
+    debugf("      ");							      \
+  } else {								      \
+    int pos;								      \
+    ctr_newbests_strat_##absperl++;					      \
+    strat->absperl= absperl;						      \
+    memcpy(strat->absperl##_ports, ports, sizeof(*ports) * nports);	      \
+    if (nports < MAX_ROUTELEN-1) strat->absperl##_ports[nports]= -1;	      \
+    fildebugf("** ");							      \
+    for (pos=0; pos < nhighscores_##absperl; pos++)			      \
+      if (highscores_##absperl[pos].pr == strat) goto found_##absperl;	      \
+    /* not found */							      \
+    pos= -1;								      \
+   found_##absperl:							      \
+    for (;;) {								      \
+      pos++;								      \
+      if (pos >= nhighscores_##absperl-1) break; /* new top */		      \
+      if (highscores_##absperl[pos].value >= absperl) break; /* found spot */ \
+      if (pos>0)							      \
+	highscores_##absperl[pos-1]= highscores_##absperl[pos];		      \
+    }									      \
+    pos--;								      \
+    if (pos>0) {							      \
+      highscores_##absperl[pos].value= absperl;				      \
+      highscores_##absperl[pos].pr= strat;				      \
+    }									      \
+    fildebugf("@%2d", pos);						      \
   }
 
   CHK(absolute)
@@ -147,6 +172,9 @@ void search(int start_isle, PotentialResult ****strat_base_io) {
   recurse(start_isle,0,0,1e6);
 }
 
+int nhighscores_absolute, nhighscores_perleague;
+HighScoreEntry *highscores_absolute;
+HighScoreEntry *highscores_perleague;
 
 int narches;
 char **archnames;