========== 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> can it give a total investment/profit for the suggested trades?
-16:40 <ceb> columns should be sortable with the small arrows as before
-
-16:46 <Diziet> Oh the unticking has become broken.
-
-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.
+
+LATER OR NOT AT ALL
+
+adjustable potential cost of losses (rather than fixed 1e-BIG per league)
+
+max volume/mass
========== TODO ==========
</%args>
<%perl>
+my $loss_per_league= 1e-7;
+
my @flow_conds;
my @query_params;
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)."
$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;
}
};
));
}
$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
));
$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;
};
-$addcols->({}, qw(
+$addcols->({ DoReverse => 1 }, qw(
OptQty
));
-$addcols->({ Total => 0 }, qw(
+$addcols->({ Total => 0, DoReverse => 1 }, qw(
OptCapital OptProfit
));
% } # ========== 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..$#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}) {
% }
</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 ==========
% 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
% }
% }
% }
~yarrgweb / ypp-sc-tools.db-test.git / blobdiff