From cc2ce44140ef6f53327783979d2d52cfb107aaf3 Mon Sep 17 00:00:00 2001 From: Simon Detheridge Date: Wed, 21 Jan 2015 10:51:26 +0000 Subject: [PATCH] Don't prematurely terminate if doCross1 is not specified --- Source/EmberGenome/EmberGenome.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Source/EmberGenome/EmberGenome.cpp b/Source/EmberGenome/EmberGenome.cpp index 8bf5e36..68c2377 100644 --- a/Source/EmberGenome/EmberGenome.cpp +++ b/Source/EmberGenome/EmberGenome.cpp @@ -273,14 +273,17 @@ bool EmberGenome(EmberOptions& opt) else return false; - if (doCross1 && ParseEmberFile(parser, opt.Cross1(), embers2)) + if (doCross1) { - if (opt.SubBatchSize() != DEFAULT_SBS) - for (i = 0; i < embers2.size(); i++) - embers2[i].m_SubBatchSize = opt.SubBatchSize(); + if (ParseEmberFile(parser, opt.Cross1(), embers2)) + { + if (opt.SubBatchSize() != DEFAULT_SBS) + for (i = 0; i < embers2.size(); i++) + embers2[i].m_SubBatchSize = opt.SubBatchSize(); + } + else + return false; } - else - return false; if (opt.CloneAll() != "") {