X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Frsvalue.c;h=f046c99a896c56ee753a9430144ebd99b6fe7857;hb=0145dc7f4fcaf62090a77fb2d69d5d7807c8d48d;hp=9cc9ec757987ce9230380ab02381bed496a1d5f3;hpb=8aaade51e5904619daf638d496ce1162138d940f;p=ypp-sc-tools.db-test.git diff --git a/yarrg/rsvalue.c b/yarrg/rsvalue.c index 9cc9ec7..f046c99 100644 --- a/yarrg/rsvalue.c +++ b/yarrg/rsvalue.c @@ -1,6 +1,5 @@ /**/ -#include #include #include "rscommon.h" @@ -12,11 +11,12 @@ static int commodstablesz; static CommodInfo *commodstable; static sqlite3_stmt *ss_ipair_dist, *ss_ipair_trades; +static sqlite3_stmt *ss_ite_buy, *ss_ite_sell; #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 @@ -32,13 +32,14 @@ typedef struct { TradesBlock *trades; } IslandPair; -int nislands; IslandPair ***ipairs; /* ipairs[sislandid][dislandid] */ typedef struct IslandTradeEnd { struct IslandTradeEnd *next; int commodid, price; - int qty, rownum; + int qty; + unsigned long generation; + int rownum; } IslandTradeEnd, *IslandDirnTradeEnds; typedef struct { @@ -46,8 +47,8 @@ typedef struct { IslandDirnTradeEnds collect, deliver; } IslandTradeEnds; -static struct obstack ites_obstack; static LPX *lp; +static unsigned long generation; static int nconstraint_rows; static int constraint_rows[1+2+3*MAX_LEGS]; @@ -60,41 +61,53 @@ static void add_constraint(int row, double coefficient) { constraint_coeffs[nconstraint_rows]= coefficient; } -static void avail_constraint(const Trade *t, IslandDirnTradeEnds *trades, - int price, int qty, const char *srcdst) { +static void avail_c(const Trade *t, IslandDirnTradeEnds *trades, + int price, const char *srcdst, + int islandid, sqlite3_stmt *ss_ite) { /* find row number of trade availability constraint */ IslandTradeEnd *search; for (search= *trades; search; search=search->next) - if (search->commodid==t->commodid && search->price==price) { - assert(search->qty == qty); + if (search->commodid==t->commodid && search->price==price) goto found; - } /* not found, add new row */ - search= obstack_alloc(&ites_obstack, sizeof(*search)); + + search= mmalloc(sizeof(*search)); search->commodid= t->commodid; search->price= price; - search->qty= qty; - search->rownum= lpx_add_rows(lp, 1); search->next= *trades; - if (DEBUGP(value)) { - char *name= masprintf("%s_commod%d_price%d",srcdst,t->commodid,price); - lpx_set_row_name(lp,search->rownum,name); - free(name); - } + search->generation= 0; + + 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) ); + *trades= search; + found:; - int rownum= search->rownum; + if (search->generation != generation) { + search->rownum= lpx_add_rows(lp, 1); + lpx_set_row_bnds(lp, search->rownum, LPX_UP, 0, search->qty); - lpx_set_row_bnds(lp, rownum, LPX_UP, 0, qty); - add_constraint(rownum, 1.0); + if (DEBUGP(value)) { + char *name= masprintf("%s_c%d_%d",srcdst,t->commodid,price); + lpx_set_row_name(lp,search->rownum,name); + free(name); + } + search->generation= generation; + } + + add_constraint(search->rownum, 1.0); } static int setup_leg_constraints(double max_thing, int legs, const char *wh) { int leg, startrow; if (max_thing < 0 || !legs) return -1; startrow= lpx_add_rows(lp, legs); - for (leg=0; leg 0); add_constraint(startrow+leg, 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; @@ -148,7 +162,7 @@ static IslandPair *ipair_get(int si, int di) { 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++; @@ -161,7 +175,7 @@ static IslandPair *ipair_get(int si, int di) { 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 @@ -195,8 +209,7 @@ void value_route(int nislands, const int *islands) { */ assert(nislands >= 1); - - char *free_to_reset_obstack= obstack_alloc(&ites_obstack, 1); + assert(++generation); int nites=0; IslandTradeEnds ites[nislands], *iteps[nislands]; @@ -220,6 +233,8 @@ void value_route(int nislands, const int *islands) { 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"); @@ -243,6 +258,7 @@ void value_route(int nislands, const int *islands) { if (islands[already_d] == di) /* visited this island already since we left s, uninteresting */ goto next_d; + if (d>s && di==si) /* route has returned to si, no need to think more about s */ goto next_s; @@ -252,6 +268,9 @@ void value_route(int nislands, const int *islands) { IslandPair *ip= ipair_get(islands[s], islands[d]); TradesBlock *block= ip->trades; int tradestodo= ip->ntrades; + if (!tradestodo) + goto next_d; + int inblock= 0; int col= lpx_add_cols(lp,ip->ntrades); @@ -269,8 +288,8 @@ void value_route(int nislands, const int *islands) { nconstraint_rows=0; - avail_constraint(t, &iteps[s]->collect, t->src_price,t->src_qty,"src"); - avail_constraint(t, &iteps[d]->deliver, t->dst_price,t->dst_qty,"dst"); + 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); int leg; for (leg=s; legsrc_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 -----*/ @@ -299,30 +323,39 @@ void value_route(int nislands, const int *islands) { 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; - obstack_free(&ites_obstack, free_to_reset_obstack); + return profit; } void setup_value(void) { sqlite3_stmt *sst; int i; -#define obstack_chunk_alloc mmalloc -#define obstack_chunk_free free - obstack_init(&ites_obstack); - - 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=0 && id sell.price\n" - " WHERE sell.islandid=?\n" - " AND buy.islandid=?\n" - " GROUP BY sell.commodid, sell.price, buy.price", - -1, &ss_ipair_trades, 0) ); - - SQL_MUST( sqlite3_prepare(db, - " SELECT dist from dists where aiid=? and biid=?", - -1, &ss_ipair_dist, 0) ); - - ipairs= mcalloc(sizeof(*ipairs) * nislands); + 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) * islandtablesz); }