Prefer short trades, using distance table

[ypp-sc-tools.db-live.git] / yarrg / web / routetrade

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index cb0ef9379e1a451ebbe3b5c3aff332794ada7850..8d425375fe76bbc4544bacfa9bf7172eb937caf0 100644 (file)
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -32,6 +32,27 @@
  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:39 <ceb> Also, maybe colour to highlight the suggested trades?
+
+16:40 <ceb> columns should be sortable with the small arrows as before
+
+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
+
+16:38 <ceb> I don't know how hard this is, but can you show only the suggested 
+            trades to start ith and have a button to show all?
+========== TODO ==========
+
 </%doc>
 <%args>
 $dbh
@@ -41,6 +62,8 @@ $qa
 </%args>
 <%perl>
 
+my $loss_per_league= 1e-7;
+
 my @flow_conds;
 my @query_params;
 
@@ -116,6 +139,7 @@ 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
@@ -126,6 +150,7 @@ my $stmt= "
        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)."
@@ -163,7 +188,7 @@ if ($qa->{ShowStalls}) {
 }
 $addcols->({ Text => 1 }, qw(commodname));
 $addcols->({},
-       qw(     org_qty org_price dst_qty dst_price
+       qw(     org_price org_qty dst_price dst_qty
                Margin unitprofit MaxQty
                MaxCapital MaxProfit
        ));
@@ -197,6 +222,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 +289,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 +326,9 @@ Maximize
 
   totalprofit:
                   ".(join " +
-                  ", map { "$_->{unitprofit} $_->{Var}" } @flows)."
+                  ", map {
+                       sprintf "%.20f %s", $_->{ExpectedUnitProfit}, $_->{Var}
+                       } @flows)."
 
 Subject To
 ";
@@ -415,7 +447,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 +455,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
@@ -466,6 +498,41 @@ $addcols->({ Total => 0 }, qw(
 
 <input type=submit name=update value="Update">
 
+% if ($optimise) { # ========== TRADING PLAN ==========
+%
+% my $iquery= $dbh->prepare('SELECT islandname FROM islands
+%                              WHERE islandid = ?');
+%
+<h1>Voyage trading plan</h1>
+<table>
+% foreach my $i (0..$#islandids) {
+<tr><td colspan=4><strong>
+%      $iquery->execute($islandids[$i]);
+%      my ($islandname) = $iquery->fetchrow_array();
+%      if (!$i) {
+Start at <% $islandname |h %>
+%      } else {
+Sail to <% $islandname |h %>
+%      }
+</strong>
+%    foreach my $od (qw(dst org)) {
+%      my $sign= $od eq 'dst' ? -1 : +1;
+%      foreach my $f (sort {
+%                      $a->{'commodname'} cmp $b->{'commodname'}
+%              or $sign * ($a->{"${od}_price"} <=> $b->{"${od}_price"})
+%              or      $a->{"${od}_stallname"} cmp $b->{"${od}_stallname"}
+%              } @flows) {
+%              next if $f->{Suppress};
+%              next unless $f->{"${od}_id"} == $islandids[$i];
+%              next unless $f->{OptQty};
+<tr>Buy or sell flow 
+%      }
+%    }
+% }
+</table>
+%
+% } # ========== TRADING PLAN ==========
+
 <%init>
 use CommodsWeb;
 use Commods;