X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=c7dd03e5d0166e63c4054ed3561450e8824ffff1;hb=53b0011bf5dd8b8b0686848ba5e0a384de1b9326;hp=68f9d2703bd4c97ab8d4bd115a01be6ffae1bd9f;hpb=60709393692d3e50630639ad391e4c37dbeca006;p=ypp-sc-tools.db-test.git

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 {