X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=b2bbf2e04da0386c20464edcd83a4916dbf8e419;hp=0da1fd80a81929454605e46df2064d56d26d3083;hb=55776234257e165e887a1695d92cd569a63a13e7;hpb=555b3391b3cd9967a29b219fff242b583137d2b8
diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 0da1fd8..b2bbf2e 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -38,23 +38,27 @@ $dbh
@islandids
@archipelagoes
$qa
-$max_mass
-$max_volume
-$lossperleaguepct
+$routeparams
+$reset_suppressions
+$quri
%args>
-<&| script &>
- da_pageload= Date.now();
-&script>
+<& query_age:pageload &>
<%perl>
-my $loss_per_league= defined $lossperleaguepct ? $lossperleaguepct*0.01 : 1e-7;
+my $loss_per_league= defined $routeparams->{LossPerLeaguePct}
+ ? $routeparams->{LossPerLeaguePct}*0.01 : 1e-7;
+my $loss_per_delay_slot= 1e-8;
+my $max_gems= 24;
+
+my $minprofit= $routeparams->{MinProfit} || 0;
my $now= time;
my @flow_conds;
my @query_params;
my %dists;
+my $expected_total_profit;
my $sd_condition= sub {
my ($bs, $ix) = @_;
@@ -67,42 +71,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 %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 ($src_i..$#islandids) {
+ foreach my $dst_i ($org_i..$#islandids) {
my $dst_isle= $islandids[$dst_i];
- my $dst_cond= $sd_condition->('buy',$dst_i);
- if ($dst_i==$src_i and !defined $src_isle) {
+ # Don't ever consider sailing things round the houses:
+ next if defined $dst_isle and
+ grep { $dst_isle == $_ } @islandids[$org_i..$dst_i-1];
+ next if defined $org_isle and
+ grep { $org_isle == $_ } @islandids[$org_i+1..$dst_i];
+ my $dst_cond;
+ 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)";
+ $dst_cond= "sell.islandid = buy.islandid";
+ } else {
+ $dst_cond= $sd_condition->('buy',$dst_i);
}
push @dst_conds, $dst_cond;
- if ($specific && !$confusing &&
- # With a circular route, do not carry goods round the loop
- !(($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 ];
- }
+ if ($specific) {
+ push @{ $ipair2subflowinfs{$org_isle,$dst_isle} },
+ [ $org_i, $dst_i ];
}
}
- push @flow_conds, "$src_cond AND (
+ push @flow_conds, "$org_cond AND (
".join("
OR ",@dst_conds)."
)";
@@ -140,6 +145,10 @@ my $stmt= "
commods.commodid commodid,
commods.unitmass unitmass,
commods.unitvolume unitvolume,
+ commods.ordval ordval,
+ commods.posinclass posinclass,
+ commods.commodclassid commodclassid,
+ commods.flags flags,
dist dist,
buy.price - sell.price unitprofit
FROM commods
@@ -241,7 +250,6 @@ foreach my $v (qw(MaxMass MaxVolume)) {
$f= {
Ix => scalar(@flows),
- Var => "f".@flows,
%$got
};
$f->{"org_stallid"}= $f->{"dst_stallid"}= 'all'
@@ -262,15 +270,32 @@ foreach my $v (qw(MaxMass MaxVolume)) {
<& dumptable:end, qa => $qa &>
% }
-<%perl>
+% if (@islandids==1) {
+% if (defined $islandids[0]) {
+Searched for arbitrage trades only.
+% } else {
+Searched for arbitrage trades only, in <% $archipelagoes[0] |h %>
+[?].
+% }
+% }
-my @total_massvol;
+<%perl>
if (!@flows) {
print 'No profitable trading opportunities were found.';
return;
}
+my @sail_total;
+my %opportunity_value;
+
+my $oppo_key= sub {
+ my ($f) = @_;
+ return join '_', map { $f->{$_} } qw(org_id dst_id commodid);
+};
+
+my $any_previous_suppression= 0;
+
foreach my $f (@flows) {
$f->{MaxQty}= $f->{'org_qty_agg'} < $f->{'dst_qty_agg'}
@@ -295,6 +320,8 @@ foreach my $f (@flows) {
$dists{'org_id'}{'dst_id'}= $f->{'dist'};
+ $opportunity_value{ $oppo_key->($f) } += $f->{MaxProfit};
+
my @uid= $f->{commodid};
foreach my $od (qw(org dst)) {
push @uid,
@@ -313,7 +340,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;
@@ -321,8 +348,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;
@@ -357,29 +384,58 @@ die "$cmpu $uue ?" if length $cmpu > 20;
$f->{UidLong} eq $recons_long or
die "$f->{UidLong} = $f->{UidShort} = $recons_long ?";
}
+}
- if (defined $qa->{"R$f->{UidShort}"} &&
- !defined $qa->{"T$f->{UidShort}"}) {
- $f->{Suppress}= 1;
- }
+foreach my $f (@flows) {
+ if ($reset_suppressions || !defined $qa->{"R$f->{UidShort}"}) {
+ if ($opportunity_value{ $oppo_key->($f) } < $minprofit) {
+ $f->{Suppress}= 1;
+ }
+ } else {
+ if (!defined $qa->{"T$f->{UidShort}"}) {
+ $any_previous_suppression= 1;
+ $f->{Suppress}= 1;
+ }
+ }
+ if (!$f->{Suppress}) {
+ 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_c%d_p%d_%d_p%d_%d",
+ $f->{Ix}, $sfi->[0],
+ $f->{'commodid'},
+ $sfi->[0], $f->{'org_price'},
+ $sfi->[1], $f->{'dst_price'}
+ };
+ push @{ $f->{Subflows} }, $subflow;
+ push @subflows, $subflow;
+ }
+ }
}
%perl>
-% my $optimise= $specific && !$confusing && @islandids>1;
-% if (!$optimise) {
+% my $optimise= 1;
-
-% if (@islandids<=1) {
-Route contains only one location.
-% }
% if (!$specific) {
+% $optimise= 0;
Route contains archipelago(es), not just specific islands.
+% } elsif (!@subflows) {
+% $optimise= 0;
+% if ($any_previous_suppression) {
+All available trades deselected.
+% } else {
+No available trades meet the specified minimum trade value, so
+all available trades deselected.
+% }
% }
-% if ($confusing) {
-Route is complex - it visits the same island several times
-and isn't a simple loop.
-% }
+
+% if (!$optimise) {
+
+
\n";
+ }
+ $expected_total_profit= undef;
+ $_->{OptQty}= undef foreach @subflows;
my $found_section= 0;
my $glpsol_out= '';
my $continuation='';
+ my $timelimit= 0;
+ my $somemip= 0;
while (<$output>) {
$glpsol_out.= $_;
print encode_entities($_) if $qa->{'debug'};
@@ -494,6 +605,17 @@ if ($qa->{'debug'}) {
$found_section= 1;
next;
}
+ if ((m/^Integer optimization begins/ .. 0) &&
+ m/^\+ \s* \d+\: \s* mip \s* = \s* \d/) {
+ $somemip= 1;
+ next;
+ }
+ if (m/^TIME LIMIT EXCEEDED/) {
+ $timelimit= 1;
+ }
+ if (m/^Objective:\s+totalprofit = (\d+(?:\.\d*)?) /) {
+ $expected_total_profit= $1;
+ }
next unless $found_section==1;
if (!length $continuation) {
next if !$continuation && m/^[- ]+$/;
@@ -511,31 +633,46 @@ if ($qa->{'debug'}) {
my ($varname, $qty) = m/^
\s* \d+ \s+
(\w+) \s+ (?: [A-Z*]+ \s+ )?
- ([0-9.]+) \s
- /x or die "$_ ?";
- if ($varname =~ m/^f(\d+)$/) {
- my ($ix) = $1;
+ ([-+0-9]+)(?: [.e][-+e0-9.]* )? \s
+ /x or die "$cplex \n==\n $glpsol_out $_ ?";
+ if ($varname =~ m/^f(\d+)s(\d+)_/) {
+ my ($ix,$orgix) = ($1,$2);
my $flow= $flows[$ix] or die;
- $flow->{OptQty}= $qty;
- $flow->{OptProfit}= $flow->{'unitprofit'} * $qty;
- $flow->{OptCapital}= $flow->{OptQty} *
- $flow->{'org_price'};
+ 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);
- $total_massvol[$ix]{$mv}= $qty;
+ $sail_total[$ix]{$mv}= $qty;
}
}
print "
\n" if $qa->{'debug'};
my $prerr= "\n=====\n$cplex\n=====\n$glpsol_out\n=====\n ";
pipethrough_run_finish($output,$prerr);
- map { defined $_->{OptQty} or die "$prerr $_->{Ix}" } @flows;
-# map { defined
-# die $prerr if grep { ! } @flows;
-# map { die
-# die $prerr if map {
+ map { defined $_->{OptQty} or die "$prerr $_->{Flow}{Ix}" } @subflows;
+ defined $expected_total_profit or die "$prerr ?";
+ return $somemip || !$timelimit;
};
-$addcols->({ DoReverse => 1, Special => sub {
+unless ($try_solve->(qw( --intopt --cuts --bfs )) or
+ $try_solve->(qw( --nomip ))) {
+%perl>
+
Optimisation failed
+The linear/mixed-integer optimisation failed.
+Please report this problem.
+
+
+<% $cplex |h %>
+
+<%perl>
+ return;
+}
+
+$addcols->({ DoReverse => 1, TotalSubflows => 1, Special => sub {
my ($flow,$col,$v,$spec) = @_;
if ($flow->{ExpectedUnitProfit} < 0) {
$spec->{Span}= 3;
@@ -545,7 +682,7 @@ $addcols->({ DoReverse => 1, Special => sub {
} }, qw(
OptQty
));
-$addcols->({ Total => 0, DoReverse => 1 }, qw(
+$addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
OptCapital OptProfit
));
@@ -553,113 +690,32 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
% } # ========== OPTIMISATION ==========
-% my %ts_sortkeys;
-% {
-% my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : '';
-% my $cdstall= $qa->{ShowStalls} ? '
Stall
' : '';
-
-
-
-<% $qa->{ShowStalls} ? '
' : '' %>
-
-
-
-
-
-
-% if ($optimise) {
-
-% }
-
-
-
>Collect
-
>Deliver
-
-
Collect
-
Deliver
-
Profit
-
Max
-
-
Max
-% if ($optimise) {
-
Planned
-% }
-
-
-
-
Island <% $cdstall %>
-
Island <% $cdstall %>
-
Commodity
-
Price
-
Qty
-
Price
-
Qty
-
Margin
-
Unit
-
Qty
-
Capital
-
Profit
-
Dist
-
Mass
-
Vol
-% if ($optimise) {
-
Qty
-
Capital
-
Profit
-% }
-% }
-
-
-% foreach my $col (@cols) {
-
-% }
-
-% foreach my $flowix (0..$#flows) {
-% my $flow= $flows[$flowix];
-% my $rowid= "id_row_$flow->{UidShort}";
-
-
{UidShort} %> value="">
- {UidShort} %> value=""
- <% $flow->{Suppress} ? '' : 'checked' %> >
-% my $ci= 1;
-% while ($ci < @cols) {
-% my $col= $cols[$ci];
-% my $spec= {
-% Span => 1,
-% Align => ($col->{Text} ? '' : 'align=right')
-% };
-% my $v= $flow->{$col->{Name}};
-% if ($col->{Special}) { $col->{Special}($flow,$col,$v,$spec); }
-% $col->{Total} += $v
-% if defined $col->{Total} and not $flow->{Suppress};
-% $v='' if !$col->{Text} && !$v;
-% my $sortkey= $col->{SortColKey} ?
-% $flow->{$col->{SortColKey}} : $v;
-% $ts_sortkeys{$ci}{$rowid}= $sortkey;
-