diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-04-01 00:56:42 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-04-01 00:56:42 +0000 |
| commit | 159cb7ee8b6f28f3784a3f24b371760c2ab77f86 (patch) | |
| tree | d510bfa3e4977b5c532d9ab82b6cd5d9581365a3 /src/prop/minisat | |
| parent | ceca24424da629db2e133f7864b0bac03ad44829 (diff) | |
This commit is a merge from the "betterstats" branch, which:
* Makes Options an "omnipresent thread-local global" (like the notion
of the "current NodeManager" was already). Options::current() accesses
this structure.
* Removes Options from constructors and data structures everywhere
(this cleans up a lot of things).
* No longer uses StatisticsRegistry statically. An instance of the
registry is created and linked to a NodeManager.
* StatisticsRegistry::current() is similar to Options::current(), but
the pointer is stowed in the NodeManager (rather than stored)
* The static functions of StatisticsRegistry have been left, for backward
compatibility; they now use the "current" statistics registry.
* SmtEngine::getStatisticsRegistry() is a public accessor for the
registry; this is needed by main() to reach in and get the registry,
for flushing statistics at the end.
Diffstat (limited to 'src/prop/minisat')
| -rw-r--r-- | src/prop/minisat/CVC4-README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/prop/minisat/CVC4-README b/src/prop/minisat/CVC4-README index af71779d5..cd3b638d6 100644 --- a/src/prop/minisat/CVC4-README +++ b/src/prop/minisat/CVC4-README @@ -13,7 +13,7 @@ the trunk. The PropEngine then uses the following // Create the sat solver (this is the proxy, which will create minisat) -d_satSolver = new SatSolver(this, d_theoryEngine, d_context, d_options); +d_satSolver = new SatSolver(this, d_theoryEngine, d_context); // Add some clauses d_cnfStream->convertAndAssert(node); // Check for satisfiabilty |