X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=c135e67bc5b16a69452fec1a559f332eebf1a5cd;hb=c20deee42fbd2d86e976bb6a2e4f8e5f5cf2631b;hp=fe8459f4011f47d5c0753c75e39a8ed5bffd0bd3;hpb=b0e4ccf9eb7bbc97c6e8d0f39cd40d341585c453;p=ypp-sc-tools.db-live.git diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade index fe8459f..c135e67 100644 --- a/yarrg/web/routetrade +++ b/yarrg/web/routetrade @@ -35,28 +35,16 @@ ========== TODO ========== 16:36 alpha,byrne,papaya,turtle,jorvik,luthien is my example - -- potential cost of losses -16:37 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 coconut buy 10 sell 16, at luthien or jorvik, in that example -16:38 Do you see what I mean? - -16:39 Also, maybe colour to highlight the suggested trades? - -16:40 columns should be sortable with the small arrows as before - 16:46 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 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 ========== @@ -68,6 +56,8 @@ $qa <%perl> +my $loss_per_league= 1e-7; + my @flow_conds; my @query_params; @@ -143,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)." @@ -169,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; } }; @@ -189,7 +183,7 @@ if ($qa->{ShowStalls}) { )); } $addcols->({ Text => 1 }, qw(commodname)); -$addcols->({}, +$addcols->({ DoReverse => 1 }, qw( org_price org_qty dst_price dst_qty Margin unitprofit MaxQty MaxCapital MaxProfit @@ -224,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, @@ -324,7 +322,9 @@ Maximize totalprofit: ".(join " + - ", map { "$_->{unitprofit} $_->{Var}" } @flows)." + ", map { + sprintf "%.20f %s", $_->{ExpectedUnitProfit}, $_->{Var} + } @flows)." Subject To "; @@ -407,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 )); @@ -418,10 +418,11 @@ $addcols->({ Total => 0 }, qw( % } # ========== OPTIMISATION ========== +% my %ts_sortkeys; % { % my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : ''; % my $cdstall= $qa->{ShowStalls} ? 'Stall' : ''; - +
<% $qa->{ShowStalls} ? '' : '' %> @@ -433,7 +434,7 @@ $addcols->({ Total => 0 }, qw( % if ($optimise) { % } - + + +% foreach my $col (@cols) { + +
>Collect >Deliver @@ -467,23 +468,31 @@ $addcols->({ Total => 0 }, qw( % } % } -% foreach my $flow (@flows) { -
+% } + +% foreach my $flowix (0..$#flows) { +% my $flow= $flows[$flowix]; +% my $rowid= "id_row_$flow->{UidShort}"; +
{UidShort} %> value=""> {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; {Text} ? '' : 'align=right' %>><% $v |h %> % } % } -
Total -% foreach my $ci (2..$#cols) { +% foreach my $ci (3..$#cols) { % my $col= $cols[$ci]; % if (defined $col->{Total}) { @@ -492,6 +501,16 @@ $addcols->({ Total => 0 }, qw( % }
+<& 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; + + % if ($optimise) { # ========== TRADING PLAN ========== @@ -521,7 +540,7 @@ Sail to <% $islandname |h %> % next if $f->{Suppress}; % next unless $f->{"${od}_id"} == $islandids[$i]; % next unless $f->{OptQty}; -Buy or sell flow +Buy or sell flow % } % } % }