diff options
| author | Kshitij Bansal <kshitij@cs.nyu.edu> | 2013-09-12 14:44:49 -0400 |
|---|---|---|
| committer | Kshitij Bansal <kshitij@cs.nyu.edu> | 2013-09-12 14:44:49 -0400 |
| commit | 470c20cd7d12f8de3e9d4e7c38d2ebba1296b098 (patch) | |
| tree | eba01503e16a20ac5eb1f4e44e7f87aa4b16acbd /src/main | |
| parent | 28ec8ce392a815c47689ecd86b5b91f9a58104e5 (diff) | |
fix bug 534: portfolio define-fun duplicate model
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/command_executor_portfolio.cpp | 5 | ||||
| -rw-r--r-- | src/main/portfolio.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/main/command_executor_portfolio.cpp b/src/main/command_executor_portfolio.cpp index 918b554f0..e58df5699 100644 --- a/src/main/command_executor_portfolio.cpp +++ b/src/main/command_executor_portfolio.cpp @@ -187,7 +187,6 @@ bool CommandExecutorPortfolio::doCommandSingleton(Command* cmd) dynamic_cast<QueryCommand*>(cmd) != NULL) { mode = 1; } else if(dynamic_cast<GetValueCommand*>(cmd) != NULL || - dynamic_cast<GetModelCommand*>(cmd) != NULL || dynamic_cast<GetAssignmentCommand*>(cmd) != NULL || dynamic_cast<GetModelCommand*>(cmd) != NULL || dynamic_cast<GetProofCommand*>(cmd) != NULL || @@ -199,6 +198,10 @@ bool CommandExecutorPortfolio::doCommandSingleton(Command* cmd) mode = 2; } + Debug("portfolio::outputmode") << "Mode is " << mode + << "lastWinner is " << d_lastWinner + << "d_seq is " << d_seq << std::endl; + if(mode == 0) { d_seq->addCommand(cmd->clone()); Command* cmdExported = diff --git a/src/main/portfolio.cpp b/src/main/portfolio.cpp index 263458247..cf8bba1ba 100644 --- a/src/main/portfolio.cpp +++ b/src/main/portfolio.cpp @@ -38,6 +38,8 @@ int global_winner; template<typename S> void runThread(int thread_id, boost::function<S()> threadFn, S& returnValue) { + /* Uncommment line to delay first thread, useful to unearth errors/debug */ + // if(thread_id == 0) { sleep(1); } returnValue = threadFn(); if( mutex_done.try_lock() ) { |