-/**/
+/*
+ * Route searcher - recursive iteration over all routes
+ */
+/*
+ * This is part of the YARRG website, a tool for assisting
+ * players of Yohoho Puzzle Pirates.
+ *
+ * Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
+ * are used without permission. This program is not endorsed or
+ * sponsored by Three Rings.
+ */
#include "rscommon.h"
}
if (nports>=2) {
- for (granui=0; granui<granus; granui++) {
- if (guess[A] > buckets[granui]->prs[A].value[A] ||
- guess[P] > buckets[granui]->prs[P].value[P])
- goto not_bucketelim;
- }
+ for (granui=0; granui<granus; granui++)
+ for (ap=0; ap<AP; ap++)
+ if (guess[ap] > buckets[granui]->prs[ap].value[ap] &&
+ guess[ap] > highscores[granui][ap][0].value)
+ goto not_bucketelim;
ctr_routes_bucketelim++;
debugf(" ELIM %f %f\n", guess[A], guess[P]);
return guess[A];
} else {
int pos;
ctr_newbests_granu[granui*AP+ap]++;
+ bucket->prs[ap].length= totaldist;
memcpy(bucket->prs[ap].value, value, sizeof(value));
memcpy(bucket->prs[ap].ports, ports, sizeof(*ports) * nports);
if (nports < MAX_ROUTELEN-1) bucket->prs[ap].ports[nports]= -1;