Aina Niemetz [Tue, 8 Dec 2020 23:10:50 +0000 (15:10 -0800)]
google test: context: Migrate context_mm_black. (#5592)
Aina Niemetz [Tue, 8 Dec 2020 22:20:11 +0000 (14:20 -0800)]
google test: context: Migrate context_black. (#5587)
Gereon Kremer [Tue, 8 Dec 2020 20:48:21 +0000 (21:48 +0100)]
Add regression from #1978. (#5552)
This PR adds a regression from #1978 that has been fixed in the meantime.
Closes #1978 .
Abdalrhman Mohamed [Tue, 8 Dec 2020 20:10:10 +0000 (14:10 -0600)]
Fix a bug with synth-fun printer (#5512)
This PR fixes #5448. SynthFunCommand::toStream used to call d_grammar->resolve even when d_grammar is a nullptr. This PR fixes the issue and modifies the signature of Printer::toStreamCmdSynthFun to make it clear that grammar is an optional argument.
Haniel Barbosa [Tue, 8 Dec 2020 14:44:17 +0000 (11:44 -0300)]
[proof-new] Updating SAT proof to use MACRO_RESOLUTION (#5613)
yoni206 [Tue, 8 Dec 2020 12:51:06 +0000 (04:51 -0800)]
bv-to-int: Expand definitions of bvudiv and bvurem during bv-to-int preprocessing pass (#5620)
#5544 enforces expandDefinition not to run before preprocessing.
The bv-to-int preprocessing pass used to rely on expandDefinition to replace BITVECTOR_UDIV and BITVECTOR_UREM with their _TOTAL versions.
This PR performs the replacement in the preprocessing pass itself.
A regression that timed out is now fixed and is brought back to the regressions.
Andrew Reynolds [Tue, 8 Dec 2020 07:50:10 +0000 (01:50 -0600)]
Make term indices in the strings base solver aware of types (#5589)
This is required for handling inputs that combine strings and sequences.
Fixes #5542.
Andrew Reynolds [Tue, 8 Dec 2020 06:38:14 +0000 (00:38 -0600)]
Proper implementation of expand definitions for sequences (#5616)
Expand definitions for sequences was wrong in two ways: (1) we replaced str.from_code with a witness term. This led to it being unevaluatable in models. (2) we did not handle seq.nth, meaning its model value was unevaluatable if it was out of bounds. Now it evaluates the value of the uninterpreted function we replace with.
This corrects both issues and adds a regression to demonstrate both kinds of terms evaluate correctly.
To do this, I added a helper function to skolem cache as well as a new (internal-only) kind SEQ_NTH_TOTAL. Notice applications of this kind should only be used for model evaluation.
Notice this fixes several check-model warnings in the regressions. It still does not fix others since other things must be corrected for model evaluation (e.g. expandDefinitions must be applied on theory assertions for --debug-check-models). This will be done in later PRs.
Andrew Reynolds [Tue, 8 Dec 2020 04:46:22 +0000 (22:46 -0600)]
Fix collect model values for sequences of sequences (#5579)
Fixes #5543.
Recently we changed our model construction for sequences here: #5391.
This fix is not safe for sequences of sequences, where Valuation::getModelValue should not be called, since the argument of the seq.unit is not a shared term.
This makes our model construction for sequences more robust, however I'm not sure this is the end solution. In particular, it is still questionable whether we should call Valuation::getModelValue at all (consider sequences of theories whose model construction comes after strings), or for cases of (seq.unit x) where x is a sequence or string that does not have a concrete value. Regardless, this PR could be merged in the meantime since it should definitely fix some of the current issues.
Haniel Barbosa [Tue, 8 Dec 2020 03:54:11 +0000 (00:54 -0300)]
[proof-new] Adding MACRO_RESOLUTION rule and updating proof checker (#5612)
Previously CHAIN_RESOLUTION's definition and checker were not properly capturing its intended behavior as merely an n-ary RESOLUTION rule (i.e., no factoring nor reordering). A new rule, MACRO_RESOLUTION, now captures this behavior: it combines CHAIN_RESOLUTION, FACTORING, and REORDERING.
This commit also adds a proof checker for the new rule and updates the proof checker of CHAIN_RESOLUTION.
Mathias Preiner [Tue, 8 Dec 2020 03:15:14 +0000 (19:15 -0800)]
Add support for BV proofs with the simple bitblasting solver. (#5603)
Mathias Preiner [Tue, 8 Dec 2020 02:06:30 +0000 (18:06 -0800)]
Disable algebraic BV subtheory by default and make experimental. (#5596)
Fixes #5370, #5462.
Andrew Reynolds [Mon, 7 Dec 2020 22:12:47 +0000 (16:12 -0600)]
Fix and reenable fact vs lemma optimization in datatypes (#5614)
This corrects an issue where terms internal to datatypes were not getting properly registered e.g. as part of the indices that determine the care graph, due to a context-independent cache being used (when a SAT-context-dependent one was required).
This reenables the fact vs lemma optimization in datatypes, as it is conjectured to be correct.
makaimann [Mon, 7 Dec 2020 21:39:15 +0000 (13:39 -0800)]
Add bitwise refinement mode for IAND (#5328)
Adds an option to do "bitwise" comparisons in the lazy IAND solver. Instead of creating an exact match for the value of a term using a sum, this would lazily fix groups of bits using integer extracts (divs and mods) when the abstract and concrete values differ at those bits.
For example, with a 1-bit granularity, you might learn a lemma like:
((_ iand 4) x y), value = 1
actual (2, 3) = 2
bv-value = #b0001
bv-actual (#b0010, #b0011) = #b0010
IAndSolver::Lemma: (let ((_let_1 ((_ iand 4) x y)))
(and (and true
(= (mod _let_1 2) (ite (and (= (mod x 2) 1) (= (mod y 2) 1)) 1 0)))
(= (mod (div _let_1 2) 2) (ite (and (= (mod (div x 2) 2) 1) (= (mod (div y 2) 2) 1)) 1 0))))
; BITWISE_REFINE
which is just forcing the bottom two bits of the iand operator result to implement bitwise-AND semantics.
Andrew Reynolds [Mon, 7 Dec 2020 20:43:34 +0000 (14:43 -0600)]
Fix issue with free variables introduced by quantifier rewriter (#5602)
This was caused by the quantifiers rewriting eliminating extended arithmetic operators, which was required due to the way counterexample-guided quantifier instantiation used to work with preprocessing. The technique is now more robust and this option can be deleted.
This fixes a debug assertion failure from UFNIA SMT-LIB, a minimized benchmark is included as a regression.
Gereon Kremer [Mon, 7 Dec 2020 19:59:10 +0000 (20:59 +0100)]
Refactor initial phase of transcendental solver (#5599)
This PR refactors the initialization of the transcendental solver, decoupling the setup of generic caches from initial lemmas for exponential and sine functions.
Andrew Reynolds [Mon, 7 Dec 2020 15:51:32 +0000 (09:51 -0600)]
Do not expand theory definitions at the beginning of preprocessing (#5544)
This updates the preprocessor so that expand definitions does not expand theory symbols at the beginning of preprocessing.
This also restores the previous expandDefinitions method in arithmetic, which is required for correctly interpreting division by zero in models, but should not be applied at the beginning of preprocessing. Moreover it ensures that only partial operators are eliminated in arithmetic expandDefinitions, which required an additional argument partialOnly to arith::OperatorElim.
This adds -q to suppress warnings for many quantified regressions which now emit warnings with --check-model. This will be addressed later as part of CVC4/cvc4-wishues#43.
The purpose of this PR is two-fold:
(1) Currently our responses to get-value are incorrect for partial operators like div, mod, seq.nth since partial operators can be left unevaluated.
(2) The preprocessor should have the opportunity to rewrite and eliminate extended operators before they are expanded. This is required for addressing performance issues for non-linear arithmetic. It is also required for ensuring that trigger selection can be done properly for datatype selectors (to be addressed on a later PR).
Andrew Reynolds [Mon, 7 Dec 2020 13:55:30 +0000 (07:55 -0600)]
(proof-new) Split proof ensure closed checks to own file (#5522)
Split proof ensure closed checks to own file
Gereon Kremer [Mon, 7 Dec 2020 13:25:08 +0000 (14:25 +0100)]
Add regression from #4927 (#5556)
The error from #4927 has been fixed in the meantime, this PR adds the example as regression.
Closes #4927.
Andrew Reynolds [Mon, 7 Dec 2020 11:26:13 +0000 (05:26 -0600)]
Fix bugs in getFreeVariables (#5601)
Did not consider scopes properly, which would fail to say that formulas with escaped variables (both bound and unbound) in formula had free variables.
Everett Maus [Sat, 5 Dec 2020 01:09:54 +0000 (17:09 -0800)]
Change generated options to be thread_local. (#5583)
Signed-off-by: Everett Maus <evmaus@google.com>
Aina Niemetz [Fri, 4 Dec 2020 20:47:30 +0000 (12:47 -0800)]
google test: expr: Migrate attribute_black. (#5598)
Aina Niemetz [Fri, 4 Dec 2020 20:07:51 +0000 (12:07 -0800)]
google test: context: Migrate cdo_black. (#5586)
Aina Niemetz [Fri, 4 Dec 2020 18:54:46 +0000 (10:54 -0800)]
google test: context: Migrate cdmap_white. (#5585)
Andrew Reynolds [Fri, 4 Dec 2020 18:26:12 +0000 (12:26 -0600)]
Fix bug in hasBoundVar (#5600)
Led to issues while debugging another issue related to free variables in assumptions.
Aina Niemetz [Fri, 4 Dec 2020 16:54:32 +0000 (08:54 -0800)]
google test: api: Migrate sort_black. (#5594)
Aina Niemetz [Fri, 4 Dec 2020 16:16:37 +0000 (08:16 -0800)]
google test: context: Migrate cdmap_black. (#5584)
Aina Niemetz [Fri, 4 Dec 2020 15:07:22 +0000 (07:07 -0800)]
google test: context: Migrate cdlist_black. (#5582)
Alex Ozdemir [Fri, 4 Dec 2020 07:42:34 +0000 (23:42 -0800)]
Use NodeDfsIterable for makeBinary (#5595)
Replaces the manual dag traversal in BVToInt::makeBinarywith NodeDfsIterable.
This is a subset of the changes in #4176, updated to apply to master.
Mathias Preiner [Fri, 4 Dec 2020 06:32:17 +0000 (22:32 -0800)]
update-copyright: Preserve file permissions. (#5597)
When updating the copyright headers file permissions were not preserved. In some cases this results in losing the permission to execute scripts. This commit makes sure to preserve the file permissions for updated files.
Andrew Reynolds [Thu, 3 Dec 2020 22:14:59 +0000 (16:14 -0600)]
(proof-new) Updates to SMT proof manager and SmtEngine (#5446)
This PR adds infrastructure in SmtEngine and ProofManager for checking and printing proofs. It updates a previous interface that used ProofGenerator in favor of ProofNode.
This makes it so that it only remains to make PropEngine to be proof producing.
Aina Niemetz [Thu, 3 Dec 2020 21:29:48 +0000 (13:29 -0800)]
google test: api: Migrate solver_black. (#5570)
Gereon Kremer [Thu, 3 Dec 2020 20:55:16 +0000 (21:55 +0100)]
Use mkAnd where the number of children may be less than two. (#5551)
An AND was constructed from a vector that may only hold a single or no element.
This PR uses mkAnd instead.
Fixes #5550 .
yoni206 [Thu, 3 Dec 2020 20:18:10 +0000 (12:18 -0800)]
Models as (#5581)
This PR relates to #4987 .
Our plan is to:
delete the model keyword (done in #5415 )
avoid printing extra declarations by default (done in #5432 )
wrap UF values with as expressions.
This PR does step 3, fixes a regression accordingly, and adds the formula from #4987 and a variant of it to the regressions.
Aina Niemetz [Thu, 3 Dec 2020 19:29:58 +0000 (11:29 -0800)]
google test: Add fixture for context tests. (#5590)
Context test PRs will be updated to use this after this is merged to
master.
Andrew Reynolds [Thu, 3 Dec 2020 16:49:08 +0000 (10:49 -0600)]
Refactor handling of global declarations (#5577)
This refactors how global declarations are handled in the parser. In particular, we do not push/pop user contexts in the symbol table and manager when global declarations are true, which is an equivalent behavior to declaring symbols globally.
This further refactors to not use ExprManager flags, thus breaking most of the dependencies on the old API.
This is work towards fixing global declarations in the smt2 parser. The parser still does not behave correctly for overloaded symbols + global declarations (e.g. see #4767), which require further refactoring.
This is also work towards migrating the parser not to depend on the old API. There are a few miscellaneous things to change after this PR, but we are very close to breaking this dependency now.
Gereon Kremer [Thu, 3 Dec 2020 15:58:48 +0000 (16:58 +0100)]
Make run_regression.py executable. (#5588)
Aina Niemetz [Thu, 3 Dec 2020 03:55:00 +0000 (19:55 -0800)]
Update copyright headers.
Aina Niemetz [Thu, 3 Dec 2020 00:37:26 +0000 (16:37 -0800)]
google test: base: Migrate map_util_black. (#5580)
Aina Niemetz [Wed, 2 Dec 2020 23:34:13 +0000 (15:34 -0800)]
Fix RoundingMode mapping in API. (#5578)
Fixes #5524.
Andrew Reynolds [Wed, 2 Dec 2020 22:59:11 +0000 (16:59 -0600)]
Remove Record object and convert to Node-level API (#5575)
Required for detangling NodeManager from the Expr layer.
Aina Niemetz [Wed, 2 Dec 2020 22:24:52 +0000 (14:24 -0800)]
Rename macro Message to CVC4Message. (#5576)
Andrew Reynolds [Wed, 2 Dec 2020 22:09:28 +0000 (16:09 -0600)]
Remove dagification visitor (#5574)
This has fully been replaced by the new let binding.
Aina Niemetz [Wed, 2 Dec 2020 21:55:19 +0000 (13:55 -0800)]
google test: api: Migrate term_black. (#5571)
Aina Niemetz [Wed, 2 Dec 2020 20:51:06 +0000 (12:51 -0800)]
google test: api: Use individual fixture for datatype_black. (#5568)
This is to prevent name clashes with other tests.
Andrew Reynolds [Wed, 2 Dec 2020 19:03:54 +0000 (13:03 -0600)]
Add associative utilities to node manager (#5530)
Required for updating the new API to use Node utilites as backend.
These utilities are copied directly from ExprManager and converted Expr -> Node.
Aina Niemetz [Wed, 2 Dec 2020 18:13:54 +0000 (10:13 -0800)]
google test: api: Migrate op_black. (#5567)
Aina Niemetz [Wed, 2 Dec 2020 17:13:34 +0000 (09:13 -0800)]
google test: api: Migrate grammar_black. (#5566)
Andrew Reynolds [Wed, 2 Dec 2020 16:17:09 +0000 (10:17 -0600)]
Use new let binding for cvc printer (#5561)
Also changes names slightly to avoid accidental uses of toStream, which can lead to infinite loops if the wrong version is used.
Andrew Reynolds [Wed, 2 Dec 2020 15:41:31 +0000 (09:41 -0600)]
(proof-new) Proofs for expand definitions (#5562)
Gereon Kremer [Wed, 2 Dec 2020 05:22:56 +0000 (06:22 +0100)]
Add regressions from #3687. (#5553)
The error from #3687 has been fixed in the meantime.
This PR adds the two examples from this issue as regressions.
Closes #3687
Aina Niemetz [Wed, 2 Dec 2020 02:24:21 +0000 (18:24 -0800)]
google test: api: Migrate result_black. (#5569)
google test: api: Migrate result_black.
Aina Niemetz [Wed, 2 Dec 2020 02:05:27 +0000 (18:05 -0800)]
Remove use of this-> in FP literal. (#5565)
Andrew Reynolds [Wed, 2 Dec 2020 01:12:01 +0000 (19:12 -0600)]
Remove assertion related to CEGQI dependency lemmas (#5559)
This assertion does not hold when we mix --sygus-inst with normal CEGQI.
Should fix the nightlies.
Aina Niemetz [Wed, 2 Dec 2020 00:30:33 +0000 (16:30 -0800)]
google test: Infrastructure and first api test. (#5548)
This sets up the infrastructure for migrating unit tests from CxxTest to
Google Test. It further migrates api/datatype_api_black to the new
infrastructure.
Andrew Reynolds [Wed, 2 Dec 2020 00:00:49 +0000 (18:00 -0600)]
Fix issues related to model declarations (#5560)
This corrects two issues related to model declarations:
(1) model declaration terms were mistaken not cleared,
(2) the model needs to be explicitly destructed before the node manager because it contains references to Node.
Fixes #5540
Andres Noetzli [Tue, 1 Dec 2020 16:58:06 +0000 (08:58 -0800)]
Improve rewriting of str.<= (#4848)
This commit improves our rewriting of str.<= slightly. If we have
constant prefixes that are different, we can always rewrite the term to
a constant. Previously, we were only doing so when the result was
false.
Gereon Kremer [Tue, 1 Dec 2020 15:44:32 +0000 (16:44 +0100)]
Refactor transcendental solver (#5539)
This PR does another round of refactoring on the transcendental solver. It cleans up some variable names, introduces an enum type for Convexity and passes both the intended taylor degree and the actual taylor degree (which will be needed for proofs).
Gereon Kremer [Tue, 1 Dec 2020 15:08:07 +0000 (16:08 +0100)]
Add regressions from #5099 (#5557)
The issue from #5099 has been fixed in the meantime, this PR adds the examples as regressions.
Closes #5099.
Gereon Kremer [Tue, 1 Dec 2020 14:36:37 +0000 (15:36 +0100)]
Add regression for #4335. (#5554)
The error from #4335 has been fixed in the meantime, this PR adds a regression for this issue.
Closes #4335.
Gereon Kremer [Tue, 1 Dec 2020 14:03:50 +0000 (15:03 +0100)]
Add regressions for #4707. (#5555)
The error from #4707 has been fixed in the meantime, this PR adds the example inputs as regressions.
Closes #4707.
Andrew Reynolds [Tue, 1 Dec 2020 04:22:24 +0000 (22:22 -0600)]
More fixes for quantifier elimination (#5533)
Fixes #5506, fixes #5507.
yoni206 [Tue, 1 Dec 2020 02:42:19 +0000 (18:42 -0800)]
fix metadata for a test (#5546)
A COMMAND was used instead of COMMAND-LINE.
Aina Niemetz [Mon, 30 Nov 2020 23:26:33 +0000 (15:26 -0800)]
fp_converter: Properly separate out symbolic glue code. (#5501)
File fp_converter.h encapsulates the symbolic glue code for symFPU and
implements the actual word-blaster (class FpConverter).
This header should not be included in any other headers in order to no
pull in symFPU headers where it's not needed. However, it was included
in src/theory/fp/theory_fp.h.
This properly separates it out and does some clean up in TheoryFP, which
still needs more love to conform to code style guidelines, and also
more documentation. More love and documentation is postponed to future
PRs to make reviewing easier.
Andrew Reynolds [Mon, 30 Nov 2020 22:50:09 +0000 (16:50 -0600)]
Use new let binding in AST printer (#5529)
Required for removing the old DagificationVisitor
Aina Niemetz [Mon, 30 Nov 2020 20:17:43 +0000 (12:17 -0800)]
floatingpoint: Use unique_ptr for FloatingPointLiteral pointer. (#5503)
Abdalrhman Mohamed [Mon, 30 Nov 2020 19:32:51 +0000 (13:32 -0600)]
Eliminate uses of SExpr from the parser. (#5496)
This is a step towards migrating Commands to the API. SExpr is an internal module that's not used by the API but is used by the parser and some commands. This PR replaces SExpr with terms of kind SEXPR in the parser and strings in commands (which brings them more inline with the API).
Andrew Reynolds [Mon, 30 Nov 2020 16:56:28 +0000 (10:56 -0600)]
Remove includes for old API from internal code (#5536)
The only code including the old API now are in parser/ and main/ which will require further untangling.
Andrew Reynolds [Mon, 30 Nov 2020 15:41:37 +0000 (09:41 -0600)]
(proof-new) Proofs for regular expression elimination (#5361)
Adds support for proofs for regular expression elimination in TheoryStrings::ppRewrite via a coarse-grained rule RE_ELIM.
This rule is updated by this PR to distinguish whether we apply aggressive elimination. Aggressive elimination is not currently supported, since it is non-deterministic due to generating fresh BOUND_VARIABLE.
Gereon Kremer [Thu, 26 Nov 2020 16:02:16 +0000 (17:02 +0100)]
Make CAD solver work for empty set of assertions (#5535)
When called with no assertions, the CAD solver would still go to work and then segfault when trying to access the first variable.
This PR adds an explicit check for this case and adds a regression.
Fixes #5534 .
Andrew Reynolds [Thu, 26 Nov 2020 15:15:30 +0000 (09:15 -0600)]
Removing infrastructure related to SMT model (#5527)
Now, SMT models do not store an internal list of commands, and are not dependent on a reference to SmtEngine.
The next cleanup step will be to merge OutputManager, DumpManager, and SmtEngineNodeListener.
Andrew Reynolds [Thu, 26 Nov 2020 10:43:19 +0000 (04:43 -0600)]
Move expand definitions to its own file (#5528)
We are changing our policy on how expand definitions is handled during preprocessing.
This will require some additions to expand definitions handling. This PR makes a standalone module for expanding definitions.
Andrew Reynolds [Thu, 26 Nov 2020 05:03:11 +0000 (23:03 -0600)]
Fully decouple SmtEngine and the Expr layer (#5532)
This removes the remaining dependencies of SmtEngine on the Expr layer. It now takes a NodeManager instead of a ExprManager.
Andrew Reynolds [Thu, 26 Nov 2020 03:00:13 +0000 (21:00 -0600)]
Fix missed case of theory preprocessing (#5531)
This fixes a rare case of theory preprocessing where rewriting a quantified formula would introduce a term that would not be preprocessed. This led to solution unsoundness on a branch where the relationship between expand definitions and preprocessing is modified.
This is required for updating to the new policy for expand definitions.
Andrew Reynolds [Thu, 26 Nov 2020 02:37:23 +0000 (20:37 -0600)]
Disable fact vs lemma optimization in datatypes for now (#5521)
This optimization needs more work to determine its correctness. It is currently leading to incorrect candidate models on Facebook benchmarks.
Andrew Reynolds [Wed, 25 Nov 2020 19:35:58 +0000 (13:35 -0600)]
Add regressions for closed issues (#5526)
We can close #5520, we can close #5378.
Gereon Kremer [Wed, 25 Nov 2020 18:07:54 +0000 (19:07 +0100)]
Fix transcendental secant plane lemmas (#5525)
The refactoring of the transcendental solver introduced a subtle issue that lead to incorrect secant plane lemmas.
This PR fixes this issue, so that we now produce the correct lemmas again.
Andrew Reynolds [Wed, 25 Nov 2020 16:46:41 +0000 (10:46 -0600)]
Use symbol manager for printing responses get-model (#5516)
This makes symbol manager be in charge of determining which sorts and terms to print in response to get-model. This eliminates the need for the parser to call ExprManager::mkVar (and similar methods) with custom flags.
This requires significant simplifications to the printers for models, where instead of a NodeCommand, we take a Sort or Term to print in the model.
This is one of the last remaining steps for migrating the parser to the new API.
The next step will be to remove a lot of the internal infrastructure for managing expression names, commands to print in models, node commands, node listeners, etc.
Andrew Reynolds [Wed, 25 Nov 2020 06:30:56 +0000 (00:30 -0600)]
Allow printing of null node in let binder (#5523)
Gereon Kremer [Wed, 25 Nov 2020 00:07:42 +0000 (01:07 +0100)]
Refactor transcendental solver (#5514)
The transcendental solver has grown over time, and a refactoring was due.
This PR splits the transcendental solver into five components:
a utility to compute taylor approximations
a common state for transcendental solvers
a solver for exponential function
a solver for sine function
a solver that wraps everything to a transcendental solver.
Andrew Reynolds [Mon, 23 Nov 2020 22:09:20 +0000 (16:09 -0600)]
Fix regular expression consume for nested star (#5518)
The issue was caused by simple regular expression consume being too aggressive when a recursive call was made to the method. In particular, we were assuming that the body of the star must be unrolled to fully consume a string, when it can be skipped if we are not at top level.
Fixes #5510.
Andrew Reynolds [Mon, 23 Nov 2020 17:49:59 +0000 (11:49 -0600)]
Change UF ho to ppRewrite instead of expand definition (#5499)
UF uses expandDefinitions to convert fully applied HO_APPLY to APPLY_UF. The more appropriate place to do this is in Theory::ppRewrite.
Andrew Reynolds [Mon, 23 Nov 2020 16:34:53 +0000 (10:34 -0600)]
Fix for sygusToBuiltinEval for non-ground composite terms (#5466)
There was a bug in the method for computing the evaluation of a sygus term applied to arguments.
The case that was wrong was for (DT_SYGUS_EVAL t c1 ... cn) where t contained a subterm (op t1 ... tn) where:
(1) (op t1 ... tn) is a non-ground sygus datatype term
(2) op was an operator of the form (lambda ((z T)) (g z xi)) where xi is a variable from the formal argument list of the function to synthesize.
In this case, xi was not getting replaced by ci.
This bug appears when using sygus repair for grammars with composite term that involve variables from the formal argument list of the synth-fun.
Andrew Reynolds [Mon, 23 Nov 2020 16:23:00 +0000 (10:23 -0600)]
(proof-new) Miscellaneous changes from proof-new (#5445)
Andrew Reynolds [Mon, 23 Nov 2020 12:40:47 +0000 (06:40 -0600)]
Add declare model symbol methods to SymbolManager and Model (#5480)
This is in preparation for the symbol manager determining which symbols are printed in the model.
Gereon Kremer [Mon, 23 Nov 2020 07:55:03 +0000 (08:55 +0100)]
Add get-info :time. (#5485)
This PR adds the new info `:time` that can be queried with `(get-info :time)` and returns the spent CPU time (as returned by `std::clock()`.
@pjljvandelaar
Fixes CVC4/CVC4-projects#102
Andrew Reynolds [Mon, 23 Nov 2020 01:41:23 +0000 (19:41 -0600)]
Fix quantifiers scope issue in strings preprocessor (#5491)
Leads to free variables in assertions when using `str.<=` whose reduction uses EXISTS not FORALL.
Fixes #5483.
mudathirmahgoub [Sat, 21 Nov 2020 01:54:40 +0000 (19:54 -0600)]
Add posRewriteEqual to bags rewriter (#5498)
This PR fixes #5460 by adding posRewriteEqual to bags rewriter
Aina Niemetz [Sat, 21 Nov 2020 01:30:43 +0000 (17:30 -0800)]
Rename symfpu_literal.(h.in|cpp) -> floatingpoint_literal_symfpu.(h.in|cpp). (#5502)
Aina Niemetz [Sat, 21 Nov 2020 00:32:03 +0000 (16:32 -0800)]
Rename floatingpoint.h.in -> floatingpoin.h. (#5500)
Andrew Reynolds [Fri, 20 Nov 2020 23:49:27 +0000 (17:49 -0600)]
Fix remove term formula policy for terms beneath quantifiers (#5497)
Now that extended arithmetic symbols are not eliminated during expandDefinitions, this allowed for a chain of events that would not apply theory preprocessing on certain terms.
In particular, a term t would not have theory preprocessing applied to it if it was a strict subterm of ITE-term s that occurred in a term position in a quantified formula body, and s did not have free variables. In this case, term formula removal would add a lemma corresponding to the ITE skolem definition, whose subterms did not have theory preprocessing applied. This meant that a (div a d) term was not being preprocessed in #5482, leading to solution unsoundness.
This changes the policy in term formula removal to be in sync with theory preprocessing: term formula removal and theory preprocessing only apply to terms that are not beneath quantifiers. In particular, this means that ground terms in quantifier bodies are left untouched until they are introduced e.g. by instantiation.
This fixes the solution soundness issue (fixes #5482).
Aina Niemetz [Fri, 20 Nov 2020 23:11:39 +0000 (15:11 -0800)]
RoundingMode: Rename enum values to conform to code style guidelines. (#5494)
Aina Niemetz [Fri, 20 Nov 2020 22:30:57 +0000 (14:30 -0800)]
FloatingPoint: Separate out symFPU glue code. (#5492)
This works towards having the symFPU headers only included where it's
absolutely needed (only in the .cpp files, not in any other headers).
Note: src/util/floatingpoint.h.in will be converted to a regular .h file
in the next step to simplify reviewing.
Aina Niemetz [Fri, 20 Nov 2020 21:55:42 +0000 (13:55 -0800)]
Fix #5493. (#5495)
Andrew Reynolds [Fri, 20 Nov 2020 21:19:40 +0000 (15:19 -0600)]
Support nested quantifier elimination for get-qe command (#5490)
Uses new nested-qe utility for eliminating nested quantification before doing quantifier elimination.
Fixes CVC4/cvc4-wishues#26
Fixes #5484.
Andrew Reynolds [Fri, 20 Nov 2020 20:49:55 +0000 (14:49 -0600)]
Updates to API in preparation for using symbol manager for model (#5481)
printModel no longer makes sense if the list of declared symbols is managed outside the solver.
Also, mkConst needs a variant to distinguish a provided name of "" vs. a name that is not provided.
Aina Niemetz [Fri, 20 Nov 2020 20:06:23 +0000 (12:06 -0800)]
Fix compiler warnings. (#5493)
Andrew Reynolds [Fri, 20 Nov 2020 19:51:07 +0000 (13:51 -0600)]
Fix use of declaration sequence command in cvc parser (#5479)
This is required to make the cvc parser work properly with the new version of getting models based on the symbol manager.
Gereon Kremer [Fri, 20 Nov 2020 19:04:37 +0000 (20:04 +0100)]
(proof-new) Replace LazyCDProofSet by generic CDProofSet (#5487)
This PR replaces the LazyCDProofSet, that was hardcoded to use LazyCDProof objects, by a templated CDProofSet.
Gereon Kremer [Fri, 20 Nov 2020 13:08:45 +0000 (14:08 +0100)]
Allow to pass ProofGenerator to arithmetic inference manager. (#5488)
This PR prepares the addition of proofs for the arithmetic theory by making addPendingArithLemma() accept a ProofGenerator*.