X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;ds=sidebyside;f=yarrg%2Frscommon.h;fp=yarrg%2Frscommon.h;h=f02ffc0a4e6fc440592466d37f9405afd69ca133;hb=388e806e8cded8d8ff1d3aff2a5a0ac92be56edf;hp=9e1032a4053c7cade117cd0650f00855560ad597;hpb=6ab7c759c0aab39bfaf8275041dd39f45062399c;p=ypp-sc-tools.db-test.git

diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index 9e1032a..f02ffc0 100644
--- a/yarrg/rscommon.h
+++ b/yarrg/rscommon.h
@@ -30,10 +30,10 @@ extern FILE *debug_file;
    CTR(routes_considered)			\
    CTR(routes_wrongfinalelim)			\
    CTR(routes_quickelim)			\
-   CTR(routes_stratelim)			\
+   CTR(routes_bucketelim)			\
    CTR(routes_valued)				\
    CTR(routes_wrongfinal)			\
-   CTRA(newbests_strat,2)			\
+   CTRA(newbests_granu,2)			\
    CTR(subroute_tails_valued)			\
    CTR(subroutes_valued)			\
    CTR(subroutes_nonempty)
@@ -121,12 +121,12 @@ typedef struct {
   int ports[AP][MAX_ROUTELEN];
 } PotentialResult;
 
-#define STRATS 3
+#define GRANUS 3
 
 void setup_search(void);
 void search(int start_isle, int final_isle /* -1 means any */,
-	    PotentialResult ****strat_base_io[STRATS]
-	        /* strat_base[strati][finalthing][midthing]-> */);
+	    PotentialResult ****buckets_base_io[GRANUS]
+	        /* bucket_base[granui][finalthing][midthing]-> */);
 
 extern double max_mass, max_volu, max_capi;
 extern double distance_loss_factor_per_league;
@@ -140,7 +140,7 @@ extern int narches;
 extern char **archnames;
 extern int *islandid2arch;
 
-extern int stratsz_fin[STRATS], stratsz_mid[STRATS];
+extern int granusz_fin[GRANUS], granusz_mid[GRANUS];
 
 
 extern FILE *output;
@@ -165,9 +165,9 @@ typedef struct {
   PotentialResult *pr;
 } HighScoreEntry;
 
-extern int minstrat;
-extern int nhighscores[STRATS][AP];
-extern HighScoreEntry *highscores[STRATS][AP];
+extern int mingranu;
+extern int nhighscores[GRANUS][AP];
+extern HighScoreEntry *highscores[GRANUS][AP];
 
 
 #define ONDEMAND(pointer_lvalue, calloc_size_count)			     \