chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WIP routesearch; stratify results by significant bits of route
[ypp-sc-tools.main.git]
/
yarrg
/
rscommon.h
diff --git
a/yarrg/rscommon.h
b/yarrg/rscommon.h
index 7c70ca4d800a647dbc2d322f8e9fdb59cc305480..873ff30810f708bf7282ebcdcc0f21c828dcb3b1 100644
(file)
--- a/
yarrg/rscommon.h
+++ b/
yarrg/rscommon.h
@@
-8,6
+8,7
@@
DF(sql2) \
DF(value) \
DF(search) \
DF(sql2) \
DF(value) \
DF(search) \
+ DF(filter) \
DF(check) \
DF(lp)
DF(check) \
DF(lp)
@@
-100,8
+101,14
@@
IslandPair *ipair_get_maybe(int si, int di);
double value_route(int nislands, const int *islands, int exclude_arbitrage);
void setup_value(void);
double value_route(int nislands, const int *islands, int exclude_arbitrage);
void setup_value(void);
+typedef struct {
+ double absolute, perleague;
+ int absolute_ports[MAX_ROUTELEN], perleague_ports[MAX_ROUTELEN];
+} PotentialResult;
+
void setup_search(void);
void setup_search(void);
-void search(int start_isle);
+void search(int start_isle, PotentialResult ****strat_base_io
+ /* strat_base[finalisle][midisle]-> */);
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;
@@
-112,4
+119,9
@@
extern int max_dist;
extern int islandtablesz;
extern int islandtablesz;
+#define ONDEMAND(pointer_lvalue, calloc_size_count) \
+ ((pointer_lvalue) ? : \
+ ((pointer_lvalue) = mcalloc(sizeof(*(pointer_lvalue)) * calloc_size_count)))
+
+
#endif /*RSCOMMON_H*/
#endif /*RSCOMMON_H*/