routesearch: use presolver

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

diff --git a/yarrg/rssearch.c b/yarrg/rssearch.c
index eb40a47fbdeba5cb144118e53fc40b9de099ad82..87914a8cd89232748821b717791ade6810e6196e 100644 (file)
--- a/yarrg/rssearch.c
+++ b/yarrg/rssearch.c
@@ -41,6 +41,8 @@ static double process_route(int nports, int totaldist,
   int i;
   int leagues_divisor= totaldist + nports;
 
+  ctr_routes_considered++;
+
   debugf("========== ROUTE");
   for (i=0; i<nports; i++)
     debugf(" %d",ports[i]);
@@ -53,20 +55,26 @@ static double process_route(int nports, int totaldist,
     
     for (i=0; i<nports; i++) {
       pair[0]= ports[i];
-      IslandPair *ip= ipair_get(ports[nports-2], ports[nports-1]);
-      if (ip->route_tail_value < 0)
+      IslandPair *ip= ipair_get_maybe(pair[0], pair[1]);
+      if (!ip) continue;
+      if (ip->route_tail_value < 0) {
+       ctr_subroute_tails_valued++;
        ip->route_tail_value= value_route(2, pair, pair[0]!=pair[1]);
+      }
       guess_absolute += ip->route_tail_value;
     }
     double guess_perleague= guess_absolute / leagues_divisor;
 
     if (guess_absolute <= best_absolute && guess_perleague <= best_perleague) {
+      ctr_routes_eliminated++;
       debugf(" ELIM %f %f\n", guess_absolute, guess_perleague);
       return guess_absolute;
     }
     debugf(" COMPUTE %f %f\n", guess_absolute, guess_perleague);
   }
 
+  ctr_routes_valued++;
+
   double absolute= value_route(nports, ports, 0);
   double perleague= absolute / leagues_divisor;