#define COUNTER_LIST \
CTR(commodities_loaded) \
CTR(trades_loaded) \
+ CTR(islands_arbitrage) \
+ CTR(ipairs_relevant) \
CTR(quantities_loaded) \
CTR(routes_considered) \
- CTR(routes_eliminated) \
+ CTR(routes_quickelim) \
+ CTR(routes_stratelim) \
CTR(routes_valued) \
+ CTR(newbests_strat_absolute) \
+ CTR(newbests_strat_perleague) \
CTR(subroute_tails_valued) \
CTR(subroutes_valued) \
CTR(subroutes_nonempty)
})
+typedef struct {
+ double value;
+ PotentialResult *pr;
+} HighScoreEntry;
+
+extern int nhighscores_absolute, nhighscores_perleague;
+extern HighScoreEntry *highscores_absolute;
+extern HighScoreEntry *highscores_perleague;
+
+
#define ONDEMAND(pointer_lvalue, calloc_size_count) \
((pointer_lvalue) ? : \
((pointer_lvalue) = mcalloc(sizeof(*(pointer_lvalue)) * calloc_size_count)))
+static inline int isle2arch(int isle) {
+ int arch= islandid2arch[isle];
+ assert(arch>=0);
+ return arch;
+}
+
+
#endif /*RSCOMMON_H*/
printf("route value is %g\n", val);
} else if (!strcmp(arg,"search")) {
MCALLOC(results, argc);
+
max_dist= atoi(*argv++);
+ nhighscores_absolute= atoi(*argv++);
+ nhighscores_perleague= atoi(*argv++);
+
+ MCALLOC(highscores_absolute, nhighscores_absolute);
+ MCALLOC(highscores_perleague, nhighscores_perleague);
+
int resultsix= 0;
- while ((arg= *argv++)) {
+ while ((arg= argv[resultsix])) {
search(atoi(arg), &results[resultsix]);
resultsix++;
}
int i, midarch, finarch;
for (i=0; i<resultsix; i++) {
- fprintf(stderr,"================== start #%d ==================\n",i);
+ fprintf(stderr,"============== start #%d %s ==============\n",
+ i, argv[i]);
PotentialResult ***strat_resultsix= results[i];
if (!strat_resultsix) continue;
fprintf(stderr," ");
fprintf(stderr,"\n");
}
}
+
+ int pos;
+#define OUT(absperl) \
+ fprintf(stderr,"\n================== " #absperl " ==================\n"); \
+ for (pos=0; pos<nhighscores_##absperl; pos++) { \
+ HighScoreEntry *hs= &highscores_##absperl[pos]; \
+ PotentialResult *pr= hs->pr; \
+ if (!pr) continue; \
+ const int *const ports= pr->absperl##_ports; \
+ int nports; \
+ for (nports=0; nports<MAX_ROUTELEN && ports[nports]>=0; nports++); \
+ int finisle= ports[nports-1]; int finarch= isle2arch(finisle); \
+ int midisle= ports[nports/2]; int midarch= isle2arch(midisle); \
+ fprintf(stderr, \
+ " @%2d #%2d | start%3d mid %d:%3d f%d:%3d | %5d %5d %4d |", \
+ pos, nhighscores_##absperl - 1 - pos, \
+ ports[0], midarch,midisle, finarch,finisle, \
+ (int)hs->value, (int)pr->absolute, (int)pr->perleague); \
+ for (i=0; i<nports; i++) fprintf(stderr," %d",ports[i]); \
+ fprintf(stderr,"\n"); \
+ }
+ OUT(absolute)
+ OUT(perleague)
+
} else {
abort();
}
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;
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 (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;
}
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)
recurse(start_isle,0,0,1e6);
}
+int nhighscores_absolute, nhighscores_perleague;
+HighScoreEntry *highscores_absolute;
+HighScoreEntry *highscores_perleague;
int narches;
char **archnames;