X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=03ef3e1e8dc4ab99bfc8b29cfc8b69750268845c;hp=68c727cdbd1aec41407534e2c1047e5b1d95b14b;hb=ea09579bdbec295cfe7735a262e06055a1f69835;hpb=4a64ff96caa3eddb15ed84e09b6b5c8b7d614fc8
diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 68c727c..03ef3e1 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -39,6 +39,8 @@ $dbh
@archipelagoes
$qa
$routeparams
+$reset_suppressions
+$quri
<& query_age:pageload &>
@@ -47,6 +49,9 @@ $routeparams
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;
@@ -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
@@ -261,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 @sail_total;
+<%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'}
@@ -283,22 +309,6 @@ foreach my $f (@flows) {
$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_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;
- }
-
$f->{MarginSortKey}= sprintf "%d",
$f->{'dst_price'} * 10000 / $f->{'org_price'};
$f->{Margin}= sprintf "%3.1f%%",
@@ -310,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,
@@ -372,22 +384,59 @@ foreach my $f (@flows) {
$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;
+ }
+ }
}
-% my $optimise= $specific;
-% if (!$optimise) {
+% my $optimise= 1;
+% my $opt_how;
-
% 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 (!$optimise) {
+
+
Therefore, optimal voyage trade plan not calculated.
% } else { # ========== OPTMISATION ==========
@@ -399,11 +448,17 @@ Maximize
totalprofit:
";
+my %stall_poe_limits;
+
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};
+ if ($qa->{ShowStalls}>=2) {
+ my $stall= $sf->{Flow}{'dst_stallid'};
+ push @{ $stall_poe_limits{$stall} }, $sf;
+ }
}
$cplex .= "
@@ -412,13 +467,7 @@ Subject To
my %avail_lims;
foreach my $flow (@flows) {
- if ($flow->{Suppress}) {
- foreach my $sf (@{ $flow->{Subflows} }) {
- $cplex .= "
- $sf->{Var} = 0";
- }
- next;
- }
+ next if $flow->{Suppress};
foreach my $od (qw(org dst)) {
my $limname= join '_', (
$od,
@@ -457,7 +506,7 @@ foreach my $ci (0..($#islandids-1)) {
}
#print " RELEVANT $ci COUNT ".scalar(@rel_subflows)." ";
if (!@rel_subflows) {
- foreach my $mv (qw(mass volume)) {
+ foreach my $mv (qw(mass volume capital)) {
$sail_total[$ci]{$mv}= 0;
}
next;
@@ -480,6 +529,32 @@ foreach my $ci (0..($#islandids-1)) {
$applylimit->('mass', sub { $_[0]{'unitmass'} *1e-3 });
$applylimit->('volume', sub { $_[0]{'unitvolume'}*1e-3 });
$applylimit->('capital', sub { $_[0]{'org_price'} });
+
+ my @gem_subflows= grep { $_->{Flow}{flags} =~ m/g/ } @rel_subflows;
+ if (@gem_subflows) {
+ $cplex .= "
+ ". sprintf("%-10s","gems_$ci:")." ".
+ join(" + ", map { $_->{Var} } @gem_subflows). " <= $max_gems";
+ }
+
+ $cplex.= "\n";
+}
+
+if ($qa->{ShowStalls}>=2) {
+ my $stallpoe= $dbh->prepare(< $b } keys %stall_poe_limits) {
+ $stallpoe->execute($stallid);
+ my ($lim)= $stallpoe->fetchrow_array();
+ $stallpoe->finish();
+ $cplex.= "
+ ". sprintf("%-15s","poe_$stallid:")." ".
+ join(" + ", map {
+ sprintf "%d %s", $_->{Flow}{'dst_price'}, $_->{Var};
+ } @{ $stall_poe_limits{$stallid} }).
+ " <= $lim";
+ }
$cplex.= "\n";
}
@@ -506,16 +581,23 @@ if ($qa->{'debug'}) {
<%perl>
}
-{
+my $try_solve= sub {
+ my ($how, @opts) = @_;
my $input= pipethrough_prep();
print $input $cplex or die $!;
my $output= pipethrough_run_along($input, undef, 'glpsol',
- qw(glpsol --tmlim 2 --memlim 5 --intopt --cuts --bfs
- --cpxlp /dev/stdin -o /dev/stdout));
- print "\n" if $qa->{'debug'};
+ qw(glpsol --tmlim 5 --memlim 20), @opts,
+ qw( --cpxlp /dev/stdin -o /dev/stdout));
+ if ($qa->{'debug'}) {
+ print "@opts
\n\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'};
@@ -524,7 +606,15 @@ if ($qa->{'debug'}) {
$found_section= 1;
next;
}
- if (m/^Objective:\s+totalprofit = (\d+\.\d*) /) {
+ 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;
@@ -544,8 +634,8 @@ if ($qa->{'debug'}) {
my ($varname, $qty) = m/^
\s* \d+ \s+
(\w+) \s+ (?: [A-Z*]+ \s+ )?
- ([0-9.]+) \s
- /x or die "$_ ?";
+ ([-+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;
@@ -556,7 +646,7 @@ if ($qa->{'debug'}) {
$sf->{OptQty}= $qty;
$sf->{OptProfit}= $qty * $flow->{'unitprofit'};
$sf->{OptCapital}= $qty * $flow->{'org_price'};
- } elsif ($varname =~ m/^(mass|volume)_(\d+)$/) {
+ } elsif ($varname =~ m/^(mass|volume|capital)_(\d+)$/) {
my ($mv,$ix) = ($1,$2);
$sail_total[$ix]{$mv}= $qty;
}
@@ -565,8 +655,29 @@ 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 $_->{Flow}{Ix}" } @subflows;
+ defined $expected_total_profit or die "$prerr ?";
+ return 0 unless $somemip || !$timelimit;
+ $opt_how= $how;
+ return 1;
};
+unless ($try_solve->('Optimisation successful',
+ qw( --intopt --cuts --bfs )) or
+ $try_solve->('Complex problem, downgraded'.
+ ' to rounded-down LP.',
+ qw( --nomip ))) {
+
+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) {
@@ -589,9 +700,9 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
Contents
% } else {
@@ -613,55 +724,64 @@ Generated by YARRG at <%
% }
% if ($optimise) { # ========== TRADING PLAN ==========
-%
-% my $iquery= $dbh->prepare('SELECT islandname FROM islands
-% WHERE islandid = ?');
-% my %da_ages;
-% my $total_total= 0;
-% my $total_dist= 0;
-%
-
-
- >
-% my $tbody= sub {
-% if (!printable($m)) { return ''; }
-%# return "
";
-% my ($c)= qw(40 00)[$_[0]];
-% return " |
| ";
-% };
-%
-% foreach my $i (0..$#islandids) {
-<% $tbody->(1) %>
- |
-% $iquery->execute($islandids[$i]);
-% my ($islandname) = $iquery->fetchrow_array();
-% if (!$i) {
-Start at <% $islandname |h %>
-% } else {
-% my $this_dist= $distance->($islandids[$i-1],$islandids[$i]);
-% $total_dist += $this_dist;
<%perl>
+my $iquery= $dbh->prepare('SELECT islandname FROM islands
+ WHERE islandid = ?');
+my %da_ages;
+my $total_total= 0;
+my $total_dist= 0;
+my @oldest= (-1, 'nowhere');
+my $plan_html= '';
+
+my $plan_table_info= printable($m) ? 'width=100%' : '';
+$plan_html .= <
+END
+
+my $tbody= sub {
+ if (!printable($m)) { return ''; }
+ my ($c)= qw(40 00)[$_[0]];
+ return "| ";
+};
+
+foreach my $i (0..$#islandids) {
+ $plan_html .= $tbody->(1);
+ $plan_html .= " | \n";
+ $iquery->execute($islandids[$i]);
+ my ($islandnamepr)= encode_entities( $iquery->fetchrow_array() );
+
+ if (!$i) {
+ $plan_html .= <
+Start at $islandnamepr
+| [what are these codes?]
+ |
+END
+ } else {
+ my $this_dist= $distance->($islandids[$i-1],$islandids[$i]);
+ $total_dist += $this_dist;
+ $plan_html .= <
+END
my $total_value= 0;
foreach my $sf (@subflows) {
next unless $sf->{Org} < $i && $sf->{Dst} >= $i;
$total_value +=
$sf->{OptQty} * $sf->{Flow}{'dst_price'};
}
-
-Sail to <% $islandname |h %>
-- <% $this_dist |h %> leagues,
- <% $total_value %>poe at risk
+ $plan_html .= <Sail to $islandnamepr
+- $this_dist leagues, $total_value poe at risk
|
-% }
-<%perl>
+END
+ }
my $age_reported= 0;
my %flowlists;
- #print "| " if $qa->{'debug'};
+ #print " | | " if $qa->{'debug'};
foreach my $od (qw(org dst)) {
#print " [[ i $i od $od " if $qa->{'debug'};
foreach my $sf (@subflows) {
my $f= $sf->{Flow};
- next if $f->{Suppress};
next unless $sf->{ucfirst $od} == $i;
#print " FLOW $f->{Ix} SUB #$sf->{Org}..$sf->{Dst} "
# if $qa->{'debug'};
@@ -671,6 +791,7 @@ Generated by YARRG at <%
my $price= $f->{"${od}_price"};
my $stallname= $f->{"${od}_stallname"};
my $todo= \$flowlists{$od}{
+ (sprintf "%010d", $f->{'ordval'}),
$f->{'commodname'},
(sprintf "%07d", ($od eq 'dst' ?
9999999-$price : $price)),
@@ -681,7 +802,35 @@ Generated by YARRG at <%
orgArbitrage => 0,
dstArbitrage => 0,
} unless $$todo;
+ $$todo->{'commodid'}= $f->{'commodid'};
$$todo->{'commodname'}= $f->{'commodname'};
+ $$todo->{'posinclass'}= '';
+ my $incl= $f->{'posinclass'};
+
+ my $findclass= $dbh->prepare(<execute($f->{'commodclassid'});
+ my $classinfo= $findclass->fetchrow_hashref();
+ if ($classinfo) {
+ my $clname= $classinfo->{'commodclass'};
+ my $desc= encode_entities(sprintf "%s is under %s",
+ $f->{'commodname'}, $clname);
+ my $abbrev= substr($clname,0,1);
+ if ($incl) {
+ my $maxpic= $classinfo->{'maxposinclass'};
+ $desc.= (sprintf ", commodity %d of %d",
+ $incl, $maxpic);
+ if ($classinfo->{'maxposinclass'} >= 8) {
+ my @tmbs= qw(0 1 2 3 4 5 6 7 8 9);
+ my $tmbi= ($incl+0.5)*$#tmbs/$maxpic;
+ $abbrev.= " ".$tmbs[$tmbi]." ";
+ }
+ }
+ $$todo->{'posinclass'}=
+ " "
+ .$abbrev." ";
+ }
$$todo->{'stallname'}= $stallname;
$$todo->{Price}= $price;
$$todo->{Timestamp}= $f->{"${od}_timestamp"};
@@ -710,61 +859,72 @@ Generated by YARRG at <%
my ($xinfo) = @_;
return unless defined $total_to_show;
my ($totaldesc,$totalwas) = @$total_to_show;
-
+ $plan_html .= <
- | <% $xinfo %>
- | <% $totaldesc %>
- | <% $totalwas |h %> total
-<%perl>
+ | $xinfo
+ | $totaldesc
+ | $totalwas total
+END
$total_to_show= undef;
};
-
-% 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;
-<% $tbody->(0) %>
-% }
-% $total += $t->{Total};
-% my $span= 0 + keys %{ $t->{Stalls} };
-% my $td= "td rowspan=$span";
-% tr_datarow($m,$dline);
-<<% $td %>><% $collectdeliver %>
-<<% $td %>><% $t->{'commodname'} |h %>
-%
-% my @stalls= sort keys %{ $t->{Stalls} };
-% my $pstall= sub {
-% my $name= $stalls[$_[0]];
- | <% $name |h %>
-% };
-%
-% $pstall->(0);
-<<% $td %> align=right><% $t->{Price} |h %> poe ea.
-<<% $td %> align=right><% $t->{Qty} |h %> unit(s)
-<<% $td %> align=right><% $t->{Total} |h %> total
-%
-% foreach my $stallix (1..$#stalls) {
-% tr_datarow($m,$dline);
-% $pstall->($stallix);
-% }
-%
-% $dline ^= 1;
-% }
-% };
-<%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};
+ @oldest= ($age,$islandnamepr) if $oldest[0] < $age;
+ my $cellid= "da_${i}";
+ my $agepr= prettyprint_age($age);
+ $da_ages{$cellid}= $age;
+ $plan_html .= <(Data age: $agepr)
+END
+ } elsif (!defined $total) {
+ $total= 0;
+ $plan_html .= $tbody->(0);
+ }
+ $total += $t->{Total};
+ my $span= 0 + keys %{ $t->{Stalls} };
+ my $td= "td rowspan=$span";
+ my %linkqf= (%{ $qa->{'baseqf'} }, %{ $qa->{'queryqf'} });
+ $linkqf{'query'}= 'commod';
+ $linkqf{'commodstring'}= $t->{'commodname'};
+ $linkqf{'commodid'}= $t->{'commodid'};
+ my $linkqfpr= encode_entities( $quri->(%linkqf) );
+ my $commodnamepr= encode_entities($t->{'commodname'});
+ $plan_html .= tr_datarow_s($m,$dline) . <$collectdeliver
+<$td>$commodnamepr
+<$td>$t->{'posinclass'}
+END
+ my @stalls= sort keys %{ $t->{Stalls} };
+ my $pstall= sub {
+ my $namepr= encode_entities( $stalls[$_[0]] );
+ $plan_html .= <$namepr
+END
+ };
+
+ $pstall->(0);
+ $plan_html .= <$t->{Price} poe ea.
+<$td align=right>$t->{Qty} unit(s)
+<$td align=right>$t->{Total} total
+END
+ foreach my $stallix (1..$#stalls) {
+ $plan_html .= tr_datarow_s($m,$dline);
+ $pstall->($stallix);
+ }
+
+ $dline ^= 1;
+ }
+ };
$show_flows->('dst',0,'Deliver'); $show_total->('Proceeds',1);
$show_flows->('org',1,'Collect'); $show_total->('(Arbitrage) outlay',-1);
@@ -788,23 +948,65 @@ Generated by YARRG at <%
}
$show_total_now->($totals);
}
-
-<% $tbody->(1) %>
-Total distance: <% $total_dist %> leagues.
+
+my $cashflowpr= $total_total < 0
+ ? -$total_total." loss"
+ : $total_total." gain";
+
+my $max_capital= 0;
+foreach my $cap (map { $_->{capital} } @sail_total) {
+ $max_capital= $cap if $cap > $max_capital;
+}
+
+$da_ages{'oldest'}= $oldest[0];
+
+$plan_html .= $tbody->(1) . <
+| Total distance: $total_dist leagues.
| Overall net cash flow
- | <%
- $total_total < 0 ? -$total_total." loss" : $total_total." gain"
- %>
+ | $cashflowpr
| | | | |
+END
+
+
+% if (!printable($m)) {
+
+% }
+
+
+
+ | Distance:
+ | <% $total_dist %> leagues,
+ <% scalar(@islandids) %> island(s)
+ |
+ | Planned net cash flow:
+ | <% $cashflowpr %>
+ |
+ | Expected profit on average: approx.
+ |
+ <% sprintf "%d", $expected_total_profit %> poe
+ (considering expected losses, but ignoring rum consumed)
+ |
+ | Capital required:
+ |
+ <% $max_capital %> poe or less
+ |
+ | Oldest market data used:
+ | <% prettyprint_age($oldest[0]) %>
+ (<% $oldest[1] %>)
+ |
+ | <% $opt_how %>
+ |
+
+
+
+<% $plan_html %>
<& query_age:dataages, id2age => \%da_ages &>
-Expected average profit:
- approx. <% sprintf "%d", $expected_total_profit %> poe
- (considering expected losses, but ignoring rum consumed)
%
% } # ========== TRADING PLAN ==========
% if (!printable($m)) {
-
+
<%perl>
my $sth_i= $dbh->prepare(<
% my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : '';
% my $cdstall= $qa->{ShowStalls} ? 'Stall | ' : '';
-