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->rownum= lpx_add_rows(lp, 1);
lpx_set_row_bnds(lp, search->rownum, LPX_UP, 0, search->qty);
- if (DEBUGP(value)) {
- char *name= masprintf("%s_c%d_%d",srcdst,t->commodid,price);
+ if (DEBUGP(value) || DEBUGP(check)) {
+ char *name= masprintf("%s_i%d_c%d_%d_all",
+ srcdst, islandid, t->commodid, price);
lpx_set_row_name(lp,search->rownum,name);
+
+ if (DEBUGP(check)) {
+ int nrows= lpx_get_num_rows(lp);
+ assert(search->rownum == nrows);
+ int i;
+ for (i=1; i<nrows; i++)
+ assert(strcmp(name, lpx_get_row_name(lp,i)));
+ }
free(name);
}
search->generation= generation;
int row= leg+startrow;
lpx_set_row_bnds(lp, row, LPX_UP, 0, max_thing);
if (DEBUGP(value)) {
- char *name= masprintf("max_leg%d_%s",leg,wh);
+ char *name= masprintf("%s_%d",wh,leg);
lpx_set_row_name(lp,row,name);
free(name);
}
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;
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);
int col= lpx_add_cols(lp,ip->ntrades);
double loss_factor= delay_slot_loss_factor * ip->distance_loss_factor;
+ debugf(" SOME i%d#%d..i%d#%d dslf=%g dlf=%g lf=%g\n",
+ si,s, di,d,
+ delay_slot_loss_factor, ip->distance_loss_factor, loss_factor);
while (tradestodo-- >0) {
if (inblock >= TRADES_PER_BLOCK) {
}
Trade *t= &block->t[inblock++];
- debugf(" TRADE %d#%d..%d#%d %d %d-%d\n",
+ debugf(" TRADE i%d#%d..i%d#%d c%d %d-%d ",
si,s, di,d, t->commodid, t->src_price, t->dst_price);
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[si].src, t->src_price, "src", si, ss_ite_sell);
+ avail_c(t, &itradeends[di].dst, t->dst_price, "dst", di, ss_ite_buy);
int leg;
for (leg=s; leg<d; leg++) {
- add_leg_c(mass_constraints, leg, commodstable[t->commodid].mass);
- add_leg_c(volu_constraints, leg, commodstable[t->commodid].volu);
- add_leg_c(capi_constraints, leg, t->src_price);
+ add_leg_c(mass_constraints,leg, commodstable[t->commodid].mass*1e-3);
+ add_leg_c(volu_constraints,leg, commodstable[t->commodid].volu*1e-3);
+ add_leg_c(capi_constraints,leg, t->src_price);
}
- double unit_profit= (t->dst_price - t->src_price) * loss_factor;
+ double unit_profit= t->dst_price * loss_factor - t->src_price;
debugf(" unit profit %f\n", unit_profit);
lpx_set_col_bnds(lp, col, LPX_LO, 0, 0);
if (DEBUGP(lp))
lpx_write_cpxlp(lp, (char*)DEBUG_DEV);
- int ipr= lpx_interior(lp);
+ int ipr= lpx_simplex(lp);
assert(ipr==LPX_E_OK);
if (DEBUGP(lp))
- lpx_print_ips(lp, (char*)DEBUG_DEV);
+ lpx_print_sol(lp, (char*)DEBUG_DEV);
- assert(lpx_ipt_status(lp) == LPX_T_OPT);
- profit= lpx_ipt_obj_val(lp);
+ int lpst= lpx_get_status(lp);
+ assert(lpst == LPX_OPT);
+ profit= lpx_get_obj_val(lp);
}
lpx_delete_prob(lp);
for (i=0; i<commodstablesz; i++)
commodstable[i].mass= commodstable[i].volu= -1;
+ itradeends= mcalloc(sizeof(*itradeends) * islandtablesz);
+
SQL_PREPARE(sst,
"SELECT commodid,unitmass,unitvolume FROM commods");
while (SQL_STEP(sst)) {