X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Frscommon.h;h=84fad6fdb4e788d3cb2a3962734de063a71a4619;hp=f02ffc0a4e6fc440592466d37f9405afd69ca133;hb=8dd381ffb993692b376e48eaa4b9ab506b3568e2;hpb=388e806e8cded8d8ff1d3aff2a5a0ac92be56edf

diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index f02ffc0..84fad6f 100644
--- a/yarrg/rscommon.h
+++ b/yarrg/rscommon.h
@@ -21,6 +21,8 @@ extern FILE *debug_file;
 #define DEBUG_DEV "/dev/stdout" /* just for glpk */
 
 
+#define GRANUS 3
+
 #define COUNTER_LIST				\
    CTR(commodities_loaded)			\
    CTR(trades_loaded)				\
@@ -33,7 +35,7 @@ extern FILE *debug_file;
    CTR(routes_bucketelim)			\
    CTR(routes_valued)				\
    CTR(routes_wrongfinal)			\
-   CTRA(newbests_granu,2)			\
+   CTRA(newbests_granu,GRANUS*2)		\
    CTR(subroute_tails_valued)			\
    CTR(subroutes_valued)			\
    CTR(subroutes_nonempty)
@@ -121,8 +123,6 @@ typedef struct {
   int ports[AP][MAX_ROUTELEN];
 } PotentialResult;
 
-#define GRANUS 3
-
 void setup_search(void);
 void search(int start_isle, int final_isle /* -1 means any */,
 	    PotentialResult ****buckets_base_io[GRANUS]
@@ -165,7 +165,7 @@ typedef struct {
   PotentialResult *pr;
 } HighScoreEntry;
 
-extern int mingranu;
+extern int granus;
 extern int nhighscores[GRANUS][AP];
 extern HighScoreEntry *highscores[GRANUS][AP];