diff options
| -rw-r--r-- | src/options/arith_options | 2 | ||||
| -rw-r--r-- | src/options/smt_options | 24 | ||||
| -rw-r--r-- | src/proof/proof_manager.cpp | 3 | ||||
| -rw-r--r-- | src/proof/proof_manager.h | 1 | ||||
| -rw-r--r-- | src/theory/arrays/theory_arrays_rewriter.h | 3 | ||||
| -rw-r--r-- | src/theory/rewriter.cpp | 12 |
6 files changed, 21 insertions, 24 deletions
diff --git a/src/options/arith_options b/src/options/arith_options index f38e377ba..18299e13e 100644 --- a/src/options/arith_options +++ b/src/options/arith_options @@ -135,7 +135,7 @@ option replayRejectCutSize --replay-reject-cut unsigned :default 25500 maximum complexity of any coefficient while replaying cuts option lemmaRejectCutSize --replay-lemma-reject-cut unsigned :default 25500 - maximum complexity of any coefficient while outputing replaying cut lemmas + maximum complexity of any coefficient while outputting replaying cut lemmas option soiApproxMajorFailure --replay-soi-major-threshold double :default .01 threshold for a major tolerance failure by the approximate solver diff --git a/src/options/smt_options b/src/options/smt_options index 747119344..d71b14db5 100644 --- a/src/options/smt_options +++ b/src/options/smt_options @@ -108,40 +108,40 @@ common-option cpuTime cpu-time --cpu-time bool :default false # Resource spending options for SPARK expert-option rewriteStep rewrite-step --rewrite-step unsigned :default 1 - ammount of resources spent for each rewrite step + amount of resources spent for each rewrite step expert-option theoryCheckStep theory-check-step --theory-check-step unsigned :default 1 - ammount of resources spent for each theory check call + amount of resources spent for each theory check call expert-option decisionStep decision-step --decision-step unsigned :default 1 - ammount of getNext decision calls in the decision engine + amount of getNext decision calls in the decision engine expert-option bitblastStep bitblast-step --bitblast-step unsigned :default 1 - ammount of resources spent for each bitblast step + amount of resources spent for each bitblast step expert-option parseStep parse-step --parse-step unsigned :default 1 - ammount of resources spent for each command/expression parsing + amount of resources spent for each command/expression parsing expert-option lemmaStep lemma-step --lemma-step unsigned :default 1 - ammount of resources spent when adding lemmas + amount of resources spent when adding lemmas expert-option restartStep restart-step --restart-step unsigned :default 1 - ammount of resources spent for each theory restart + amount of resources spent for each theory restart expert-option cnfStep cnf-step --cnf-step unsigned :default 1 - ammount of resources spent for each call to cnf conversion + amount of resources spent for each call to cnf conversion expert-option preprocessStep preprocess-step --preprocess-step unsigned :default 1 - ammount of resources spent for each preprocessing step in SmtEngine + amount of resources spent for each preprocessing step in SmtEngine expert-option quantifierStep quantifier-step --quantifier-step unsigned :default 1 - ammount of resources spent for quantifier instantiations + amount of resources spent for quantifier instantiations expert-option satConflictStep sat-conflict-step --sat-conflict-step unsigned :default 1 - ammount of resources spent for each sat conflict (main sat solver) + amount of resources spent for each sat conflict (main sat solver) expert-option bvSatConflictStep bv-sat-conflict-step --bv-sat-conflict-step unsigned :default 1 - ammount of resources spent for each sat conflict (bitvectors) + amount of resources spent for each sat conflict (bitvectors) expert-option rewriteApplyToConst rewrite-apply-to-const --rewrite-apply-to-const bool :default false diff --git a/src/proof/proof_manager.cpp b/src/proof/proof_manager.cpp index 5ce615366..1d304eead 100644 --- a/src/proof/proof_manager.cpp +++ b/src/proof/proof_manager.cpp @@ -22,9 +22,7 @@ #include "options/bv_options.h" #include "options/proof_options.h" #include "proof/bitvector_proof.h" -#include "proof/clause_id.h" #include "proof/cnf_proof.h" -#include "proof/proof_utils.h" #include "proof/sat_proof_implementation.h" #include "proof/theory_proof.h" #include "smt/smt_engine.h" @@ -37,7 +35,6 @@ #include "theory/uf/theory_uf.h" #include "theory/valuation.h" #include "util/hash.h" -#include "util/proof.h" namespace CVC4 { diff --git a/src/proof/proof_manager.h b/src/proof/proof_manager.h index fa7224d72..81205fccc 100644 --- a/src/proof/proof_manager.h +++ b/src/proof/proof_manager.h @@ -21,6 +21,7 @@ #include <iosfwd> #include <map> + #include "expr/node.h" #include "proof/clause_id.h" #include "proof/proof.h" diff --git a/src/theory/arrays/theory_arrays_rewriter.h b/src/theory/arrays/theory_arrays_rewriter.h index de10a861b..7d618b43a 100644 --- a/src/theory/arrays/theory_arrays_rewriter.h +++ b/src/theory/arrays/theory_arrays_rewriter.h @@ -40,6 +40,7 @@ class TheoryArraysRewriter { static Node normalizeConstant(TNode node) { return normalizeConstant(node, node[1].getType().getCardinality()); } + public: //this function is called by printers when using the option "--model-u-dt-enum" static Node normalizeConstant(TNode node, Cardinality indexCard) { @@ -226,8 +227,6 @@ public: return n; } -public: - static RewriteResponse postRewrite(TNode node) { Trace("arrays-postrewrite") << "Arrays::postRewrite start " << node << std::endl; switch (node.getKind()) { diff --git a/src/theory/rewriter.cpp b/src/theory/rewriter.cpp index 18ded60a8..b99c14a24 100644 --- a/src/theory/rewriter.cpp +++ b/src/theory/rewriter.cpp @@ -17,10 +17,10 @@ #include "theory/rewriter.h" -#include "theory/theory.h" #include "smt/smt_engine_scope.h" #include "smt/smt_statistics_registry.h" #include "theory/rewriter_tables.h" +#include "theory/theory.h" #include "util/resource_manager.h" using namespace std; @@ -159,7 +159,7 @@ Node Rewriter::rewriteTo(theory::TheoryId theoryId, Node node) { } } - rewriteStackTop.original =rewriteStackTop.node; + rewriteStackTop.original = rewriteStackTop.node; // Now it's time to rewrite the children, check if this has already been done Node cached = Rewriter::getPostRewriteCache((TheoryId) rewriteStackTop.theoryId, rewriteStackTop.node); // If not, go through the children @@ -219,16 +219,16 @@ Node Rewriter::rewriteTo(theory::TheoryId theoryId, Node node) { break; } else if (response.status == REWRITE_DONE) { #ifdef CVC4_ASSERTIONS - RewriteResponse r2 = Rewriter::callPostRewrite(newTheoryId, response.node); - Assert(r2.node == response.node); + RewriteResponse r2 = Rewriter::callPostRewrite(newTheoryId, response.node); + Assert(r2.node == response.node); #endif - rewriteStackTop.node = response.node; + rewriteStackTop.node = response.node; break; } // Check for trivial rewrite loops of size 1 or 2 Assert(response.node != rewriteStackTop.node); Assert(Rewriter::callPostRewrite((TheoryId) rewriteStackTop.theoryId, response.node).node != rewriteStackTop.node); - rewriteStackTop.node = response.node; + rewriteStackTop.node = response.node; } // We're done with the post rewrite, so we add to the cache Rewriter::setPostRewriteCache((TheoryId) rewriteStackTop.originalTheoryId, rewriteStackTop.original, rewriteStackTop.node); |