chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
routesearch: rework some things, bugfixes
[ypp-sc-tools.db-live.git]
/
yarrg
/
rscommon.h
diff --git
a/yarrg/rscommon.h
b/yarrg/rscommon.h
index f02ffc0a4e6fc440592466d37f9405afd69ca133..66e36d905e7b8431acba4bce9b3f50075dd17bcb 100644
(file)
--- a/
yarrg/rscommon.h
+++ b/
yarrg/rscommon.h
@@
-7,6
+7,7
@@
DF(sql) \
DF(sql2) \
DF(value) \
DF(sql) \
DF(sql2) \
DF(value) \
+ DF(value2) \
DF(search) \
DF(filter) \
DF(check) \
DF(search) \
DF(filter) \
DF(check) \
@@
-21,6
+22,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) \
@@
-33,7
+36,7
@@
extern FILE *debug_file;
CTR(routes_bucketelim) \
CTR(routes_valued) \
CTR(routes_wrongfinal) \
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)
CTR(subroute_tails_valued) \
CTR(subroutes_valued) \
CTR(subroutes_nonempty)
@@
-118,14
+121,16
@@
void setup_value(void);
typedef struct {
double value[AP];
typedef struct {
double value[AP];
- int ports[
AP][
MAX_ROUTELEN];
-} PotentialResult;
+ int ports[MAX_ROUTELEN];
+}
One
PotentialResult;
-#define GRANUS 3
+typedef struct {
+ OnePotentialResult prs[AP];
+} Bucket;
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 */,
-
PotentialResul
t ****buckets_base_io[GRANUS]
+
Bucke
t ****buckets_base_io[GRANUS]
/* bucket_base[granui][finalthing][midthing]-> */);
extern double max_mass, max_volu, max_capi;
/* bucket_base[granui][finalthing][midthing]-> */);
extern double max_mass, max_volu, max_capi;
@@
-162,10
+167,10
@@
extern FILE *output;
typedef struct {
double value;
typedef struct {
double value;
-
PotentialResult *pr
;
+
Bucket *bucket
;
} HighScoreEntry;
} HighScoreEntry;
-extern int
mingranu
;
+extern int
granus
;
extern int nhighscores[GRANUS][AP];
extern HighScoreEntry *highscores[GRANUS][AP];
extern int nhighscores[GRANUS][AP];
extern HighScoreEntry *highscores[GRANUS][AP];