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
</%args>
<%perl>
+my $loss_per_league= 1e-7;
+
my @flow_conds;
my @query_params;
SELECT sell_islands.islandname org_name,
sell_islands.islandid org_id,
sell.price org_price,
+ sell_uploads.timestamp org_timestamp,
buy_islands.islandname dst_name,
buy_islands.islandid dst_id,
buy.price dst_price,
+ buy_uploads.timestamp dst_timestamp,
".($qa->{ShowStalls} ? "
sell.stallid org_stallid,
sell_stalls.stallname org_stallname,
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
+ JOIN uploads AS sell_uploads ON sell.islandid = sell_uploads.islandid
+ JOIN uploads AS buy_uploads ON buy.islandid = buy_uploads.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)."
$sth->execute(@query_params);
my @flows;
-my @columns;
+my @cols= ({ NoSort => 1 });
+
+my $addcols= sub {
+ my $base= shift @_;
+ foreach my $name (@_) {
+ my $col= { Name => $name, %$base };
+ $col->{Numeric}=1 if !$col->{Text};
+ push @cols, $col;
+ }
+};
+
if ($qa->{ShowStalls}) {
- push @columns, qw(org_name org_stallname dst_name dst_stallname);
+ $addcols->({ Text => 1 }, qw(
+ org_name org_stallname
+ dst_name dst_stallname
+ ));
} else {
- push @columns, qw(org_name dst_name);
+ $addcols->({Text => 1 }, qw(
+ org_name dst_name
+ ));
}
-my $ntextcolumns= @columns+1;
-push @columns, qw(commodname
- org_qty org_price dst_qty dst_price
- Margin unitprofit
- MaxQty MaxCapital MaxProfit);
+$addcols->({ Text => 1 }, qw(commodname));
+$addcols->({ DoReverse => 1 },
+ qw( org_price org_qty dst_price dst_qty
+ Margin unitprofit MaxQty
+ MaxCapital MaxProfit
+ ));
</%perl>
$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,
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;
}
totalprofit:
".(join " +
- ", map { "$_->{unitprofit} $_->{Var}" } @flows)."
+ ", map {
+ sprintf "%.20f %s", $_->{ExpectedUnitProfit}, $_->{Var}
+ } @flows)."
Subject To
";
die unless $found_section;
};
-push @columns, qw(OptQty OptCapital OptProfit);
+$addcols->({ DoReverse => 1 }, qw(
+ OptQty
+ ));
+$addcols->({ Total => 0, DoReverse => 1 }, qw(
+ OptCapital OptProfit
+ ));
</%perl>
% } # ========== 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>' : '' %>
% if ($optimise) {
<colgroup span=3>
% }
-<tr>
+<tr class="spong">
<th>
<th<% $cdspan %>>Collect
<th<% $cdspan %>>Deliver
<th colspan=2>Profit
<th colspan=3>Max
% if ($optimise) {
-<th colspan=3>Suggested
+<th colspan=3>Planned
% }
<tr>
<th>Island <% $cdstall %>
<th>Island <% $cdstall %>
<th>Commodity
-<th>Qty
<th>Price
<th>Qty
<th>Price
+<th>Qty
<th>Margin
<th>Unit
<th>Qty
% }
% }
-% 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..$#columns) {
-% my $col= $columns[$ci];
-% my $v= $flow->{$col};
-% my $isnum= $ci >= $ntextcolumns;
-% $v='' if $isnum && !$v;
-<td <% $isnum ? 'align=right' : '' %>><% $v |h %>
+% 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 id="trades_total">
+<th>
+<th colspan=2>Total
+% foreach my $ci (3..$#cols) {
+% my $col= $cols[$ci];
+<td align=right>
+% if (defined $col->{Total}) {
+<% $col->{Total} |h %>
% }
% }
</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 ==========
+%
+% 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;
+% my %todo;
+% foreach my $f (@flows) {
+% next if $f->{Suppress};
+% next unless $f->{"${od}_id"} == $islandids[$i];
+% next unless $f->{OptQty};
+% my $price= $f->{"${od}_price"};
+% my $stallname= $f->{"${od}_stallname"};
+% my $todo= \$todo{ $f->{'commodname'},
+% (sprintf "%07d", $price),
+% $stallname };
+% $$todo= { } unless $$todo;
+% $$todo->{'commodname'}= $f->{'commodname'};
+% $$todo->{'stallname'}= $stallname;
+% $$todo->{Price} += $price;
+% $$todo->{Qty} += $f->{OptQty};
+% $$todo->{Total} = $$todo->{Price} * $$todo->{Qty};
+% $$todo->{Timestamp} = $f->{"${od}_timestamp"};
+% }
+% my $total= 0;
+% my $dline= 0;
+% foreach my $tkey (sort keys %todo) {
+% my $t= $todo{$tkey};
+% $total += $t->{Total};
+<tr class="datarow<% $dline %>"><td>
+% if ($od eq 'org') {
+Collect
+% } else {
+Deliver
+% }
+<td><% $t->{'commodname'} |h %>
+<td align=right><% $t->{Price} |h %> each
+% if ($qa->{ShowStalls}) {
+<td><% $t->{'stallname'} |h %>
+% }
+<td align=right><% $t->{Qty} |h %> unit(s)
+<td align=right><% $t->{Total} |h %> total
+% $dline ^= 1;
+% }
+% if (%todo) {
+<tr><td>
+<td colspan=<% 2+!!$qa->{ShowStalls} %>>
+<% (values %todo)[0]->{Timestamp} %>
+<td align=right>
+% if ($od eq 'org') {
+Outlay
+% } else {
+Proceeds
+% }
+<td align=right><% $total |h %> total
+% }
+% }
+% }
+</table>
+%
+% } # ========== TRADING PLAN ==========
+
<%init>
use CommodsWeb;
use Commods;
~yarrgweb / ypp-sc-tools.web-live.git / blobdiff