routesearch: parse output in query_routesearch

[ypp-sc-tools.db-test.git] / yarrg / rscommon.h

diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index 9e1032a4053c7cade117cd0650f00855560ad597..84fad6fdb4e788d3cb2a3962734de063a71a4619 100644 (file)
--- 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)                          \
@@ -30,10 +32,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,GRANUS*2)               \
    CTR(subroute_tails_valued)                  \
    CTR(subroutes_valued)                       \
    CTR(subroutes_nonempty)
@@ -121,12 +123,10 @@ typedef struct {
   int ports[AP][MAX_ROUTELEN];
 } PotentialResult;
 
-#define STRATS 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 granus;
+extern int nhighscores[GRANUS][AP];
+extern HighScoreEntry *highscores[GRANUS][AP];
 
 
 #define ONDEMAND(pointer_lvalue, calloc_size_count)                         \