X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2Frscommon.h;h=f086e57d29c23ca45ea34e89fd00de1461e99552;hp=f02ffc0a4e6fc440592466d37f9405afd69ca133;hb=d14a97ff4e453ad1540a02b465bb7e398303edde;hpb=65f040fe1768142719f2ac268904ed0e1d8f1ec0 diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h index f02ffc0..f086e57 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]