chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
routetrade: WIP fix unticked trades
[ypp-sc-tools.main.git]
/
yarrg
/
web
/
routetrade
diff --git
a/yarrg/web/routetrade
b/yarrg/web/routetrade
index c6ed408d80fe9d779e54de724856c6abf02ab673..5dc5e774a40f8c839a26ef28c75d8c6b9bc7b31a 100644
(file)
--- a/
yarrg/web/routetrade
+++ b/
yarrg/web/routetrade
@@
-261,6
+261,15
@@
foreach my $v (qw(MaxMass MaxVolume)) {
<& dumptable:end, qa => $qa &>
% }
<& 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;
<%perl>
my @sail_total;
@@
-415,7
+424,7
@@
foreach my $flow (@flows) {
if ($flow->{Suppress}) {
foreach my $sf (@{ $flow->{Subflows} }) {
$cplex .= "
if ($flow->{Suppress}) {
foreach my $sf (@{ $flow->{Subflows} }) {
$cplex .= "
- $sf->{Var} = 0";
+ $sf->{Var} = 0
\n
";
}
next;
}
}
next;
}
@@
-524,7
+533,7
@@
if ($qa->{'debug'}) {
$found_section= 1;
next;
}
$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;
$expected_total_profit= $1;
}
next unless $found_section==1;
@@
-545,7
+554,7
@@
if ($qa->{'debug'}) {
\s* \d+ \s+
(\w+) \s+ (?: [A-Z*]+ \s+ )?
([0-9.]+) \s
\s* \d+ \s+
(\w+) \s+ (?: [A-Z*]+ \s+ )?
([0-9.]+) \s
- /x or die "$_ ?";
+ /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;
if ($varname =~ m/^f(\d+)s(\d+)_/) {
my ($ix,$orgix) = ($1,$2);
my $flow= $flows[$ix] or die;
@@
-565,6
+574,7
@@
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;
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 {
};
$addcols->({ DoReverse => 1, TotalSubflows => 1, Special => sub {
@@
-585,17
+595,32
@@
$addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
% } # ========== OPTIMISATION ==========
% } # ========== OPTIMISATION ==========
+% if (!printable($m)) {
<h2>Contents</h2>
<ul>
% if ($optimise) {
<li><a href="#plan">Voyage trading plan</a>
<ul>
<li><a href="#summary">Summary statistics</a>
<h2>Contents</h2>
<ul>
% if ($optimise) {
<li><a href="#plan">Voyage trading plan</a>
<ul>
<li><a href="#summary">Summary statistics</a>
+ <li>Printable:
+ <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>
</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 ==========
%
% if ($optimise) { # ========== TRADING PLAN ==========
%
@@
-607,9
+632,16
@@
$addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
%
<h2><a name="plan">Voyage trading plan</a></h2>
%
<h2><a name="plan">Voyage trading plan</a></h2>
-<table rules=groups>
+<table 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) {
% foreach my $i (0..$#islandids) {
-<
tbody
>
+<
% $tbody->(1) %
>
<tr><td colspan=4>
% $iquery->execute($islandids[$i]);
% my ($islandname) = $iquery->fetchrow_array();
<tr><td colspan=4>
% $iquery->execute($islandids[$i]);
% my ($islandname) = $iquery->fetchrow_array();
@@
-714,12
+746,12
@@
$addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
(Data age: <span id="<% $cellid %>"><% prettyprint_age($age) %></span>)
% } elsif (!defined $total) {
% $total= 0;
(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";
% }
% $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 %>><% $collectdeliver %>
<<% $td %>><% $t->{'commodname'} |h %>
%
@@
-735,7
+767,7
@@
$addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
<<% $td %> align=right><% $t->{Total} |h %> total
%
% foreach my $stallix (1..$#stalls) {
<<% $td %> align=right><% $t->{Total} |h %> total
%
% foreach my $stallix (1..$#stalls) {
-<tr class="datarow<% $dline %>">
+% tr_datarow($m,$dline);
% $pstall->($stallix);
% }
%
% $pstall->($stallix);
% }
%
@@
-767,7
+799,7
@@
$addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
$show_total_now->($totals);
}
</%perl><a name="summary"></a>
$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><%
<td colspan=2>Total distance: <% $total_dist %> leagues.
<td colspan=3 align=right>Overall net cash flow
<td align=right><strong><%
@@
-781,7
+813,7
@@
Expected average profit:
%
% } # ========== TRADING PLAN ==========
%
% } # ========== TRADING PLAN ==========
-% {
+%
if (!printable($m))
{
<h2><a name="dataage">Data age summary</a></h2>
<%perl>
my $sth_i= $dbh->prepare(<<END);
<h2><a name="dataage">Data age summary</a></h2>
<%perl>
my $sth_i= $dbh->prepare(<<END);
@@
-827,8
+859,9
@@
Islands shown in reverse order of visits.<br>
</&>
% }
</&>
% }
-% my %ts_sortkeys;
-% {
+% if (!printable($m)) {
+% my %ts_sortkeys;
+% {
% my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : '';
% my $cdstall= $qa->{ShowStalls} ? '<th>Stall</th>' : '';
<h2><a name="trades">Relevant trades</a></h2>
% my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : '';
% my $cdstall= $qa->{ShowStalls} ? '<th>Stall</th>' : '';
<h2><a name="trades">Relevant trades</a></h2>
@@
-882,14
+915,14
@@
Islands shown in reverse order of visits.<br>
<th>Capital
<th>Profit
% }
<th>Capital
<th>Profit
% }
-% }
+%
}
<tr id="trades_sort">
<tr id="trades_sort">
-% foreach my $col (@cols) {
+%
foreach my $col (@cols) {
<th>
<th>
-% }
+%
}
-% foreach my $flowix (0..$#flows) {
+%
foreach my $flowix (0..$#flows) {
% my $flow= $flows[$flowix];
% my $rowid= "id_row_$flow->{UidShort}";
<tr id="<% $rowid %>" class="datarow<% $flowix & 1 %>">
% my $flow= $flows[$flowix];
% my $rowid= "id_row_$flow->{UidShort}";
<tr id="<% $rowid %>" class="datarow<% $flowix & 1 %>">
@@
-923,17
+956,17
@@
Islands shown in reverse order of visits.<br>
%>><% exists $spec->{String} ? $spec->{String} : $v |h %>
% $ci += $spec->{Span};
% }
%>><% exists $spec->{String} ? $spec->{String} : $v |h %>
% $ci += $spec->{Span};
% }
-% }
+%
}
<tr id="trades_total">
<th>
<th colspan=2>Total
<tr id="trades_total">
<th>
<th colspan=2>Total
-% foreach my $ci (3..$#cols) {
+%
foreach my $ci (3..$#cols) {
% my $col= $cols[$ci];
<td align=right>
% if (defined $col->{Total}) {
<% $col->{Total} |h %>
% }
% my $col= $cols[$ci];
<td align=right>
% if (defined $col->{Total}) {
<% $col->{Total} |h %>
% }
-% }
+%
}
</table>
<&| tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow',
</table>
<&| tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow',
@@
-943,6
+976,8
@@
Islands shown in reverse order of visits.<br>
<input type=submit name=update value="Update">
<input type=submit name=update value="Update">
+% } # !printable
+
<%init>
use CommodsWeb;
use Commods;
<%init>
use CommodsWeb;
use Commods;