X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=yarrg%2Frscommon.h;h=38dc6295e121548a478f3041fca0c56a2ede3168;hp=a9bca8c1fdadc87dfab844bcde2f28d9f4fe8350;hb=2abd3537;hpb=1170fca71dcf10ed2d046fc22f8f1a63ac2ce5cb diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h index a9bca8c..38dc629 100644 --- a/yarrg/rscommon.h +++ b/yarrg/rscommon.h @@ -8,31 +8,82 @@ DF(sql2) \ DF(value) \ DF(search) \ + DF(filter) \ DF(check) \ + DF(tableau) \ DF(lp) -#define debug stdout -#define DEBUG_DEV "/dev/stdout" +#define debug debug_file #include "common.h" +extern FILE *debug_file; +#define DEBUG_DEV "/dev/stdout" /* just for glpk */ + + +#define COUNTER_LIST \ + CTR(commodities_loaded) \ + CTR(trades_loaded) \ + CTR(islands_arbitrage) \ + CTR(ipairs_relevant) \ + CTR(quantities_loaded) \ + CTR(routes_considered) \ + CTR(routes_wrongfinalelim) \ + CTR(routes_quickelim) \ + CTR(routes_stratelim) \ + CTR(routes_valued) \ + CTR(routes_wrongfinal) \ + CTRA(newbests_strat,2) \ + CTR(subroute_tails_valued) \ + CTR(subroutes_valued) \ + CTR(subroutes_nonempty) +#define CTR(x) extern int ctr_##x; +#define CTRA(x,n) extern int ctr_##x[n]; + COUNTER_LIST +#undef CTR +#undef CTRA #define SQL_MUST( call ) ({ \ /* `call' is an expression returning result, using const char *sqe; \ * chk1 and chk2 are blocks using sqe and int sqr; */ \ const char *sql_must_call_string= #call; \ int sqr; \ - if (DEBUGP(sql2)) fprintf(stderr,"SQL %s", sql_must_call_string); \ + if (DEBUGP(sql2)) fprintf(debug,"SQL %s", sql_must_call_string); \ sqr= (call); \ - if (DEBUGP(sql2)) fprintf(stderr," = %d\n", sqr); \ + if (DEBUGP(sql2)) fprintf(debug," = %d\n", sqr); \ if (sqr) sql_fatal("(unknown)", sqr, sql_must_call_string); \ }) \ void sql_fatal(const char *stmt_what, int sqr, const char *act_what) NORET; -#define SQL_STEP(ssh) (sql_step_wrap((ssh), #ssh, __FILE__, __LINE__)) -int sql_step_wrap(sqlite3_stmt *ssh, const char *ssh_string, - const char *file, int line); +#define SQL_STEP(ssh) (sql_step((ssh), #ssh, __FILE__, __LINE__)) +int sql_step(sqlite3_stmt *ssh, const char *ssh_string, + const char *file, int line); + +#define SQL_DISTINCT_DECL(cols, nintcols) \ + int cols[nintcols]; \ + cols[0]= -1; +#define SQL_DISTINCT_STEP(ssh, cols, nkeycols) \ + (sql_step_distinct((ssh), #ssh, __FILE__, __LINE__, \ + (cols), sizeof((cols))/sizeof((cols)[0]), nkeycols)) +int sql_step_distinct(sqlite3_stmt *ssh, const char *ssh_string, + const char *file, int line, + int *cols, int ncols, int nkeycols); + /* These work if we're making a query whose columns consist of: + * - keys: integer column(s) on which the results are sorted by the query + * - consequences: zero or more integer cols strictly dependent on the keys + * - extra: zero or more further (possibly non-integer) columns + * + * Call SQL_DISTINCT_DECL, passing intcols = the total number of keys and + * consequences; it will declare int cols[intfields]; + * + * Then each SQL_DISTINCT_STEP is like SQL_STEP only you have to + * pass the number of key columns and it only returns rows with + * distinct keys. Rows with all-identical keys are asserted to + * have identical consequences. After each call to + * SQL_DISTINCT_STEP the keys and consequences will be stored in + * cols. + */ int sql_single_int(const char *stmt); @@ -47,11 +98,33 @@ void sql_bind(sqlite3_stmt *ss, int index, int value, extern sqlite3 *db; -void setup_sql(void); -double value_route(int nislands, const int *islands); +void setup_sql(const char *database); + + +typedef struct { + double distance_loss_factor; + struct TradesBlock *trades; + double route_tail_value; +} IslandPair; + +IslandPair *ipair_get_maybe(int si, int di); + +double value_route(int nislands, const int *islands, int exclude_arbitrage); void setup_value(void); + +#define AP 2 /* 0=absolute, 1=perleague */ +#define A 0 +#define P 1 + +typedef struct { + double value[AP]; + int ports[AP][MAX_ROUTELEN]; +} PotentialResult; + void setup_search(void); -void search(int start_isle); +void search(int start_isle, int final_isle /* -1 means any */, + PotentialResult ****strat_base_io + /* strat_base[finalarch][midarch]-> */); extern double max_mass, max_volu, max_capi; extern double distance_loss_factor_per_league; @@ -61,5 +134,57 @@ extern int max_dist; extern int islandtablesz; +extern int narches; +extern char **archnames; +extern int *islandid2arch; + + +extern FILE *output; + + +#define NEW(ptr) ((ptr)= mmalloc(sizeof(*ptr))) + +#define MCALLOC(array, count) ((array)= mcalloc(sizeof(*(array)) * (count))) + +#define MCALLOC_INITEACH(array, count, init_this) ({ \ + MCALLOC((array), (count)); \ + int initi; \ + typeof(&(array)[0]) this; \ + for (initi=0, this=(array); initi<(count); initi++, this++) { \ + init_this; \ + } \ + }) + + +typedef struct { + double value; + PotentialResult *pr; +} HighScoreEntry; + +extern int nhighscores[AP]; +extern HighScoreEntry *highscores[AP]; + + +#define ONDEMAND(pointer_lvalue, calloc_size_count) \ + ((pointer_lvalue) ? : \ + ((pointer_lvalue) = mcalloc(sizeof(*(pointer_lvalue)) * calloc_size_count))) + + +static inline int isle2arch(int isle) { + int arch= islandid2arch[isle]; + assert(arch>=0); + return arch; +} + +static inline int route2midarch(const int *ports, int nports) { + int archs[nports], last_arch=-1, narchs=0, i; + for (i=0; i