static sqlite3_stmt *ss_neigh;
static int ports[MAX_ROUTELEN];
+static int final_isle;
static Neighbour *get_neighbours(int isle) {
Neighbour **np= &neighbours[isle];
static double process_route(int nports, int totaldist,
double overestimate_excepting_tail) {
- int i;
+ int i, ap;
int leagues_divisor= totaldist + nports;
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]);
debugf("\n");
- double guess_absolute=0, guess_perleague=0;
+ double guess[AP]={0,0};
if (nports>=2) {
int pair[2], i;
pair[1]= ports[nports-1];
- guess_absolute= overestimate_excepting_tail;
-
+ guess[A]= overestimate_excepting_tail;
+
for (i=0; i<nports; i++) {
pair[0]= ports[i];
IslandPair *ip= ipair_get_maybe(pair[0], pair[1]);
ctr_subroute_tails_valued++;
ip->route_tail_value= value_route(2, pair, pair[0]!=pair[1]);
}
- guess_absolute += ip->route_tail_value;
+ guess[A] += ip->route_tail_value;
}
- guess_perleague= guess_absolute / leagues_divisor;
+ guess[P]= guess[A] / leagues_divisor;
- if (guess_absolute <= highscores_absolute[0].value &&
- guess_perleague <= highscores_perleague[0].value) {
+ if (wrong_final) {
+ ctr_routes_wrongfinalelim++;
+ debugf(" WFELIM\n");
+ return guess[A];
+ }
+
+ if (guess[A] <= highscores[A][0].value &&
+ guess[P] <= highscores[P][0].value) {
ctr_routes_quickelim++;
- debugf(" QELIM %f %f\n", guess_absolute, guess_perleague);
- return guess_absolute;
+ debugf(" QELIM %f %f\n", guess[A], guess[P]);
+ return guess[A];
}
}
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);
if (nports>=2) {
- if (guess_absolute <= strat->absolute &&
- guess_perleague <= strat->perleague) {
+ if (guess[A] <= strat->value[A] &&
+ guess[P] <= strat->value[P]) {
ctr_routes_stratelim++;
- debugf(" ELIM %f %f\n", guess_absolute, guess_perleague);
- return guess_absolute;
+ debugf(" ELIM %f %f\n", guess[A], guess[P]);
+ return guess[A];
}
- debugf(" COMPUTE %f %f\n", guess_absolute, guess_perleague);
+ debugf(" COMPUTE %f %f\n", guess[A], guess[P]);
}
ctr_routes_valued++;
- double absolute= value_route(nports, ports, 0);
- double perleague= absolute / leagues_divisor;
+ double value[AP];
+ value[A]= value_route(nports, ports, 0);
+ value[P]= value[A] / leagues_divisor;
+
+ if (wrong_final) {
+ ctr_routes_wrongfinal++;
+ return value[0];
+ }
- if (absolute <= strat->absolute &&
- perleague <= strat->perleague)
- return absolute;
+ if (value[A] <= strat->value[A] &&
+ value[P] <= strat->value[P])
+ return value[A];
debugf(" SOMEHOW BEST\n");
- fildebugf("final %d:%3d mid %d:%3d ",finarch,finisle,midarch,midisle);
-
-#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); \
+ fildebugf("final %d:%3d mid %d ",finarch,finisle,midarch);
+
+ for (ap=0; ap<AP; ap++) {
+ fildebugf("ap=%d %15f", ap, value[ap]);
+ if (value[ap] < strat->value[ap]) {
+ debugf(" ");
+ } else {
+ int pos;
+ ctr_newbests_strat[ap]++;
+ strat->value[ap]= value[ap];
+ memcpy(strat->ports[ap], ports, sizeof(*ports) * nports);
+ if (nports < MAX_ROUTELEN-1) strat->ports[ap][nports]= -1;
+ fildebugf("** ");
+ for (pos=0; pos < nhighscores[ap]; pos++)
+ if (highscores[ap][pos].pr == strat) goto found;
+ /* not found */
+ pos= -1;
+ found:
+ for (;;) {
+ pos++;
+ if (pos >= nhighscores[ap]-1) break; /* new top */
+ if (highscores[ap][pos].value >= value[ap]) break; /* found spot */
+ if (pos>0)
+ highscores[ap][pos-1]= highscores[ap][pos];
+ }
+ pos--;
+ if (pos>0) {
+ highscores[ap][pos].value= value[ap];
+ highscores[ap][pos].pr= strat;
+ }
+ fildebugf("@%2d", pos);
+ }
}
- CHK(absolute)
- CHK(perleague)
-
fildebugf(" route");
for (i=0; i<nports; i++)
fildebugf(" %d",ports[i]);
fildebugf("\n");
- return absolute;
+ return value[0];
}
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);
}
-int nhighscores_absolute, nhighscores_perleague;
-HighScoreEntry *highscores_absolute;
-HighScoreEntry *highscores_perleague;
+int nhighscores[AP];
+HighScoreEntry *highscores[AP];
int narches;
char **archnames;
~yarrgweb / ypp-sc-tools.db-live.git / blobdiff