X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=c135e67bc5b16a69452fec1a559f332eebf1a5cd;hb=c20deee42fbd2d86e976bb6a2e4f8e5f5cf2631b;hp=6bc7277d341a69049358dbb40176700657674187;hpb=f41b94c1ec31bbff084b7429c1aec495aca2ab1e;p=ypp-sc-tools.db-live.git

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 6bc7277..c135e67 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -32,6 +32,21 @@
  This Mason component is the core trade planner for a specific route.
 
 
+========== TODO ==========
+16:36 <ceb> alpha,byrne,papaya,turtle,jorvik,luthien is my example
+
+16:46 <ceb> Also trading plan not functional but I guess you know that :-)
+
+use POST for update.  Hrrm.
+
+LATER OR NOT AT ALL
+
+adjustable potential cost of losses (rather than fixed 1e-BIG per league)
+
+max volume/mass
+
+========== TODO ==========
+
 </%doc>
 <%args>
 $dbh
@@ -41,6 +56,8 @@ $qa
 </%args>
 <%perl>
 
+my $loss_per_league= 1e-7;
+
 my @flow_conds;
 my @query_params;
 
@@ -116,16 +133,18 @@ my $stmt= "
 		commods.commodid				commodid,
 		commods.unitmass				unitmass,
 		commods.unitvolume				unitvolume,
+		dist						dist,
 		buy.price - sell.price				unitprofit
 	FROM commods
-	JOIN buy  on commods.commodid = buy.commodid
-	JOIN sell on commods.commodid = sell.commodid
-	JOIN islands as sell_islands on sell.islandid = sell_islands.islandid
-	JOIN islands as buy_islands  on buy.islandid  = buy_islands.islandid
+	JOIN buy  ON commods.commodid = buy.commodid
+	JOIN sell ON commods.commodid = sell.commodid
+	JOIN islands AS sell_islands ON sell.islandid = sell_islands.islandid
+	JOIN islands AS buy_islands  ON buy.islandid  = buy_islands.islandid
 ".($qa->{ShowStalls} ? "
-	JOIN stalls  as sell_stalls  on sell.stallid  = sell_stalls.stallid
-	JOIN stalls  as buy_stalls   on buy.stallid   = buy_stalls.stallid
+	JOIN stalls  AS sell_stalls  ON sell.stallid  = sell_stalls.stallid
+	JOIN stalls  AS buy_stalls   ON buy.stallid   = buy_stalls.stallid
 " : "")."
+	JOIN dists ON aiid = sell.islandid AND biid = buy.islandid
 	WHERE	(
 		".join("
 	   OR	", @flow_conds)."
@@ -142,12 +161,14 @@ my $sth= $dbh->prepare($stmt);
 $sth->execute(@query_params);
 my @flows;
 
-my @cols;
+my @cols= ({ NoSort => 1 });
 
 my $addcols= sub {
 	my $base= shift @_;
 	foreach my $name (@_) {
-		push @cols, { Name => $name, %$base };
+		my $col= { Name => $name, %$base };
+		$col->{Numeric}=1 if !$col->{Text};
+		push @cols, $col;
 	}
 };
 
@@ -162,8 +183,8 @@ if ($qa->{ShowStalls}) {
 	));
 }
 $addcols->({ Text => 1 }, qw(commodname));
