PotentialResult *buckets[GRANUS];
int granui;
- for (granui=mingranu; granui<GRANUS; granui++) {
+ for (granui=0; granui<granus; granui++) {
PotentialResult **buckets_fin;
int mid, fin;
switch (granui) {
- case 0: fin=finisle; mid=midisle; break;
+ case 0: fin=finarch; mid=midarch; break;
case 1: fin=finisle; mid=midarch; break;
- case 2: fin=finarch; mid=midarch; break;
+ case 2: fin=finisle; mid=midisle; break;
default: abort();
}
buckets_fin= ONDEMAND(buckets_base[granui][fin], granusz_mid[granui]);
}
if (nports>=2) {
- if (guess[A] <= buckets[mingranu]->value[A] &&
- guess[P] <= buckets[mingranu]->value[P]) {
+ if (guess[A] <= buckets[0]->value[A] &&
+ guess[P] <= buckets[0]->value[P]) {
ctr_routes_bucketelim++;
debugf(" ELIM %f %f\n", guess[A], guess[P]);
return guess[A];
return value[0];
}
- for (granui=mingranu; granui<GRANUS; granui++) {
+ for (granui=granus-1; granui>=0; granui--) {
PotentialResult *bucket= buckets[granui];
if (value[A] <= bucket->value[A] &&
debugf(" SOMEHOW %d BEST\n",granui);
fildebugf("final %d:%3d mid %d ",finarch,finisle,midarch);
+ int relevant=0;
for (ap=0; ap<AP; ap++) {
HighScoreEntry *scores= highscores[granui][ap];
if (pos>0) {
scores[pos].value= value[ap];
scores[pos].pr= bucket;
+ relevant=1;
}
fildebugf("@%2d", pos);
- }
- }
- }
+ } /* new best */
+ } /* ap */
+ if (!relevant)
+ /* both absolute and perleague are full at this granularity,
+ * so we don't care about anything more granular */
+ granus= granui+1;
+ } /* granui */
fildebugf(" route");
int nhighscores[GRANUS][AP];
HighScoreEntry *highscores[GRANUS][AP];
-int mingranu, granusz_fin[GRANUS], granusz_mid[GRANUS];
+int granus=GRANUS, granusz_fin[GRANUS], granusz_mid[GRANUS];
int narches;
char **archnames;
}
sqlite3_finalize(archs);
- granusz_fin[0]= granusz_mid[0]= islandtablesz;
+ granusz_fin[0]= granusz_mid[0]= narches;
granusz_fin[1]= islandtablesz; granusz_mid[1]= narches;
- granusz_fin[2]= granusz_mid[2]= narches;
+ granusz_fin[2]= granusz_mid[2]= islandtablesz;
}