static sqlite3_stmt *ss_ipair_dist;
static sqlite3_stmt *ss_ite_buy, *ss_ite_sell;
+
#define MAX_LEGS (MAX_ROUTELEN-1)
typedef struct {
add_constraint(startrow+leg, value);
}
-IslandPair *ipair_get(int si, int di) {
+IslandPair *ipair_get_maybe(int si, int di) {
+ IslandPair **ipa;
+
+ assert(si < islandtablesz);
+ assert(di < islandtablesz);
+
+ if (!(ipa= ipairs[si])) return 0;
+ return ipa[di];
+}
+
+static IslandPair *ipair_get_create(int si, int di) {
IslandPair *ip, **ipa;
assert(si < islandtablesz);
assert(di < islandtablesz);
if (!(ipa= ipairs[si])) {
- ipa= ipairs[si]= mcalloc(sizeof(*ipa) * islandtablesz);
+ ipairs[si]= MCALLOC(ipa, islandtablesz);
}
if ((ip= ipa[di]))
return ip;
- ipa[di]= ip= mmalloc(sizeof(*ip));
+ ipa[di]= NEW(ip);
ip->trades= 0;
ip->route_tail_value= -1;
+ if (si==di) ctr_islands_arbitrage++;
+ else ctr_ipairs_relevant++;
+
debugf("VALUE ipair_get(i%d,i%d) running...\n", si,di);
SQL_MUST( sqlite3_bind_int(ss_ipair_dist, 1, si) );
SQL_MUST( sqlite3_bind_int(ss_ipair_dist, 2, di) );
double value_route(int nislands, const int *islands, int exclude_arbitrage) {
int s,d;
+ ctr_subroutes_valued++;
+
/* We need to construct the LP problem. GLPK talks
* about rows and columns, which are numbered from 1.
*
lp= lpx_create_prob();
lpx_set_obj_dir(lp, LPX_MAX);
lpx_set_int_parm(lp, LPX_K_MSGLEV, DEBUGP(lp) ? 3 : 1);
+ lpx_set_int_parm(lp, LPX_K_PRESOL, 1);
if (DEBUGP(value)) {
lpx_set_prob_name(lp,(char*)"value_route");
/*----- actually add these trades to the LP problem -----*/
- IslandPair *ip= ipair_get(islands[s], islands[d]);
+ IslandPair *ip= ipair_get_maybe(islands[s], islands[d]);
- if (!ip->trades)
+ if (!ip || !ip->trades)
goto next_d;
double loss_factor= delay_slot_loss_factor * ip->distance_loss_factor;
double profit= 0;
if (lpx_get_num_cols(lp)) {
+ ctr_subroutes_nonempty++;
+
if (DEBUGP(lp))
lpx_write_cpxlp(lp, (char*)DEBUG_DEV);
SQL_DISTINCT_DECL(cols,5);
while (SQL_DISTINCT_STEP(ss_trades,cols,5)) {
- IslandPair *ip= ipair_get(cols[1], cols[3]);
+ ctr_trades_loaded++;
+ IslandPair *ip= ipair_get_create(cols[1], cols[3]);
TradesBlock *block= ip->trades;
if (!block || ip->trades->ntrades >= TRADES_PER_BLOCK) {
- block= mmalloc(sizeof(*block));
+ NEW(block);
block->next= ip->trades;
ip->trades= block;
block->ntrades= 0;
SQL_DISTINCT_DECL(cols,5);
while (SQL_DISTINCT_STEP(ss,cols,3)) {
+ ctr_quantities_loaded++;
IslandTradeEnd *search;
int commodid= cols[0];
goto found;
/* not found, add new end */
- search= mmalloc(sizeof(*search));
+ NEW(search);
search->commodid= commodid;
search->price= price;
search->next= *trades;
void setup_value(void) {
sqlite3_stmt *sst;
- int i;
commodstabsz= sql_single_int("SELECT max(commodid) FROM commods") + 1;
- commodstab= mmalloc(sizeof(*commodstab)*commodstabsz);
- for (i=0; i<commodstabsz; i++)
- commodstab[i].mass= commodstab[i].volu= -1;
+ MCALLOC_INITEACH(commodstab, commodstabsz,
+ this->mass= this->volu= -1
+ );
SQL_PREPARE(sst,
"SELECT commodid,unitmass,unitvolume FROM commods");
while (SQL_STEP(sst)) {
+ ctr_commodities_loaded++;
int id= sqlite3_column_int(sst,0);
assert(id>=0 && id<commodstabsz);
commodstab[id].mass= sqlite3_column_int(sst,1);
}
sqlite3_finalize(sst);
- ipairs= mcalloc(sizeof(*ipairs) * islandtablesz);
- itradeends= mcalloc(sizeof(*itradeends) * islandtablesz);
+ MCALLOC(ipairs, islandtablesz);
+ MCALLOC(itradeends, islandtablesz);
SQL_PREPARE(ss_ipair_dist,
" SELECT dist FROM dists\n"