static sqlite3_stmt *ss_neigh;
static int ports[MAX_ROUTELEN];
+static int final_isle;
static Neighbour *get_neighbours(int isle) {
Neighbour **np= &neighbours[isle];
SQL_BIND(ss_neigh, 1, isle);
while (SQL_STEP(ss_neigh)) {
- Neighbour *add= mmalloc(sizeof(*add));
+ Neighbour *add;
+ NEW(add);
add->islandid= sqlite3_column_int(ss_neigh, 0);
add->dist= sqlite3_column_int(ss_neigh, 1);
add->next= head;
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;
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");
- 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];
}
guess_absolute += ip->route_tail_value;
}
- double guess_perleague= guess_absolute / leagues_divisor;
+ 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++;
+ debugf(" QELIM %f %f\n", guess_absolute, guess_perleague);
+ return guess_absolute;
+ }
+ }
+
+ int finisle= ports[nports-1]; int finarch= isle2arch(finisle);
+ 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) {
- ctr_routes_eliminated++;
+ ctr_routes_stratelim++;
debugf(" ELIM %f %f\n", guess_absolute, guess_perleague);
return guess_absolute;
}
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);
-
-#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("** "); \
+ fildebugf("final %d:%3d mid %d ",finarch,finisle,midarch);
+
+#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)
}
}
-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 narches;
char **archnames;
int *islandid2arch;
void setup_search(void) {
- neighbours= mcalloc(sizeof(*neighbours) * islandtablesz);
+ MCALLOC(neighbours, islandtablesz);
SQL_PREPARE(ss_neigh,
"SELECT biid, dist FROM routes WHERE aiid=?");
" SELECT DISTINCT archipelago\n"
" FROM islands\n"
" )");
- archnames= mcalloc(sizeof(*archnames) * max_narches);
- islandid2arch= mmalloc(sizeof(*islandid2arch) * islandtablesz);
- int i;
- for (i=0; i<islandtablesz; i++) islandid2arch[i]=-1;
+ MCALLOC(archnames, max_narches);
+ MCALLOC_INITEACH(islandid2arch, islandtablesz, *this=-1);
sqlite3_stmt *archs;
SQL_PREPARE(archs,
~yarrgweb / ypp-sc-tools.db-live.git / blobdiff