diff options
| author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2020-08-21 12:08:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 12:08:14 -0500 |
| commit | b8301cde27c455c8da3e9017072a577a0816939b (patch) | |
| tree | 816d1cccdda0625419b1b088644bafb85a857d14 /src/theory/arith/nl/nonlinear_extension.h | |
| parent | 905dc2b51fd0145e0bb69a166c06a1731ef4c44b (diff) | |
Connect the relevance manager to TheoryEngine and use it in non-linear arithmetic (#4930)
This PR activates the use of the relevance manager in TheoryEngine and makes use of it (via Valuation) in the non-linear extension in arith. It removes a deprecated hack (addTautology) for doing this.
This addresses CVC4/cvc4-projects#113.
Note that the best method for relevance is interleaving, where roughly you gain on SMT-LIB:
QF_NIA: +484-53 unsat +792-440 sat
QF_NRA: +32-19 unsat +57-23 sat
However, this PR does not (yet) enable this method by default.
Note that more work is necessary to determine which lemmas require NEEDS_JUSTIFY, this PR identifies 2 cases of lemmas that need justification (skolemization and strings reductions). Regardless, the use of the relevance manager is limited to non-linear arithmetic for now, which is only able to answer "sat" when only arithmetic is present in assertions.
Diffstat (limited to 'src/theory/arith/nl/nonlinear_extension.h')
| -rw-r--r-- | src/theory/arith/nl/nonlinear_extension.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/theory/arith/nl/nonlinear_extension.h b/src/theory/arith/nl/nonlinear_extension.h index 6fb8dbbfa..ee58a9e2e 100644 --- a/src/theory/arith/nl/nonlinear_extension.h +++ b/src/theory/arith/nl/nonlinear_extension.h @@ -254,11 +254,12 @@ class NonlinearExtension * ensureLiteral respectively. */ bool checkModel(const std::vector<Node>& assertions, - const std::vector<Node>& false_asserts, std::vector<NlLemma>& lemmas, std::vector<Node>& gs); //---------------------------end check model - + /** compute relevant assertions */ + void computeRelevantAssertions(const std::vector<Node>& assertions, + std::vector<Node>& keep); /** * Potentially adds lemmas to the set out and clears lemmas. Returns * the number of lemmas added to out. We do not add lemmas that have already @@ -293,6 +294,11 @@ class NonlinearExtension NlStats d_stats; // needs last call effort bool d_needsLastCall; + /** + * The number of times we have the called main check method + * (modelBasedRefinement). This counter is used for interleaving strategies. + */ + unsigned d_checkCounter; /** Extended theory, responsible for context-dependent simplification. */ ExtTheory d_extTheory; /** The non-linear model object |