-$addcols->({},
-	qw(	org_qty org_price dst_qty dst_price
+$addcols->({ DoReverse => 1 },
+	qw(	org_price org_qty dst_price dst_qty
 		Margin unitprofit MaxQty
 		MaxCapital MaxProfit
 	));
@@ -197,6 +218,10 @@ $addcols->({},
 	$f->{"org_stallid"}= $f->{"dst_stallid"}= 'all'
 		if !$qa->{ShowStalls};
 
+	$f->{ExpectedUnitProfit}=
+		$f->{'dst_price'} * (1.0 - $loss_per_league) ** $f->{'dist'}
+		- $f->{'src_price'};
+
 	my @uid= $f->{commodid};
 	foreach my $od (qw(org dst)) {
 		push @uid,
@@ -260,7 +285,8 @@ die "$cmpu $uue ?" if length $cmpu > 20;
 			die "$f->{UidLong} = $f->{UidShort} = $recons_long ?";
 	}
 
-	if ($qa->{"R$f->{UidShort}"} && !$qa->{"T$f->{UidShort}"}) {
+	if (defined $qa->{"R$f->{UidShort}"} &&
+	    !defined $qa->{"T$f->{UidShort}"}) {
 		$f->{Suppress}= 1;
 	}
 
@@ -296,7 +322,9 @@ Maximize
 
   totalprofit:
                   ".(join " +
-                  ", map { "$_->{unitprofit} $_->{Var}" } @flows)."
+                  ", map {
+			sprintf "%.20f %s", $_->{ExpectedUnitProfit}, $_->{Var}
+			} @flows)."
 
 Subject To
 ";
@@ -379,10 +407,10 @@ if ($qa->{'debug'}) {
 	die unless $found_section;
 };
 
-$addcols->({}, qw(
+$addcols->({ DoReverse => 1 }, qw(
 		OptQty
 	));
-$addcols->({ Total => 0 }, qw(
+$addcols->({ Total => 0, DoReverse => 1 }, qw(
 		OptCapital OptProfit
 	));
 
@@ -390,10 +418,11 @@ $addcols->({ Total => 0 }, qw(
 
 % } # ========== OPTIMISATION ==========
 
+% my %ts_sortkeys;
 % {
 %	my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : '';
 %	my $cdstall= $qa->{ShowStalls} ? '<th>Stall</th>' : '';
-<table rules=groups>
+<table id="trades" rules=groups>
 <colgroup span=1>
 <colgroup span=2>
 <% $qa->{ShowStalls} ? '<colgroup span=2>' : '' %>
@@ -405,7 +434,7 @@ $addcols->({ Total => 0 }, qw(
 %	if ($optimise) {
 <colgroup span=3>
 %	}
-<tr>
+<tr class="spong">
 <th>
 <th<% $cdspan %>>Collect
 <th<% $cdspan %>>Deliver
@@ -415,7 +444,7 @@ $addcols->({ Total => 0 }, qw(
 <th colspan=2>Profit
 <th colspan=3>Max
 %	if ($optimise) {
-<th colspan=3>Suggested
+<th colspan=3>Planned
 %	}
 
 <tr>
@@ -423,10 +452,10 @@ $addcols->({ Total => 0 }, qw(
 <th>Island <% $cdstall %>
 <th>Island <% $cdstall %>
 <th>Commodity
-<th>Qty
 <th>Price
 <th>Qty
 <th>Price
+<th>Qty
 <th>Margin
 <th>Unit
 <th>Qty
@@ -439,23 +468,31 @@ $addcols->({ Total => 0 }, qw(
 %	}
 % }
 
-% foreach my $flow (@flows) {
-<tr>
+<tr id="trades_sort">
+% foreach my $col (@cols) {
+<th>
+% }
+
+% foreach my $flowix (0..$#flows) {
+%	my $flow= $flows[$flowix];
+%	my $rowid= "id_row_$flow->{UidShort}";
+<tr id="<% $rowid %>" class="datarow<% $flowix & 1 %>">
 <td><input type=hidden   name=R<% $flow->{UidShort} %> value="">
     <input type=checkbox name=T<% $flow->{UidShort} %> value=""
        <% $flow->{Suppress} ? '' : 'checked' %> >
-%	foreach my $ci (0..$#cols) {
+%	foreach my $ci (1..$#cols) {
 %		my $col= $cols[$ci];
 %		my $v= $flow->{$col->{Name}};
 %		$col->{Total} += $v if defined $col->{Total};
 %		$v='' if !$col->{Text} && !$v;
+%		$ts_sortkeys{$ci}{$rowid}= $v;
 <td <% $col->{Text} ? '' : 'align=right' %>><% $v |h %>
 %	}
 % }
-<tr>
+<tr id="trades_total">
 <th>
 <th colspan=2>Total
-% foreach my $ci (2..$#cols) {
+% foreach my $ci (3..$#cols) {
 %	my $col= $cols[$ci];
 <td align=right>
 %	if (defined $col->{Total}) {
@@ -464,6 +501,16 @@ $addcols->({ Total => 0 }, qw(
 % }
 </table>
 
+<& tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow',
+	throw => 'trades_sort', tbrow => 'trades_total' &>
+<&| script &>
+  ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
+  function all_onload() {
+    ts_onload__trades();
+  }
+  window.onload= all_onload;
+</&script>
+
 <input type=submit name=update value="Update">
 
 % if ($optimise) { # ========== TRADING PLAN ==========
@@ -493,7 +540,7 @@ Sail to <% $islandname |h %>
 %		next if $f->{Suppress};
 %		next unless $f->{"${od}_id"} == $islandids[$i];
 %		next unless $f->{OptQty};
-<tr>Buy or sell flow 
+<tr><td>Buy or sell flow 
 %	}
 %    }
 % }