diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-11-27 11:12:11 -0500 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-11-27 11:12:26 -0500 |
| commit | 86b54ede8a2898a6c51fddd4bb32f8b4b87b5da6 (patch) | |
| tree | 989d5595bb52ba2e9cff08e9dd27ccf65e3b0997 /src | |
| parent | dd7e0c66cab285c154f59ff27132059c34e09e23 (diff) | |
Incremental is now on by default when using from API, off for command-line driver except in interactive mode.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/driver_unified.cpp | 10 | ||||
| -rw-r--r-- | src/smt/options | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/main/driver_unified.cpp b/src/main/driver_unified.cpp index e9d071918..3f5e5424e 100644 --- a/src/main/driver_unified.cpp +++ b/src/main/driver_unified.cpp @@ -194,7 +194,9 @@ int runCvc4(int argc, char* argv[], Options& opts) { pExecutor = new CommandExecutor(*exprMgr, opts); # else vector<Options> threadOpts = parseThreadSpecificOptions(opts); - if(opts[options::incrementalSolving] && !opts[options::incrementalParallel]) { + if(opts.wasSetByUser[options::incrementalSolving] && + opts[options::incrementalSolving] && + !opts[options::incrementalParallel]) { Notice() << "Notice: In --incremental mode, using the sequential solver unless forced by...\n" << "Notice: ...the experimental --incremental-parallel option.\n"; exprMgr = new ExprManager(opts); @@ -264,6 +266,12 @@ int runCvc4(int argc, char* argv[], Options& opts) { delete cmd; } } else { + if(!opts.wasSetByUser(options::incrementalSolving)) { + cmd = new SetOptionCommand("incremental", false); + pExecutor->doCommand(cmd); + delete cmd; + } + ParserBuilder parserBuilder(exprMgr, filename, opts); if( inputFromStdin ) { diff --git a/src/smt/options b/src/smt/options index 6b9944cdd..f3da7a0a7 100644 --- a/src/smt/options +++ b/src/smt/options @@ -63,10 +63,9 @@ option zombieHuntThreshold --simp-ite-hunt-zombies uint32_t :default 524288 option sortInference --sort-inference bool :read-write :default false calculate sort inference of input problem, convert the input based on monotonic sorts -common-option incrementalSolving incremental -i --incremental bool +common-option incrementalSolving incremental -i --incremental bool :default true enable incremental solving - option abstractValues abstract-values --abstract-values bool :default false in models, output arrays (and in future, maybe others) using abstract values, as required by the SMT-LIB standard option modelUninterpDtEnum --model-u-dt-enum bool :default false |