X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=c0fe98665c5760dd1312737abdef1b39cc802c8d;hb=0759b42dbad7715339b0dceb5e910ea7698fa90a;hp=4d8cd9f9ae8b77881616d907aa130b2f90ca19b2;hpb=fee014e3b912b5bea3de99052b6e311d188d8620;p=ypp-sc-tools.web-live.git diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade index 4d8cd9f..c0fe986 100644 --- a/yarrg/web/routetrade +++ b/yarrg/web/routetrade @@ -38,6 +38,10 @@ $dbh @islandids @archipelagoes $qa +$max_mass +$max_volume +$lossperleaguepct +$max_capital %args> <&| script &> da_pageload= Date.now(); @@ -45,11 +49,14 @@ $qa <%perl> +my $loss_per_league= defined $lossperleaguepct ? $lossperleaguepct*0.01 : 1e-7; +my $loss_per_delay_slot= 1e-8; + my $now= time; -my $loss_per_league= 1e-7; -my @flow_conds; +my %flow_conds; my @query_params; +my %dists; my $sd_condition= sub { my ($bs, $ix) = @_; @@ -62,43 +69,43 @@ my $sd_condition= sub { } }; -my %islandpair; -# $islandpair{$a,$b}= [ $start_island_ix, $end_island_ix ] - my $specific= !grep { !defined $_ } @islandids; -my $confusing= 0; -foreach my $src_i (0..$#islandids) { - my $src_isle= $islandids[$src_i]; - my $src_cond= $sd_condition->('sell',$src_i); - my @dst_conds; - foreach my $dst_i ($src_i..$#islandids) { +my %ipair2subflowinfs; +# $ipair2subflowinfs{$orgi,$dsti}= [ [$orgix,$distix], ... ] + +my @subflows; +# $subflows[0]{Flow} = { ... } +# $subflows[0]{Org} = $orgix +# $subflows[0]{Dst} = $dstix + +foreach my $org_i (0..$#islandids) { + my $org_isle= $islandids[$org_i]; + my $org_cond= $sd_condition->('sell',$org_i); + my %dst_conds; + foreach my $dst_i ($org_i..$#islandids) { my $dst_isle= $islandids[$dst_i]; + # Don't ever consider sailing things round the houses: + next if grep { $dst_isle == $_ } @islandids[$org_i..$dst_i-1]; + next if grep { $org_isle == $_ } @islandids[$org_i+1..$dst_i]; my $dst_cond= $sd_condition->('buy',$dst_i); - if ($dst_i==$src_i and !defined $src_isle) { + if ($dst_i==$org_i and !defined $org_isle) { # we always want arbitrage, but mentioning an arch # once shouldn't produce intra-arch trades $dst_cond= "($dst_cond AND sell.islandid = buy.islandid)"; } - push @dst_conds, $dst_cond; - - if ($specific && !$confusing && - # With a circular route, do not carry goods round the loop - !($src_i==0 && $dst_i==$#islandids && - $src_isle == $islandids[$dst_i])) { - if ($islandpair{$src_isle,$dst_isle}) { - $confusing= 1; - } else { - $islandpair{$src_isle,$dst_isle}= - [ $src_i, $dst_i ]; - } + $dst_conds{$dst_cond}= 1; + + if ($specific) { + push @{ $ipair2subflowinfs{$org_isle,$dst_isle} }, + [ $org_i, $dst_i ]; } } - push @flow_conds, "$src_cond AND ( + $flow_conds{ "$org_cond AND ( ".join(" - OR ",@dst_conds)." - )"; + OR ", sort keys %dst_conds)." + )" }= 1; } my $stmt= " @@ -147,7 +154,7 @@ my $stmt= " JOIN dists ON aiid = sell.islandid AND biid = buy.islandid WHERE ( ".join(" - OR ", @flow_conds)." + OR ", sort keys %flow_conds)." ) AND buy.price > sell.price ORDER BY org_name, dst_name, commodname, unitprofit DESC, @@ -159,6 +166,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 { @@ -188,9 +209,12 @@ $addcols->({ DoReverse => 1, SortColKey => 'MarginSortKey' }, qw( Margin )); $addcols->({ DoReverse => 1 }, - qw( unitprofit MaxQty - MaxCapital MaxProfit + qw( unitprofit MaxQty MaxCapital MaxProfit dist )); +foreach my $v (qw(MaxMass MaxVolume)) { + $addcols->({ + DoReverse => 1, Total => 0, SortColKey => "${v}SortKey" }, $v); +} %perl> @@ -217,7 +241,6 @@ $addcols->({ DoReverse => 1 }, $f= { Ix => scalar(@flows), - Var => "f".@flows, %$got }; $f->{"org_stallid"}= $f->{"dst_stallid"}= 'all' @@ -239,6 +262,14 @@ $addcols->({ DoReverse => 1 }, % } <%perl> + +my @sail_total; + +if (!@flows) { + print 'No profitable trading opportunities were found.'; + return; +} + foreach my $f (@flows) { $f->{MaxQty}= $f->{'org_qty_agg'} < $f->{'dst_qty_agg'} @@ -246,6 +277,24 @@ foreach my $f (@flows) { $f->{MaxProfit}= $f->{MaxQty} * $f->{'unitprofit'}; $f->{MaxCapital}= $f->{MaxQty} * $f->{'org_price'}; + $f->{MaxMassSortKey}= $f->{MaxQty} * $f->{'unitmass'}; + $f->{MaxVolumeSortKey}= $f->{MaxQty} * $f->{'unitvolume'}; + foreach my $v (qw(Mass Volume)) { + $f->{"Max$v"}= sprintf "%.1f", $f->{"Max${v}SortKey"} * 1e-6; + } + + my $sfis= $ipair2subflowinfs{$f->{'org_id'},$f->{'dst_id'}}; + foreach my $sfi (@$sfis) { + my $subflow= { + Flow => $f, + Org => $sfi->[0], + Dst => $sfi->[1], + Var => sprintf "f%ss%s", $f->{Ix}, $sfi->[0] + }; + push @{ $f->{Subflows} }, $subflow; + push @subflows, $subflow; + } + $f->{MarginSortKey}= sprintf "%d", $f->{'dst_price'} * 10000 / $f->{'org_price'}; $f->{Margin}= sprintf "%3.1f%%", @@ -255,6 +304,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, @@ -273,7 +324,7 @@ foreach my $f (@flows) { my $first= $base; do { my $this= $uue % $base; -print STDERR "uue=$uue this=$this "; +#print STDERR "uue=$uue this=$this "; $uue -= $this; $uue /= $base; $this += $first; @@ -281,8 +332,8 @@ print STDERR "uue=$uue this=$this "; $cmpu .= chr($this + ($this < 26 ? ord('a') : $this < 52 ? ord('A')-26 : ord('0')-52)); -print STDERR " uue=$uue this=$this cmpu=$cmpu\n"; -die "$cmpu $uue ?" if length $cmpu > 20; +#print STDERR " uue=$uue this=$this cmpu=$cmpu\n"; + die "$cmpu $uue ?" if length $cmpu > 20; } while ($uue); $cmpu; } @uid; @@ -326,21 +377,14 @@ die "$cmpu $uue ?" if length $cmpu > 20; } %perl> -% my $optimise= $specific && !$confusing && @islandids>1; +% my $optimise= $specific; % if (!$optimise) {
-% if (@islandids<=1) { -Route is trivial. -% } % if (!$specific) { Route contains archipelago(es), not just specific islands. % } -% if ($confusing) { -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> @@ -349,24 +393,30 @@ my $cplex= " Maximize totalprofit: - ".(join " + - ", map { - sprintf "%.20f %s", $_->{ExpectedUnitProfit}, $_->{Var} - } @flows)." +"; + +foreach my $sf (@subflows) { + my $eup= $sf->{Flow}{ExpectedUnitProfit}; + $eup *= (1.0-$loss_per_delay_slot) ** $sf->{Org}; + $cplex .= sprintf " + %+.20f %s", $eup, $sf->{Var}; +} +$cplex .= " Subject To "; -my %avail_csts; +my %avail_lims; foreach my $flow (@flows) { if ($flow->{Suppress}) { - $cplex .= " - $flow->{Var} = 0 -"; + foreach my $sf (@{ $flow->{Subflows} }) { + $cplex .= " + $sf->{Var} = 0"; + } next; } foreach my $od (qw(org dst)) { - my $cstname= join '_', ( + my $limname= join '_', ( 'avail', $flow->{'commodid'}, $od, @@ -374,23 +424,72 @@ foreach my $flow (@flows) { $flow->{"${od}_price"}, $flow->{"${od}_stallid"}, ); - - push @{ $avail_csts{$cstname}{Flows} }, $flow->{Var}; - $avail_csts{$cstname}{Qty}= $flow->{"${od}_qty_agg"}; + + push @{ $avail_lims{$limname}{SubflowVars} }, + map { $_->{Var} } @{ $flow->{Subflows} }; + $avail_lims{$limname}{Qty}= $flow->{"${od}_qty_agg"}; } } -foreach my $cstname (sort keys %avail_csts) { - my $c= $avail_csts{$cstname}; - $cplex .= " - ". sprintf("%-30s","$cstname:")." ". - join("+", @{ $c->{Flows} }). - " <= ".$c->{Qty}."\n"; +foreach my $limname (sort keys %avail_lims) { + my $c= $avail_lims{$limname}; + $cplex .= + sprintf(" %-30s","$limname:")." ". + join("+", @{ $c->{SubflowVars} }). + " <= ".$c->{Qty}."\n"; +} + +foreach my $ci (0..($#islandids-1)) { + my @rel_subflows; + + foreach my $f (@flows) { + next if $f->{Suppress}; + my @relsubflow= grep { + $_->{Org} <= $ci && + $_->{Dst} > $ci; + } @{ $f->{Subflows} }; + next unless @relsubflow; + die unless @relsubflow == 1; + push @rel_subflows, @relsubflow; +#print " RELEVANT $ci $relsubflow[0]->{Var} "; + } +#print " RELEVANT $ci COUNT ".scalar(@rel_subflows)." "; + if (!@rel_subflows) { + foreach my $mv (qw(mass volume)) { + $sail_total[$ci]{$mv}= 0; + } + next; + } + + my $applylimit= sub { + my ($mv, $max, $f2val) = @_; + $max= 1e9 unless defined $max; +#print " DEFINED MAX $mv $max "; + $cplex .= " + ". sprintf("%-10s","${mv}_$ci:")." ". + join(" + ", map { +#print " PART MAX $_->{Var} $_->{Flow}{Ix} "; + $f2val->($_->{Flow}) .' '. $_->{Var}; + } @rel_subflows). + " <= $max"; + }; + + $applylimit->('mass', $max_mass, sub { $_[0]{'unitmass'} *1e-3 }); + $applylimit->('volume', $max_volume, sub { $_[0]{'unitvolume'}*1e-3 }); + $applylimit->('capital',$max_capital,sub { $_[0]{'org_price'} }); + $cplex.= "\n"; } $cplex.= " Bounds ".(join " - ", map { "$_->{Var} >= 0" } @flows)." + ", map { "$_->{Var} >= 0" } @subflows)." + +"; + +$cplex.= " +Integer + ".(join " + ", map { $_->{Var} } @subflows)." End "; @@ -411,37 +510,66 @@ if ($qa->{'debug'}) { print "
\n" if $qa->{'debug'}; my $found_section= 0; my $glpsol_out= ''; + my $continuation=''; 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; + if (m/^\s*No\.\s+(Row|Column) name\s+(?:St\s+)?Activity\s/) { + die "$_ $found_section ?" if $found_section>0; $found_section= 1; next; } next unless $found_section==1; - next if m/^[- ]+$/; - if (!/\S/) { - $found_section= 2; - next; + if (!length $continuation) { + next if !$continuation && m/^[- ]+$/; + if (!/\S/) { + $found_section= 0; + next; + } + if (m/^ \s* \d+ \s+ \w+ $/x) { + $continuation= $&; + next; + } + } + $_= $continuation.$_; + $continuation= ''; + my ($varname, $qty) = m/^ + \s* \d+ \s+ + (\w+) \s+ (?: [A-Z*]+ \s+ )? + ([0-9.]+) \s + /x or die "$_ ?"; + if ($varname =~ m/^f(\d+)s(\d+)$/) { + my ($ix,$orgix) = ($1,$2); + my $flow= $flows[$ix] or die; + my @relsubflow= grep { $_->{Org} == $orgix } + @{ $flow->{Subflows} }; + die "$ix $orgix @relsubflow" unless @relsubflow == 1; + my $sf= $relsubflow[0]; + $sf->{OptQty}= $qty; + $sf->{OptProfit}= $qty * $flow->{'unitprofit'}; + $sf->{OptCapital}= $qty * $flow->{'org_price'}; + } elsif ($varname =~ m/^(mass|volume)_(\d+)$/) { + my ($mv,$ix) = ($1,$2); + $sail_total[$ix]{$mv}= $qty; } - my ($ix, $qty) = - m/^\s*\d+\s+f(\d+)\s+\S+\s+(\d+)\s/ or die "$_ ?"; - my $flow= $flows[$ix] or die; - $flow->{OptQty}= $qty; - $flow->{OptProfit}= $flow->{'unitprofit'} * $qty; - $flow->{OptCapital}= $flow->{OptQty} * $flow->{'org_price'}; } print "\n" if $qa->{'debug'}; my $prerr= "\n=====\n$cplex\n=====\n$glpsol_out\n=====\n "; pipethrough_run_finish($output,$prerr); - die $prerr unless $found_section; + map { defined $_->{OptQty} or die "$prerr $_->{Flow}{Ix}" } @subflows; }; -$addcols->({ DoReverse => 1 }, qw( +$addcols->({ DoReverse => 1, TotalSubflows => 1, Special => sub { + my ($flow,$col,$v,$spec) = @_; + if ($flow->{ExpectedUnitProfit} < 0) { + $spec->{Span}= 3; + $spec->{String}= '(Small margin)'; + $spec->{Align}= 'align=center'; + } +} }, qw( OptQty )); -$addcols->({ Total => 0, DoReverse => 1 }, qw( +$addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw( OptCapital OptProfit )); @@ -462,6 +590,7 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
+
% $iquery->execute($islandids[$i]);
% my ($islandname) = $iquery->fetchrow_array();
% if (!$i) {
-Start at <% $islandname |h %>
+Start at <% $islandname |h %>
% } else {
-Sail to <% $islandname |h %>
+% my $this_dist= $distance->($islandids[$i-1],$islandids[$i]);
+% $total_dist += $this_dist;
+<%perl>
+ my $total_value= 0;
+ foreach my $sf (@subflows) {
+ next unless $sf->{Org} < $i && $sf->{Dst} >= $i;
+ $total_value +=
+ $sf->{OptQty} * $sf->{Flow}{'dst_price'};
+ }
+%perl>
+Sail to <% $islandname |h %>
+- <% $this_dist |h %> leagues,
+ <% $total_value %>poe at risk
+ |
% }
-
<%perl>
my $age_reported= 0;
my %flowlists;
+ #print "" if $qa->{'debug'};
foreach my $od (qw(org dst)) {
- foreach my $f (@flows) {
+ #print " [[ i $i od $od " if $qa->{'debug'};
+ foreach my $sf (@subflows) {
+ my $f= $sf->{Flow};
next if $f->{Suppress};
- next unless $f->{"${od}_id"} == $islandids[$i];
- next unless $f->{OptQty};
+ next unless $sf->{ucfirst $od} == $i;
+ #print " FLOW $f->{Ix} SUB #$sf->{Org}..$sf->{Dst} "
+ # if $qa->{'debug'};
+ next unless $sf->{OptQty};
+ my $arbitrage= $f->{'org_id'} == $f->{'dst_id'};
+ die if $arbitrage and $sf->{Org} != $sf->{Dst};
my $price= $f->{"${od}_price"};
my $stallname= $f->{"${od}_stallname"};
my $todo= \$flowlists{$od}{
@@ -591,31 +757,54 @@ Sail to <% $islandname |h %>
$$todo->{'stallname'}= $stallname;
$$todo->{Price}= $price;
$$todo->{Timestamp}= $f->{"${od}_timestamp"};
- $$todo->{Qty} += $f->{OptQty};
+ $$todo->{Qty} += $sf->{OptQty};
$$todo->{Total}= $$todo->{Price} * $$todo->{Qty};
$$todo->{Stalls}= $f->{"${od}Stalls"};
- if ($f->{'org_id'} == $f->{'dst_id'}) {
- $$todo->{"${od}Arbitrage"}= 1;
- }
+ $$todo->{"${od}Arbitrage"}= 1 if $arbitrage;
}
+ #print "]] " if $qa->{'debug'};
}
+ #print " |
+ | <% $xinfo %>
+ | <% $totaldesc %>
+ | <% $totalwas |h %> total
+<%perl>
+ $total_to_show= undef;
+ };
+%perl>
+% 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;
+% $show_total_now->('');
% if (!$age_reported++) {
% my $age= $now - $t->{Timestamp};
% my $cellid= "da_${i}";
% $da_ages{$cellid}= $age;
- | \
+ | \
(Data age: <% prettyprint_age($age) %>)
% } elsif (!defined $total) {
% $total= 0;
@@ -647,29 +836,33 @@ Sail to <% $islandname |h %>
% $dline ^= 1;
% }
% };
-% my $show_total= sub {
-% my ($totaldesc, $sign)= @_;
-% if (defined $total) {
- |
- | <% $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);
-
+ my $totals= '';
+ if ($i < $#islandids) {
+ $totals .= "In hold $sail_total[$i]{mass}kg,".
+ " $sail_total[$i]{volume} l";
+ my $delim= '; spare ';
+ my $domv= sub {
+ my ($max, $got, $units) = @_;
+ return unless defined $max;
+ $totals .= $delim;
+ $totals .= sprintf "%g %s", ($max-$got), $units;
+ $delim= ', ';
+ };
+ $domv->($max_mass, $sail_total[$i]{mass}, 'kg');
+ $domv->($max_volume, $sail_total[$i]{volume}, 'l');
+ $totals .= ".\n";
+ }
+ $show_total_now->($totals);
}
%perl>
|
+ | Total distance: <% $total_dist %> leagues.
| Overall net cash flow
| <%
$total_total < 0 ? -$total_total." loss" : $total_total." gain"
| |