From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Wed, 21 Oct 2009 23:10:33 +0000 (+0100)
Subject: Notice if $expected_total_profit parsing failed; don't break if it is an integer
X-Git-Tag: 5.0^2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=53b0011bf5dd8b8b0686848ba5e0a384de1b9326

Notice if $expected_total_profit parsing failed; don't break if it is an integer
---

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 {