X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=4885782e58a440b7a773510a049daf363e5e0838;hb=cf9d0277c5d6bfe900a0881a00984f8268a90514;hp=56a1c38ff1a137ef8a2e618eb994c2af167948b5;hpb=4d67a78cf9ce16640830d627b407b97810d25bf9;p=ypp-sc-tools.db-live.git diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade index 56a1c38..4885782 100644 --- a/yarrg/web/routetrade +++ b/yarrg/web/routetrade @@ -32,19 +32,6 @@ This Mason component is the core trade planner for a specific route. -========== TODO ========== -16:36 alpha,byrne,papaya,turtle,jorvik,luthien is my example - -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> $dbh @@ -63,6 +50,7 @@ my $loss_per_league= 1e-7; my @flow_conds; my @query_params; +my %dists; my $sd_condition= sub { my ($bs, $ix) = @_; @@ -98,10 +86,12 @@ foreach my $src_i (0..$#islandids) { if ($specific && !$confusing && # With a circular route, do not carry goods round the loop - !($src_i==0 && $dst_i==$#islandids && + !(($src_i==0 || $src_i==$#islandids) && + $dst_i==$#islandids && $src_isle == $islandids[$dst_i])) { if ($islandpair{$src_isle,$dst_isle}) { $confusing= 1; +print "confusing $src_i $src_isle $dst_i $dst_isle\n"; } else { $islandpair{$src_isle,$dst_isle}= [ $src_i, $dst_i ]; @@ -172,6 +162,20 @@ my $sth= $dbh->prepare($stmt); $sth->execute(@query_params); my @flows; +my $distquery= $dbh->prepare(" + SELECT dist FROM dists WHERE aiid = ? AND biid = ? + "); +my $distance= sub { + my ($from,$to)= @_; + my $d= $dists{$from}{$to}; + return $d if defined $d; + $distquery->execute($from,$to); + $d = $distquery->fetchrow_array(); + defined $d or die "$from $to ?"; + $dists{$from}{$to}= $d; + return $d; +}; + my @cols= ({ NoSort => 1 }); my $addcols= sub { @@ -201,7 +205,7 @@ $addcols->({ DoReverse => 1, SortColKey => 'MarginSortKey' }, qw( Margin )); $addcols->({ DoReverse => 1 }, - qw( unitprofit MaxQty + qw( unitprofit dist MaxQty MaxCapital MaxProfit )); @@ -252,6 +256,12 @@ $addcols->({ DoReverse => 1 }, % } <%perl> + +if (!@flows) { + print 'No profitable trading opportunities were found.'; + return; +} + foreach my $f (@flows) { $f->{MaxQty}= $f->{'org_qty_agg'} < $f->{'dst_qty_agg'} @@ -268,6 +278,8 @@ foreach my $f (@flows) { $f->{'dst_price'} * (1.0 - $loss_per_league) ** $f->{'dist'} - $f->{'org_price'}; + $dists{'org_id'}{'dst_id'}= $f->{'dist'}; + my @uid= $f->{commodid}; foreach my $od (qw(org dst)) { push @uid, @@ -353,7 +365,7 @@ Route contains archipelago(es), not just specific islands. Route is complex - it visits the same island several times and isn't a simple loop. % } -Therefore, optimal trade pattern not calculated. +Therefore, optimal voyage trade plan not calculated. % } else { # ========== OPTMISATION ========== <%perl> @@ -423,7 +435,9 @@ if ($qa->{'debug'}) { qw(glpsol --cpxlp /dev/stdin -o /dev/stdout)); print "
\n" if $qa->{'debug'};
 	my $found_section= 0;
+	my $glpsol_out= '';
 	while (<$output>) {
+		$glpsol_out.= $_;
 		print encode_entities($_) if $qa->{'debug'};
 		if (m/^\s*No\.\s+Column name\s+St\s+Activity\s/) {
 			die if $found_section>0;
@@ -444,8 +458,9 @@ if ($qa->{'debug'}) {
 		$flow->{OptCapital}= $flow->{OptQty} * $flow->{'org_price'};
 	}
 	print "
\n" if $qa->{'debug'}; - pipethrough_run_finish($output, 'glpsol'); - die unless $found_section; + my $prerr= "\n=====\n$cplex\n=====\n$glpsol_out\n=====\n "; + pipethrough_run_finish($output,$prerr); + die $prerr unless $found_section; }; $addcols->({ DoReverse => 1 }, qw( @@ -471,6 +486,7 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw( + % if ($optimise) { @@ -483,6 +499,7 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw( Collect Deliver Profit + Max % if ($optimise) { Planned @@ -499,6 +516,7 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw( Qty Margin Unit +Dist Qty Capital Profit @@ -544,15 +562,10 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw( % } -<& tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow', +<&| 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; - + @@ -561,69 +574,97 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw( % my $iquery= $dbh->prepare('SELECT islandname FROM islands % WHERE islandid = ?'); % my %da_ages; +% my $total_total= 0; +% my $total_dist= 0; %

Voyage trading plan

- +
% foreach my $i (0..$#islandids) { - + % } - -% my $age_reported= 0; -% 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= { Qty => 0 } 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}; -% $$todo->{Stalls}= $f->{"${od}Stalls"}; -% } -% if (%todo && !$age_reported++) { -% my $age= $now - (values %todo)[0]->{Timestamp}; -% my $cellid= "da_${i}"; -% $da_ages{$cellid}= $age; - +% } % $total += $t->{Total}; % my $span= 0 + keys %{ $t->{Stalls} }; % my $td= "td rowspan=$span"; -<<% $td %>><% $od eq 'org' ? 'Collect' : 'Deliver' %> +<<% $td %>><% $collectdeliver %> <<% $td %>><% $t->{'commodname'} |h %> % % my @stalls= sort keys %{ $t->{Stalls} }; % my $pstall= sub { % my $name= $stalls[$_[0]]; -% my $avail= $t->{Stalls}{$name}; - - +
+
% $iquery->execute($islandids[$i]); % my ($islandname) = $iquery->fetchrow_array(); +% my $this_dist= $distance->($islandids[$i-1],$islandids[$i]); +% $total_dist += $this_dist; % if (!$i) { -Start at <% $islandname |h %> +Start at <% $islandname |h %> % } else { -Sail to <% $islandname |h %> +Sail to <% $islandname |h %> +- <% $this_dist |h %> leagues \ +<%perl> + my $age_reported= 0; + my %flowlists; + foreach my $od (qw(org dst)) { + foreach my $f (@flows) { + next if $f->{Suppress}; + next unless $f->{"${od}_id"} == $islandids[$i]; + next unless $f->{OptQty}; + my $arbitrage= $f->{'org_id'} == $f->{'dst_id'}; + my $loop= $islandids[0] == $islandids[-1] && + ($i==0 || $i==$#islandids); + next if $loop and ($arbitrage ? $i : + !!$i == !!($od eq 'org')); + my $price= $f->{"${od}_price"}; + my $stallname= $f->{"${od}_stallname"}; + my $todo= \$flowlists{$od}{ + $f->{'commodname'}, + (sprintf "%07d", ($od eq 'dst' ? + 9999999-$price : $price)), + $stallname + }; + $$todo= { + Qty => 0, + orgArbitrage => 0, + dstArbitrage => 0, + } 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}; + $$todo->{Stalls}= $f->{"${od}Stalls"}; + $$todo->{"${od}Arbitrage"}= 1 if $arbitrage; + } + } + + my $total; + my $dline= 0; + my $show_flows= sub { + my ($od,$arbitrage,$collectdeliver) = @_; + +% +% my $todo= $flowlists{$od}; +% return unless $todo; +% foreach my $tkey (sort keys %$todo) { +% my $t= $todo->{$tkey}; +% next if $t->{"${od}Arbitrage"} != $arbitrage; +% if (!$age_reported++) { +% my $age= $now - $t->{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}; +% } elsif (!defined $total) { +% $total= 0; +
<% $avail |h %> <% $od eq 'org' ? 'avail.' : 'wanted' %> <% $name |h %> % }; % % $pstall->(0); -<<% $td %> align=right><% $t->{Price} |h %> each +<<% $td %> align=right><% $t->{Price} |h %> poe ea. <<% $td %> align=right><% $t->{Qty} |h %> unit(s) <<% $td %> align=right><% $t->{Total} |h %> total % @@ -634,13 +675,34 @@ Sail to <% $islandname |h %> % % $dline ^= 1; % } -% if (%todo) { +% }; +% my $show_total= sub { +% my ($totaldesc, $sign)= @_; +% if (defined $total) {
<% $od eq 'org' ? 'Outlay' : 'Proceeds' %> + +<% $totaldesc %> <% $total |h %> total +% $total_total += $sign * $total; % } -% } -% } +% $total= undef; +% $dline= 0; +<%perl> + }; + + $show_flows->('dst',0,'Deliver'); $show_total->('Proceeds',1); + $show_flows->('org',1,'Collect'); $show_total->('(Arbitrage) outlay',-1); + $show_flows->('dst',1,'Deliver'); $show_total->('(Arbitrage) proceeds',1); + $show_flows->('org',0,'Collect'); $show_total->('Outlay',-1); + +} + +
Total distance: <% $total_dist %> leagues. +Overall net cash flow +<% + $total_total < 0 ? -$total_total." loss" : $total_total." gain" + %>
<& query_age:dataages, id2age => \%da_ages &> %