#define MAX_LEGS (MAX_ROUTELEN-1)
typedef struct {
- int commodid, src_price, src_qty, dst_price, dst_qty;
+ int commodid, src_price, dst_price;
} Trade;
#define TRADES_PER_BLOCK 10
TradesBlock *trades;
} IslandPair;
-int nislands;
IslandPair ***ipairs; /* ipairs[sislandid][dislandid] */
typedef struct IslandTradeEnd {
int qty;
unsigned long generation;
int rownum;
-} IslandTradeEnd, *IslandDirnTradeEnds;
+} IslandTradeEnd;
typedef struct {
- int islandid;
- IslandDirnTradeEnds collect, deliver;
-} IslandTradeEnds;
+ IslandTradeEnd *src, *dst;
+} IslandTradeEndHeads;
+
+IslandTradeEndHeads *itradeends;
+ /* itradeends[islandid].{src,dst}->commodid etc. */
static LPX *lp;
static unsigned long generation;
constraint_coeffs[nconstraint_rows]= coefficient;
}
-static void avail_c(const Trade *t, IslandDirnTradeEnds *trades,
+static void avail_c(const Trade *t, IslandTradeEnd **trades,
int price, const char *srcdst,
int islandid, sqlite3_stmt *ss_ite) {
/* find row number of trade availability constraint */
search->next= *trades;
search->generation= 0;
- SQL_MUST( sqlite3_bind_int(ss_ite, 1, islandid) );
- SQL_MUST( sqlite3_bind_int(ss_ite, 2, t->commodid) );
- SQL_MUST( sqlite3_bind_int(ss_ite, 3, price) );
+ SQL_BIND(ss_ite, 1, islandid);
+ SQL_BIND(ss_ite, 2, t->commodid);
+ SQL_BIND(ss_ite, 3, price);
assert(SQL_STEP(ss_ite));
search->qty= sqlite3_column_int(ss_ite, 0);
SQL_MUST( sqlite3_reset(ss_ite) );
lpx_set_row_bnds(lp, search->rownum, LPX_UP, 0, search->qty);
if (DEBUGP(value)) {
- char *name= masprintf("%s_commod%d_price%d",srcdst,t->commodid,price);
+ char *name= masprintf("%s_c%d_%d",srcdst,t->commodid,price);
lpx_set_row_name(lp,search->rownum,name);
free(name);
}
int leg, startrow;
if (max_thing < 0 || !legs) return -1;
startrow= lpx_add_rows(lp, legs);
- for (leg=0; leg<nislands-1; leg++) {
+ for (leg=0; leg<legs; leg++) {
int row= leg+startrow;
lpx_set_row_bnds(lp, row, LPX_UP, 0, max_thing);
if (DEBUGP(value)) {
static IslandPair *ipair_get(int si, int di) {
IslandPair *ip, **ipa;
- assert(si < nislands);
- assert(di < nislands);
+ assert(si < islandtablesz);
+ assert(di < islandtablesz);
if (!(ipa= ipairs[si])) {
- ipa= ipairs[si]= mcalloc(sizeof(*ipa) * nislands);
+ ipa= ipairs[si]= mcalloc(sizeof(*ipa) * islandtablesz);
}
if ((ip= ipa[di]))
return ip;
ip->ntrades= 0;
ip->trades= 0;
int inblock= TRADES_PER_BLOCK;
- TradesBlock *block= 0;
+ TradesBlock *block=0, **tail=&ip->trades;
debugf("VALUE ipair_get(%d,%d) running...\n", si,di);
SQL_MUST( sqlite3_bind_int(ss_ipair_dist, 1, si) );
while (SQL_STEP(ss_ipair_trades)) {
if (inblock == TRADES_PER_BLOCK) {
block= mmalloc(sizeof(*block));
- block->next= ip->trades;
- ip->trades= block;
+ block->next= 0;
+ *tail= block;
+ tail= &block->next;
inblock= 0;
}
int *irp, i;
- for (i=0, irp=&block->t[inblock].commodid; i<5; i++, irp++)
+ for (i=0, irp=&block->t[inblock].commodid; i<3; i++, irp++)
*irp= sqlite3_column_int(ss_ipair_trades, i);
ip->ntrades++;
inblock++;
return ip;
}
-void value_route(int nislands, const int *islands) {
+double value_route(int nislands, const int *islands) {
int s,d;
/* We need to construct the LP problem. GLPK talks
assert(nislands >= 1);
assert(++generation);
- int nites=0;
- IslandTradeEnds ites[nislands], *iteps[nislands];
-
- for (s=0; s<nislands; s++) {
- IslandTradeEnds *ite;
- int si= islands[s];
- int i;
- for (i=0, ite=ites; i<nites; i++, ite++)
- if (ite->islandid==si)
- goto found;
- /* not found, add new */
- assert(ite == &ites[nites]);
- ite->islandid= si;
- ite->collect= ite->deliver= 0;
- nites++;
- found:
- iteps[s]= ite;
- }
-
assert(!lp);
lp= lpx_create_prob();
lpx_set_obj_dir(lp, LPX_MAX);
+ lpx_set_int_parm(lp, LPX_K_MSGLEV, DEBUGP(lp) ? 3 : 1);
+
if (DEBUGP(value)) {
lpx_set_prob_name(lp,(char*)"value_route");
lpx_set_obj_name(lp,(char*)"profit");
nconstraint_rows=0;
- avail_c(t, &iteps[s]->collect, t->src_price,"src", si, ss_ite_sell);
- avail_c(t, &iteps[d]->deliver, t->dst_price,"dst", di, ss_ite_buy);
+ avail_c(t, &itradeends[s].src, t->src_price, "src", si, ss_ite_sell);
+ avail_c(t, &itradeends[d].dst, t->dst_price, "dst", di, ss_ite_buy);
int leg;
for (leg=s; leg<d; leg++) {
add_leg_c(capi_constraints, leg, t->src_price);
}
+ double unit_profit= (t->dst_price - t->src_price) * loss_factor;
+ debugf(" unit profit %f\n", unit_profit);
+
lpx_set_col_bnds(lp, col, LPX_LO, 0, 0);
- lpx_set_obj_coef(lp, col,
- (t->dst_price - t->src_price) * loss_factor);
+ lpx_set_obj_coef(lp, col, unit_profit);
lpx_set_mat_col(lp, col, nconstraint_rows,
constraint_rows, constraint_coeffs);
+
if (DEBUGP(value)) {
- char *name= masprintf("trade_commod%d_port%d_at%d_port%d_at%d",
+ char *name= masprintf("c%d_p%d_%d_p%d_%d",
t->commodid, s, t->src_price, d, t->dst_price);
lpx_set_col_name(lp, col, name);
free(name);
}
+
+ col++;
} /* while (tradestodo-- >0) */
/*----- that's done adding these trades to the LP problem -----*/
next_s:;
} /* for (s) */
+ double profit= 0;
+
+ if (lpx_get_num_cols(lp)) {
+ if (DEBUGP(lp))
+ lpx_write_cpxlp(lp, (char*)DEBUG_DEV);
+
+ int ipr= lpx_interior(lp);
+ assert(ipr==LPX_E_OK);
+
+ if (DEBUGP(lp))
+ lpx_print_ips(lp, (char*)DEBUG_DEV);
+
+ assert(lpx_ipt_status(lp) == LPX_T_OPT);
+ profit= lpx_ipt_obj_val(lp);
+ }
+
lpx_delete_prob(lp);
lp= 0;
+
+ return profit;
}
void setup_value(void) {
sqlite3_stmt *sst;
int i;
- nislands= sql_single_int("SELECT max(islandid) FROM islands") + 1;
- debugf("VALUE nislands=%d\n",nislands);
-
commodstablesz= sql_single_int("SELECT max(commodid) FROM commods") + 1;
commodstable= mmalloc(sizeof(*commodstable)*commodstablesz);
for (i=0; i<commodstablesz; i++)
commodstable[i].mass= commodstable[i].volu= -1;
- SQL_MUST( sqlite3_prepare(db,
- "SELECT commodid,unitmass,unitvolume FROM commods", -1,&sst,0) );
+ itradeends= mcalloc(sizeof(*itradeends) * islandtablesz);
+
+ SQL_PREPARE(sst,
+ "SELECT commodid,unitmass,unitvolume FROM commods");
while (SQL_STEP(sst)) {
int id= sqlite3_column_int(sst,0);
assert(id>=0 && id<commodstablesz);
}
sqlite3_finalize(sst);
- SQL_MUST( sqlite3_prepare(db,
- " SELECT dist from dists where aiid=? and biid=?",
- -1, &ss_ipair_dist, 0) );
-
- SQL_MUST( sqlite3_prepare(db,
- "SELECT DISTINCT\n"
- " sell.commodid commodid,\n"
- " sell.price src_price,\n"
- " buy.price dst_price\n"
- " FROM sell JOIN buy\n"
- " ON sell.commodid = buy.commodid\n"
- " AND buy.price > sell.price\n"
- " WHERE sell.islandid=?\n"
- " AND buy.islandid=?",
- -1, &ss_ipair_trades, 0) );
-
-#define BS(bs) \
- SQL_MUST( sqlite3_prepare(db, \
- "SELECT\n" \
- " sum(qty)\n" \
- " FROM " #bs "\n" \
- " WHERE islandid=?\n" \
- " AND commodid=?\n" \
- " AND price=?", \
- -1, &ss_ite_##bs, 0) );
+ SQL_PREPARE(ss_ipair_dist,
+ " SELECT dist FROM dists\n"
+ " WHERE aiid=? and biid=?");
+
+ SQL_PREPARE(ss_ipair_trades,
+ "SELECT DISTINCT\n"
+ " sell.commodid commodid,\n"
+ " sell.price src_price,\n"
+ " buy.price dst_price\n"
+ " FROM sell JOIN buy\n"
+ " ON sell.commodid = buy.commodid\n"
+ " AND buy.price > sell.price\n"
+ " WHERE sell.islandid=?\n"
+ " AND buy.islandid=?");
+
+#define BS(bs) \
+ SQL_PREPARE(ss_ite_##bs, \
+ "SELECT\n" \
+ " sum(qty)\n" \
+ " FROM " #bs "\n" \
+ " WHERE islandid=?\n" \
+ " AND commodid=?\n" \
+ " AND price=?");
BS(buy)
BS(sell)
#undef BS
- ipairs= mcalloc(sizeof(*ipairs) * nislands);
+ ipairs= mcalloc(sizeof(*ipairs) * islandtablesz);
}
~yarrgweb / ypp-sc-tools.db-test.git / blobdiff