routesearch: allow constraining destination island

[ypp-sc-tools.db-test.git] / yarrg / rssearch.c

diff --git a/yarrg/rssearch.c b/yarrg/rssearch.c
index 2c530fd70eeab4219fa4534726129458ff47d474..fd2e66a16072723ea762e0bd662e4a6af27c298f 100644 (file)
--- a/yarrg/rssearch.c
+++ b/yarrg/rssearch.c
@@ -15,6 +15,7 @@ static Neighbour **neighbours; /* neighbours[islandid]->islandid etc. */
 static sqlite3_stmt *ss_neigh;
 
 static int ports[MAX_ROUTELEN];
+static int final_isle;
 
 static Neighbour *get_neighbours(int isle) {
   Neighbour **np= &neighbours[isle];
@@ -47,6 +48,8 @@ static double process_route(int nports, int totaldist,
 
   ctr_routes_considered++;
 
+  int wrong_final= final_isle && ports[nports-1] != final_isle;
+
   debugf("========== ROUTE");
   for (i=0; i<nports; i++)
     debugf(" %d",ports[i]);
@@ -70,6 +73,12 @@ static double process_route(int nports, int totaldist,
     }
     guess_perleague= guess_absolute / leagues_divisor;
 
+    if (wrong_final) {
+      ctr_routes_wrongfinalelim++;
+      debugf(" WFELIM\n");
+      return guess_absolute;
+    }
+
     if (guess_absolute <= highscores_absolute[0].value &&
        guess_perleague <= highscores_perleague[0].value) {
       ctr_routes_quickelim++;
@@ -79,7 +88,7 @@ static double process_route(int nports, int totaldist,
   }
 
   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);
@@ -99,13 +108,18 @@ static double process_route(int nports, int totaldist,
   double absolute= value_route(nports, ports, 0);
   double perleague= absolute / leagues_divisor;
 
+  if (wrong_final) {
+    ctr_routes_wrongfinal++;
+    return absolute;
+  }
+
   if (absolute <= strat->absolute &&
       perleague <= strat->perleague)
     return absolute;
 
   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);                                              \
@@ -167,8 +181,10 @@ static void recurse(int last_isle,
   }
 }
 
-void search(int start_isle, PotentialResult ****strat_base_io) {
+void search(int start_isle, int final_isle_spec,
+           PotentialResult ****strat_base_io) {
   strat_base= ONDEMAND(*strat_base_io, narches);
+  final_isle= final_isle_spec <= 0 ? 0 : final_isle_spec;
   recurse(start_isle,0,0,1e6);
 }