Prefer short trades, using distance table

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

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 97359a9fc1fea4920f7a6deaad345d775a34d036..8d425375fe76bbc4544bacfa9bf7172eb937caf0 100644 (file)
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -35,37 +35,22 @@
 ========== TODO ==========
 16:36 <ceb> alpha,byrne,papaya,turtle,jorvik,luthien is my example
 
-16:37 <ceb> if tehre are 2 rows which take the same object and sell it for the 
-            same profit at two other islands, choose the shortest route as the 
-            preferred one
-16:37 <ceb> coconut buy 10 sell 16, at luthien or jorvik, in that example
-16:38 <ceb> Do you see what I mean?
-
-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?
 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:51 <ceb> YPP interfaces have price then qty. You have qty then price. This 
-            is confusing!
-16:51 <ceb> the max column ordering is OK
-16:51 <ceb> (alo profit and suggested are OK)
-16:52 <Diziet> Err, you want qty on the left in those two but on the right in 
-               collect and deliver ?
-16:53 <ceb> Yes (price and capital are not the same thing)
-16:53 <Diziet> OK
-16:53 <ceb> for max the order in which you want to think about it is 'I need to 
-            buy ten of them and that will cost me $total price)
-16:54 <ceb> s/)/'/
-
 16:46 <ceb> Also trading plan not functional but I guess you know that :-)
 
-Also:
-- potential cost of losses
-- max volume/mass
-- use POST for update.  Hrrm.
+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>
@@ -77,6 +62,8 @@ $qa
 </%args>
 <%perl>
 
+my $loss_per_league= 1e-7;
+
 my @flow_conds;
 my @query_params;
 
@@ -152,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
@@ -162,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)."
@@ -199,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
        ));
@@ -233,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,
@@ -333,7 +326,9 @@ Maximize
 
   totalprofit:
                   ".(join " +
-                  ", map { "$_->{unitprofit} $_->{Var}" } @flows)."
+                  ", map {
+                       sprintf "%.20f %s", $_->{ExpectedUnitProfit}, $_->{Var}
+                       } @flows)."
 
 Subject To
 ";
@@ -452,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>
@@ -460,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