diff options
Diffstat (limited to 'src/main/portfolio_util.cpp')
-rw-r--r-- | src/main/portfolio_util.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/main/portfolio_util.cpp b/src/main/portfolio_util.cpp index 7a4beb0d0..6b5fe4723 100644 --- a/src/main/portfolio_util.cpp +++ b/src/main/portfolio_util.cpp @@ -12,13 +12,16 @@ ** \brief Code relevant only for portfolio builds **/ +#include <unistd.h> + #include <cassert> #include <vector> -#include <unistd.h> + +#include "options/main_options.h" #include "options/options.h" -#include "main/options.h" -#include "prop/options.h" -#include "smt/options.h" +#include "options/prop_options.h" +#include "options/smt_options.h" +#include "smt/smt_options_handler.h" using namespace std; @@ -28,6 +31,9 @@ vector<Options> parseThreadSpecificOptions(Options opts) { vector<Options> threadOptions; +#warning "TODO: Check that the SmtEngine pointer should be NULL with Kshitij." + smt::SmtOptionsHandler optionsHandler(NULL); + unsigned numThreads = opts[options::threads]; for(unsigned i = 0; i < numThreads; ++i) { @@ -37,7 +43,7 @@ vector<Options> parseThreadSpecificOptions(Options opts) // Set thread identifier tOpts.set(options::thread_id, i); - if(i < opts[options::threadArgv].size() && + if(i < opts[options::threadArgv].size() && !opts[options::threadArgv][i].empty()) { // separate out the thread's individual configuration string @@ -60,7 +66,7 @@ vector<Options> parseThreadSpecificOptions(Options opts) *vp++ = NULL; if(targc > 1) { // this is necessary in case you do e.g. --thread0=" " try { - tOpts.parseOptions(targc, targv); + tOpts.parseOptions(targc, targv, &optionsHandler); } catch(OptionException& e) { stringstream ss; ss << optid << ": " << e.getMessage(); |