chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Notice if $expected_total_profit parsing failed; don't break if it is an integer
[ypp-sc-tools.db-test.git]
/
yarrg
/
web
/
routetrade
diff --git
a/yarrg/web/routetrade
b/yarrg/web/routetrade
index 68c727cdbd1aec41407534e2c1047e5b1d95b14b..c7dd03e5d0166e63c4054ed3561450e8824ffff1 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;
@@
-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;
@@
-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 {