X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Frsvalue.c;h=a1cdf0f9549c79ebb206d90ffcab7d871fe05b72;hb=a040d95f6eaf2e43a35e13f50660d9605c638a37;hp=c2cab435f07e09f2ef17934d2b8ba2964e4d0cca;hpb=abb07750a9897277e9a78e60ceec5ed163593719;p=ypp-sc-tools.db-live.git

diff --git a/yarrg/rsvalue.c b/yarrg/rsvalue.c
index c2cab43..a1cdf0f 100644
--- a/yarrg/rsvalue.c
+++ b/yarrg/rsvalue.c
@@ -1,9 +1,20 @@
 /**/
 
+#include <glpk.h>
+
 #include "rscommon.h"
 
 DEBUG_DEFINE_DEBUGF(value);
 
+typedef struct { int mass, volu; } CommodInfo;
+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;
 } Trade;
@@ -16,6 +27,7 @@ typedef struct TradesBlock{
 } TradesBlock;
 
 typedef struct {
+  double distance_loss_factor;
   int ntrades;
   TradesBlock *trades;
 } IslandPair;
@@ -23,6 +35,97 @@ typedef struct {
 int nislands;
 IslandPair ***ipairs; /* ipairs[sislandid][dislandid] */
 
+typedef struct IslandTradeEnd {
+  struct IslandTradeEnd *next;
+  int commodid, price;
+  int qty;
+  unsigned long generation;
+  int rownum;
+} IslandTradeEnd, *IslandDirnTradeEnds;
+
+typedef struct {
+  int islandid;
+  IslandDirnTradeEnds collect, deliver;
+} IslandTradeEnds;
+
+static LPX *lp;
+static unsigned long generation;
+
+static int nconstraint_rows;
+static int constraint_rows[1+2+3*MAX_LEGS];
+static double constraint_coeffs[1+2+3*MAX_LEGS];
+      /* dummy0, src, dst, for_each_leg( [mass], [volume], [capital] ) */
+
+static void add_constraint(int row, double coefficient) {
+  nconstraint_rows++; /* glpk indices start from 1 !!! */
+  constraint_rows  [nconstraint_rows]= row;
+  constraint_coeffs[nconstraint_rows]= coefficient;
+}
+
+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)
+      goto found;
+  /* not found, add new row */
+
+  search= mmalloc(sizeof(*search));
+  search->commodid= t->commodid;
+  search->price= price;
+  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) );
+  assert(SQL_STEP(ss_ite));
+  search->qty= sqlite3_column_int(ss_ite, 0);
+  SQL_MUST( sqlite3_reset(ss_ite) );
+  
+  *trades= search;
+  
+ found:;
+  if (search->generation != generation) {
+    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_commod%d_price%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<nislands-1; leg++) {
+    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);
+      lpx_set_row_name(lp,row,name);
+      free(name);
+    }
+  }
+  return startrow;
+}
+
+static void add_leg_c(int startrow, int leg, double value) {
+  if (startrow<=0) return;
+  assert(value > 0);
+  add_constraint(startrow+leg, value);
+}
+
 static IslandPair *ipair_get(int si, int di) {
   IslandPair *ip, **ipa;
 
@@ -34,7 +137,7 @@ static IslandPair *ipair_get(int si, int di) {
   }
   if ((ip= ipa[di]))
     return ip;
-  
+
   ipa[di]= ip= mmalloc(sizeof(*ip));
   ip->ntrades= 0;
   ip->trades= 0;
@@ -42,10 +145,17 @@ static IslandPair *ipair_get(int si, int di) {
   TradesBlock *block= 0;
 
   debugf("VALUE ipair_get(%d,%d) running...\n", si,di);
-  SQL_MUST( sqlite3_bind_int(ss_ipair, 1, si) );
-  SQL_MUST( sqlite3_bind_int(ss_ipair, 2, di) );
+  SQL_MUST( sqlite3_bind_int(ss_ipair_dist, 1, si) );
+  SQL_MUST( sqlite3_bind_int(ss_ipair_dist, 2, di) );
+  assert(SQL_STEP(ss_ipair_dist));
+  int dist= sqlite3_column_int(ss_ipair_dist, 0);
+  ip->distance_loss_factor= pow(distance_loss_factor_per_league, dist);
+  sqlite3_reset(ss_ipair_dist);
+
+  SQL_MUST( sqlite3_bind_int(ss_ipair_trades, 1, si) );
+  SQL_MUST( sqlite3_bind_int(ss_ipair_trades, 2, di) );
 
-  while (SQL_STEP(ss_ipair)) {
+  while (SQL_STEP(ss_ipair_trades)) {
     if (inblock == TRADES_PER_BLOCK) {
       block= mmalloc(sizeof(*block));
       block->next= ip->trades;
@@ -54,14 +164,14 @@ static IslandPair *ipair_get(int si, int di) {
     }
     int *irp, i;
     for (i=0, irp=&block->t[inblock].commodid; i<5; i++, irp++)
-      *irp= sqlite3_column_int(ss_ipair, i);
+      *irp= sqlite3_column_int(ss_ipair_trades, i);
     ip->ntrades++;
     inblock++;
   }
   if (inblock < TRADES_PER_BLOCK)
     block->t[inblock].commodid= -1;
 
-  sqlite3_reset(ss_ipair);
+  sqlite3_reset(ss_ipair_trades);
   
   return ip;
 }
@@ -74,11 +184,11 @@ void value_route(int nislands, const int *islands) {
    *
    * Each column is a `structural variable' ie one of the entries in
    * the objective function.  In our case the set of structural
-   * variable is, for each visit, the set of Trades which collect at
-   * that island.  (We use `visit' to mean `specific visit to an
+   * variable is, for each port, the set of Trades which collect at
+   * that island.  (We use `port' to mean `specific visit to an
    * island' so if an island appears more than once so do its trades.)
    * We don't need to worry about crossing with all the possible
-   * delivery locations as we always deliver on the first visit.
+   * delivery locations as we always deliver on the first port.
    * We will call such a structural variable a Flow, for brevity.
    *
    * We iterate over the possible Flows adding them as columns as we
@@ -99,24 +209,73 @@ void value_route(int nislands, const int *islands) {
    * a data structure for later reuse.
    */
 
+  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);
+  if (DEBUGP(value)) {
+    lpx_set_prob_name(lp,(char*)"value_route");
+    lpx_set_obj_name(lp,(char*)"profit");
+  }
+
+  int legs= nislands-1;
+  int mass_constraints= setup_leg_constraints(max_mass, legs, "mass");
+  int volu_constraints= setup_leg_constraints(max_volu, legs, "volu");
+  int capi_constraints= setup_leg_constraints(max_capi, legs, "capi");
+
+  double delay_slot_loss_factor= 1.0;
+  for (s=0;
+       s<nislands;
+       s++, delay_slot_loss_factor *= LOSS_FACTOR_PER_DELAY_SLOT) {
+    int si= islands[s];
+    
     for (d=s; d<nislands; d++) {
       int di= islands[d];
       int already_d;
       for (already_d=s+1; already_d<d; already_d++)
 	if (islands[already_d] == di)
-	  /* visited this island already since we left s */
+	  /* visited this island already since we left s, uninteresting */
 	  goto next_d;
+
       if (d>s && di==si)
-	/* route has returned to s, no need to think more about this */
-	goto next_d;
+	/* route has returned to si, no need to think more about s */
+	goto next_s;
+
+      /*----- actually add these trades to the LP problem -----*/
       
       IslandPair *ip= ipair_get(islands[s], islands[d]);
       TradesBlock *block= ip->trades;
-      int ntrades= ip->ntrades;
+      int tradestodo= ip->ntrades;
+      if (!tradestodo)
+	goto next_d;
+
       int inblock= 0;
-      while (ntrades-- >0) {
+      int col= lpx_add_cols(lp,ip->ntrades);
+
+      double loss_factor= delay_slot_loss_factor * ip->distance_loss_factor;
+
+      while (tradestodo-- >0) {
 	if (inblock >= TRADES_PER_BLOCK) {
 	  block= block->next;
 	  inblock= 0;
@@ -125,38 +284,93 @@ void value_route(int nislands, const int *islands) {
 
 	debugf("  TRADE %d#%d..%d#%d %d %d-%d\n",
 	       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);
+
+	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);
+	}
+
+	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_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",
+				t->commodid, s, t->src_price, d, t->dst_price);
+	  lpx_set_col_name(lp, col, name);
+	  free(name);
+	}
+      } /* while (tradestodo-- >0) */
+      
+      /*----- that's done adding these trades to the LP problem -----*/
+      
     next_d:;
-  }
+    } /* for (d) */
+  next_s:;
+  } /* for (s) */
+
+  lpx_delete_prob(lp);
+  lp= 0;
 }
 
 void setup_value(void) {
   sqlite3_stmt *sst;
+  int i;
 
-  SQL_MUST( sqlite3_prepare(db, "SELECT max(islandid) FROM islands",
-			    -1,&sst,0) );
-  assert( SQL_STEP(sst) );
-  nislands= sqlite3_column_int(sst,0);
-  nislands++;
-  sqlite3_finalize(sst);
+  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) );
+  while (SQL_STEP(sst)) {
+    int id= sqlite3_column_int(sst,0);
+    assert(id>=0 && id<commodstablesz);
+    commodstable[id].mass= sqlite3_column_int(sst,1);
+    commodstable[id].volu= sqlite3_column_int(sst,2);
+  }
+  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\n"
+     "SELECT DISTINCT\n"
      " sell.commodid		commodid,\n"
      " sell.price		src_price,\n"
-     " sum(sell.qty)		src_qty,\n"
-     " buy.price		dst_price,\n"
-     " sum(buy.qty) 		dst_qty\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=?\n"
-     " GROUP BY sell.commodid, sell.price, buy.price",
-			    -1, &ss_ipair, 0) );
+     "   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) );
+  BS(buy)
+  BS(sell)
+#undef BS
 
   ipairs= mcalloc(sizeof(*ipairs) * nislands);
 }