chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 38dc6295e121548a478f3041fca0c56a2ede3168..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 DEBUG_DEV "/dev/stdout" /* just for glpk */
+#define GRANUS 3
+
#define COUNTER_LIST \
CTR(commodities_loaded) \
CTR(trades_loaded) \
#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_considered) \
CTR(routes_wrongfinalelim) \
CTR(routes_quickelim) \
- CTR(routes_
stratelim)
\
+ CTR(routes_
bucketelim)
\
CTR(routes_valued) \
CTR(routes_wrongfinal) \
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)
CTR(subroute_tails_valued) \
CTR(subroutes_valued) \
CTR(subroutes_nonempty)
@@
-123,8
+125,8
@@
typedef struct {
void setup_search(void);
void search(int start_isle, int final_isle /* -1 means any */,
void setup_search(void);
void search(int start_isle, int final_isle /* -1 means any */,
- PotentialResult ****
strat_base_io
- /*
strat_base[finalarch][midarch
]-> */);
+ 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;
extern double max_mass, max_volu, max_capi;
extern double distance_loss_factor_per_league;
@@
-138,6
+140,8
@@
extern int narches;
extern char **archnames;
extern int *islandid2arch;
extern char **archnames;
extern int *islandid2arch;
+extern int granusz_fin[GRANUS], granusz_mid[GRANUS];
+
extern FILE *output;
extern FILE *output;
@@
-161,8
+165,9
@@
typedef struct {
PotentialResult *pr;
} HighScoreEntry;
PotentialResult *pr;
} HighScoreEntry;
-extern int nhighscores[AP];
-extern HighScoreEntry *highscores[AP];
+extern int granus;
+extern int nhighscores[GRANUS][AP];
+extern HighScoreEntry *highscores[GRANUS][AP];
#define ONDEMAND(pointer_lvalue, calloc_size_count) \
#define ONDEMAND(pointer_lvalue, calloc_size_count) \