From 53b0011bf5dd8b8b0686848ba5e0a384de1b9326 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 22 Oct 2009 00:10:33 +0100 Subject: [PATCH] Notice if $expected_total_profit parsing failed; don't break if it is an integer --- yarrg/web/routetrade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade index 68f9d27..c7dd03e 100644 --- a/yarrg/web/routetrade +++ b/yarrg/web/routetrade @@ -533,7 +533,7 @@ if ($qa->{'debug'}) { $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; @@ -574,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; + defined $expected_total_profit or die "$prerr ?"; }; $addcols->({ DoReverse => 1, TotalSubflows => 1, Special => sub { -- 2.30.2