X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=0adf9920bbbc6bb96bd0f05ad0f7d4fa78ece764;hb=f6d7a4d627f3ecc0624649bb895dbf8e59afcf47;hp=97359a9fc1fea4920f7a6deaad345d775a34d036;hpb=cfb91181c6dec6df662af8325c0293d4c2e8be25;p=ypp-sc-tools.db-live.git diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade index 97359a9..0adf992 100644 --- a/yarrg/web/routetrade +++ b/yarrg/web/routetrade @@ -35,36 +35,15 @@ ========== TODO ========== 16:36 alpha,byrne,papaya,turtle,jorvik,luthien is my example -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: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? -16:39 Also, maybe colour to highlight the suggested trades? - -16:40 columns should be sortable with the small arrows as before - -16:51 YPP interfaces have price then qty. You have qty then price. This - is confusing! -16:51 the max column ordering is OK -16:51 (alo profit and suggested are OK) -16:52 Err, you want qty on the left in those two but on the right in - collect and deliver ? -16:53 Yes (price and capital are not the same thing) -16:53 OK -16:53 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 s/)/'/ - 16:46 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 ========== TODO ========== @@ -77,6 +56,8 @@ $qa <%perl> +my $loss_per_league= 1e-7; + my @flow_conds; my @query_params; @@ -134,9 +115,11 @@ my $stmt= " 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, @@ -152,16 +135,20 @@ 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 + 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)." @@ -178,12 +165,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; } }; @@ -198,8 +187,8 @@ if ($qa->{ShowStalls}) { )); } $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 )); @@ -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 "; @@ -416,10 +411,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 )); @@ -427,10 +422,11 @@ $addcols->({ Total => 0 }, qw( % } # ========== OPTIMISATION ========== +% my %ts_sortkeys; % { % my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : ''; % my $cdstall= $qa->{ShowStalls} ? 'Stall' : ''; - +
<% $qa->{ShowStalls} ? '' : '' %> @@ -442,7 +438,7 @@ $addcols->({ Total => 0 }, qw( % if ($optimise) { % } - + @@ -460,10 +456,10 @@ $addcols->({ Total => 0 }, qw( + +% foreach my $col (@cols) { + +
>Collect >Deliver @@ -452,7 +448,7 @@ $addcols->({ Total => 0 }, qw( Profit Max % if ($optimise) { -Suggested +Planned % }
Island <% $cdstall %> Island <% $cdstall %> Commodity -Qty Price Qty Price +Qty Margin Unit Qty @@ -476,23 +472,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}) { @@ -501,6 +505,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 ========== @@ -522,15 +536,55 @@ Sail to <% $islandname |h %> % 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) { +% my %todo; +% foreach my $f (@flows) { % next if $f->{Suppress}; % next unless $f->{"${od}_id"} == $islandids[$i]; % next unless $f->{OptQty}; -Buy or sell flow +% 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}; + +% if ($od eq 'org') { +Collect +% } else { +Deliver +% } +<% $t->{'commodname'} |h %> +<% $t->{Price} |h %> each +% if ($qa->{ShowStalls}) { +<% $t->{'stallname'} |h %> +% } +<% $t->{Qty} |h %> unit(s) +<% $t->{Total} |h %> total +% $dline ^= 1; +% } +% if (%todo) { + +{ShowStalls} %>> +<% (values %todo)[0]->{Timestamp} %> + +% if ($od eq 'org') { +Outlay +% } else { +Proceeds +% } +<% $total |h %> total % } % } % }