X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Frsvalue.c;h=d3ffeeb1f8c651c280d9599f499f632ae4862dad;hp=4914ce724c38652e147c2a54191a0ae334c3563e;hb=3dbb2f33eae3a509123ffc99e48e35f858a8292a;hpb=d0f65e91f071ebb0fbc6791ee168e2be5ba8e5ae

diff --git a/yarrg/rsvalue.c b/yarrg/rsvalue.c
index 4914ce7..d3ffeeb 100644
--- a/yarrg/rsvalue.c
+++ b/yarrg/rsvalue.c
@@ -5,6 +5,7 @@
 #include "rscommon.h"
 
 DEBUG_DEFINE_DEBUGF(value);
+DEBUG_DEFINE_SOME_DEBUGF(value2,debug2f);
 
 typedef struct { int mass, volu; } CommodInfo;
 static int commodstabsz;
@@ -61,18 +62,22 @@ static void add_constraint(int row, double coefficient) {
   constraint_coeffs[nconstraint_rows]= coefficient;
 }
 
-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 */
+static IslandTradeEnd *get_ite(const Trade *t, IslandTradeEnd **trades,
+			       int price) {
   IslandTradeEnd *search;
-
+  
   for (search= *trades; search; search=search->next)
     if (search->commodid==t->commodid && search->price==price)
-      goto found;
+      return search;
   abort();
-  
- found:;
+}
+
+static void avail_c(const Trade *t, IslandTradeEnd *ite,
+		    int price, const char *srcdst,
+		    int islandid, sqlite3_stmt *ss_ite) {
+  /* find row number of trade availability constraint */
+  IslandTradeEnd *search= ite;
+
   if (search->generation != generation) {
     search->rownum= lpx_add_rows(lp, 1);
     lpx_set_row_bnds(lp, search->rownum, LPX_UP, 0, search->qty);
@@ -145,7 +150,10 @@ static IslandPair *ipair_get_create(int si, int di) {
   ip->trades= 0;
   ip->route_tail_value= -1;
 
-  debugf("VALUE ipair_get(i%d,i%d) running...\n", si,di);
+  if (si==di) ctr_islands_arbitrage++;
+  else ctr_ipairs_relevant++;
+
+  debug2f("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) );
   assert(SQL_STEP(ss_ipair_dist));
@@ -251,10 +259,22 @@ double value_route(int nislands, const int *islands, int exclude_arbitrage) {
 	  debugf("  TRADE i%d#%d..i%d#%d c%d %d-%d  ",
 		 si,s, di,d, t->commodid, t->src_price, t->dst_price);
 
+	  IslandTradeEnd
+	    *src_ite= get_ite(t, &itradeends[si].src, t->src_price),
+	    *dst_ite= get_ite(t, &itradeends[di].dst, t->dst_price);
+
+	  int qty= src_ite->qty < dst_ite->qty ? src_ite->qty : dst_ite->qty;
+	  int maxprofit= qty * (t->dst_price - t->src_price);
+	  debugf("maxprofit=%d ",maxprofit);
+	  if (maxprofit < min_trade_maxprofit) {
+	    debugf("trivial\n");
+	    continue;
+	  }
+
 	  nconstraint_rows=0;
 
-	  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);
+	  avail_c(t, src_ite, t->src_price, "src", si,ss_ite_sell);
+	  avail_c(t, dst_ite, t->dst_price, "dst", di,ss_ite_buy);
 
 	  int leg;
 	  for (leg=s; leg<d; leg++) {
@@ -311,6 +331,9 @@ double value_route(int nislands, const int *islands, int exclude_arbitrage) {
   lpx_delete_prob(lp);
   lp= 0;
 
+  debugf("    %s %f\n",
+	 exclude_arbitrage ? "base value" : "route value",
+	 profit);
   return profit;
 }