<& dumptable:end, qa => $qa &>
% }
+% if (@islandids==1) {
+% if (defined $islandids[0]) {
+Searched for arbitrage trades only.
+% } else {
+Searched for arbitrage trades only, in <% $archipelagoes[0] |h %>
+<a href="docs#arbitrage">[?]</a>.
+% }
+% }
+
<%perl>
my @sail_total;
$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%%",
if (defined $qa->{"R$f->{UidShort}"} &&
!defined $qa->{"T$f->{UidShort}"}) {
$f->{Suppress}= 1;
+ } else {
+ 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>
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 .= "
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,
$cplex.= "\n";
}
+if ($qa->{ShowStalls}>=2) {
+ my $stallpoe= $dbh->prepare(<<END);
+SELECT max(qty*price) FROM buy WHERE stallid=?
+END
+ foreach my $stallid (sort { $a <=> $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";
+}
+
$cplex.= "
Bounds
".(join "
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
+ qw(glpsol --tmlim 5 --memlim 5 --intopt --cuts --bfs
--cpxlp /dev/stdin -o /dev/stdout));
print "<pre>\n" if $qa->{'debug'};
my $found_section= 0;
$found_section= 1;
next;
}
- if (m/^Objective:\s+totalprofit = (\d+\.\d*) /) {
+ if (m/^Objective:\s+totalprofit = (\d+(?:\.\d*)?) /) {
$expected_total_profit= $1;
}
next unless $found_section==1;
my ($varname, $qty) = m/^
\s* \d+ \s+
(\w+) \s+ (?: [A-Z*]+ \s+ )?
- ([0-9.]+) \s
- /x or die "$_ ?";
+ ([+-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;
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 ?";
};
$addcols->({ DoReverse => 1, TotalSubflows => 1, Special => sub {
<input type=submit name=printable_pdf value="PDF">
<input type=submit name=printable_html value="HTML">
<input type=submit name=printable_ps value="PostScript">
+ <input type=submit name=printable_pdf2 value="PDF 2-up">
+ <input type=submit name=printable_ps2 value="PostScript 2-up">
</ul>
% }
<li><a href="#dataage">Data age summary</a>
<li><a href="#trades">Relevant trades</a>
</ul>
+% } else {
+% my @tl= gmtime $now or die $!;
+<p>
+Generated by YARRG at <strong><%
+ sprintf "%04d-%02d-%02d %02d:%02d:%02d UTC",
+ $tl[5]+1900, @tl[4,3,2,1,0]
+ |h %></strong>.
% }
% if ($optimise) { # ========== TRADING PLAN ==========
%
<h2><a name="plan">Voyage trading plan</a></h2>
-<table rules=groups>
+<table class="data" rules=groups <% printable($m) ? 'width=100%' : '' %> >
+% my $tbody= sub {
+% if (!printable($m)) { return '<tbody>'; }
+%# return "<tr><td colspan=7><hr>";
+% my ($c)= qw(40 00)[$_[0]];
+% return "<tr><td bgcolor=\"#${c}${c}${c}\" height=1 colspan=7>";
+% };
+%
% foreach my $i (0..$#islandids) {
-<tbody>
+<% $tbody->(1) %>
<tr><td colspan=4>
% $iquery->execute($islandids[$i]);
% my ($islandname) = $iquery->fetchrow_array();
#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'};
(Data age: <span id="<% $cellid %>"><% prettyprint_age($age) %></span>)
% } elsif (!defined $total) {
% $total= 0;
-<tbody>
+<% $tbody->(0) %>
% }
% $total += $t->{Total};
% my $span= 0 + keys %{ $t->{Stalls} };
% my $td= "td rowspan=$span";
-<tr class="datarow<% $dline %>">
+% tr_datarow($m,$dline);
<<% $td %>><% $collectdeliver %>
<<% $td %>><% $t->{'commodname'} |h %>
%
<<% $td %> align=right><% $t->{Total} |h %> total
%
% foreach my $stallix (1..$#stalls) {
-<tr class="datarow<% $dline %>">
+% tr_datarow($m,$dline);
% $pstall->($stallix);
% }
%
$show_total_now->($totals);
}
</%perl><a name="summary"></a>
-<tbody><tr>
+<% $tbody->(1) %><tr>
<td colspan=2>Total distance: <% $total_dist %> leagues.
<td colspan=3 align=right>Overall net cash flow
<td align=right><strong><%
<&| query_age:agestable, now => $now, fetchrow => $fetchrow &>
Islands shown in reverse order of visits.<br>
</&>
-% } else {
-% my @tl= gmtime $now or die $!;
-<p>
-Generated by YARRG at <strong><%
- sprintf "%04d-%02d-%02d %02d:%02d:%02d UTC",
- $tl[5]+1900, @tl[4,3,2,1,0]
- |h %></strong>.
-%#
% }
% if (!printable($m)) {
% my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : '';
% my $cdstall= $qa->{ShowStalls} ? '<th>Stall</th>' : '';
<h2><a name="trades">Relevant trades</a></h2>
-<table id="trades" rules=groups>
+<table class="data" id="trades" rules=groups>
<colgroup span=1>
<colgroup span=2>
<% $qa->{ShowStalls} ? '<colgroup span=2>' : '' %>
throw => 'trades_sort', tbrow => 'trades_total' &>
ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
</&tabsort>
-
+<p>
<input type=submit name=update value="Update">
% } # !printable
~yarrgweb / ypp-sc-tools.db-test.git / blobdiff