X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=58f21a1a581a45ab3ae28a2d6caf4e8d991e07f1;hb=64e2a2a4994f23f12ba9d3e5bcc413e5b8798544;hp=2438059a170cb1bf124dfd7fffe91b9b98c45f37;hpb=e9609637b8acfaf47a176e6d0c934d1f907e27a8;p=ypp-sc-tools.web-live.git diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade index 2438059..58f21a1 100644 --- a/yarrg/web/routetrade +++ b/yarrg/web/routetrade @@ -35,10 +35,6 @@ ========== TODO ========== 16:36 alpha,byrne,papaya,turtle,jorvik,luthien is my example -16:39 Also, maybe colour to highlight the suggested trades? - -16:46 Also trading plan not functional but I guess you know that :-) - use POST for update. Hrrm. LATER OR NOT AT ALL @@ -47,8 +43,6 @@ 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 ========== @@ -58,8 +52,13 @@ $dbh @archipelagoes $qa +<&| script &> + da_pageload= Date.now(); + + <%perl> +my $now= time; my $loss_per_league= 1e-7; my @flow_conds; @@ -119,9 +118,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, @@ -140,15 +141,17 @@ my $stmt= " 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 + JOIN dists ON aiid = sell.islandid AND biid = buy.islandid WHERE ( ".join(" OR ", @flow_conds)." @@ -189,7 +192,12 @@ if ($qa->{ShowStalls}) { $addcols->({ Text => 1 }, qw(commodname)); $addcols->({ DoReverse => 1 }, qw( org_price org_qty dst_price dst_qty - Margin unitprofit MaxQty + )); +$addcols->({ DoReverse => 1, SortColKey => 'MarginSortKey' }, + qw( Margin + )); +$addcols->({ DoReverse => 1 }, + qw( unitprofit MaxQty MaxCapital MaxProfit )); @@ -216,6 +224,8 @@ $addcols->({ DoReverse => 1 }, $f->{MaxProfit}= $f->{MaxQty} * $f->{'unitprofit'}; $f->{MaxCapital}= $f->{MaxQty} * $f->{'org_price'}; + $f->{MarginSortKey}= sprintf "%d", + $f->{'dst_price'} * 10000 / $f->{'org_price'}; $f->{Margin}= sprintf "%3.1f%%", $f->{'dst_price'} * 100.0 / $f->{'org_price'} - 100.0; @@ -224,7 +234,7 @@ $addcols->({ DoReverse => 1 }, $f->{ExpectedUnitProfit}= $f->{'dst_price'} * (1.0 - $loss_per_league) ** $f->{'dist'} - - $f->{'src_price'}; + - $f->{'org_price'}; my @uid= $f->{commodid}; foreach my $od (qw(org dst)) { @@ -438,7 +448,7 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw( % if ($optimise) { % } - + >Collect >Deliver @@ -477,9 +487,10 @@ $addcols->({ Total => 0, DoReverse => 1 }, 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' %> > @@ -488,7 +499,9 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw( % my $v= $flow->{$col->{Name}}; % $col->{Total} += $v if defined $col->{Total}; % $v='' if !$col->{Text} && !$v; -% $ts_sortkeys{$ci}{$rowid}= $v; +% my $sortkey= $col->{SortColKey} ? +% $flow->{$col->{SortColKey}} : $v; +% $ts_sortkeys{$ci}{$rowid}= $sortkey; {Text} ? '' : 'align=right' %>><% $v |h %> % } % } @@ -504,7 +517,7 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw( % } -<& tabsort, cols => \@cols, table => 'trades', +<& tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow', throw => 'trades_sort', tbrow => 'trades_total' &> <&| script &> ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>; @@ -520,11 +533,12 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw( % % my $iquery= $dbh->prepare('SELECT islandname FROM islands % WHERE islandid = ?'); +% my %da_ages; %

Voyage trading plan

% foreach my $i (0..$#islandids) { - +
+
{ShowStalls} %>> % $iquery->execute($islandids[$i]); % my ($islandname) = $iquery->fetchrow_array(); % if (!$i) { @@ -533,21 +547,69 @@ Start at <% $islandname |h %> Sail to <% $islandname |h %> % } +% my $age_reported= 0; % 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->{Timestamp}= $f->{"${od}_timestamp"}; +% $$todo->{Qty} += $f->{OptQty}; +% $$todo->{Total}= $$todo->{Price} * $$todo->{Qty}; +% } +% if (%todo && !$age_reported++) { + +% my $age= $now - (values %todo)[0]->{Timestamp}; +% my $cellid= "da_${i}"; +% $da_ages{$cellid}= $age; +(Data age: <% prettyprint_age($age) %>) +% } +% 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} %>> + +% if ($od eq 'org') { +Outlay +% } else { +Proceeds +% } +<% $total |h %> total % } % } % }
+<& query_age:dataages, id2age => \%da_ages &> % % } # ========== TRADING PLAN ==========