Tim King [Sat, 10 Nov 2012 20:27:00 +0000 (20:27 +0000)]
Removing rewriter call in SmtEngine::addFormula().
Clark Barrett [Sat, 10 Nov 2012 20:15:24 +0000 (20:15 +0000)]
Fixed missing \ in uflra/Makefile.ma
Fixed another model bug and added previously failing fuzz testcase
Tim King [Sat, 10 Nov 2012 19:01:49 +0000 (19:01 +0000)]
Fix for bug 439. Delta computation now includes disequality information.
Morgan Deters [Sat, 10 Nov 2012 17:08:54 +0000 (17:08 +0000)]
Change run-regression script to *additionally* run a second test with --check-models *if* the benchmark is sat/invalid (or is incremental, with at least one sat/invalid result).
This increases significantly the time to do a "make regress", as more tests are running.
We need to run both *with* and *without* --check-models, since that option disables certain preprocessing.
To turn off these extra tests during a make regress, you can set CVC4_REGRESSION_ARGS=--no-check-models.
To turn off the extra test for a *particular* regression benchmark, you can put this in the benchmark:
; COMMAND-LINE: --no-check-models
That might be necessary in e.g. nonlinear arithmetic benchmarks.
(this commit was certified error- and warning-free by the test-and-commit script.)
Morgan Deters [Sat, 10 Nov 2012 16:41:01 +0000 (16:41 +0000)]
Updates to Clark's commit r4540:
* ALL_SUPPORTED/QF_ALL_SUPPORTED don't include nonlinear
* Change "Notice" to "Warning" when produce-models turned off due to non-linear
(this commit was certified error- and warning-free by the test-and-commit script.)
Morgan Deters [Sat, 10 Nov 2012 16:08:37 +0000 (16:08 +0000)]
fix typo in language bindings
Clark Barrett [Sat, 10 Nov 2012 04:34:34 +0000 (04:34 +0000)]
Finally tracked down problems in regressions and fuzz results (this also
explains why my build was giving different answers from Dejan's build).
Problem was that if you run:
cvc4 --check-models foo.smt
it would fail, but if you run
cvc4 --check-models --produce-models foo.smt
it would succeed. Even though produce-models is supposed to be automatically
set when you set check-models, it seems this was happening too late. Fixed by
removing any distinction between produce-models and check-models in the
heuristic setting code. Kind of ugly though.
Also, disable models if nonlinear arithmetic is on.
Morgan Deters [Fri, 9 Nov 2012 21:25:07 +0000 (21:25 +0000)]
TheoryEngineModelBuilder::buildModel() is only called once with fullModel=true, within a SAT context. This fixes some outstanding model bugs.
Committing also a Clark-provided assertion the Model code to ensure the call is only done once per context.
(this commit was certified error- and warning-free by the test-and-commit script.)
Kshitij Bansal [Fri, 9 Nov 2012 21:11:47 +0000 (21:11 +0000)]
export null nodes (fixes a bug in portfolio model stuff)
Tim King [Fri, 9 Nov 2012 21:05:43 +0000 (21:05 +0000)]
Test that breaks arithmetic model building due to disequality terms.
Tim King [Fri, 9 Nov 2012 19:58:00 +0000 (19:58 +0000)]
Arithmetic problem that fails --check-models due incompleteness with multiplication.
Morgan Deters [Fri, 9 Nov 2012 19:18:58 +0000 (19:18 +0000)]
Bug-fix for a crash involving improperly-thrown exceptions; also, add LogicException for errors where the user uses a feature not permitted in the current logic (e.g., a quantifier in a QF logic)
Morgan Deters [Fri, 9 Nov 2012 18:41:24 +0000 (18:41 +0000)]
In non-linear logics, rewrite DIVISION, INTS_DIVISION, and INTS_MODULUS into ITEs of the form:
IF (denom = 0) THEN divByZero(num) ELSE (DIVISION_TOTAL num denom) ENDIF
where divByZero is an uninterpreted function symbol (there's one for each of the partial operators).
In linear logics, don't do any of this.
Bitvector partial functions to come, if this is successful for Tim.
(this commit was certified error- and warning-free by the test-and-commit script.)
Morgan Deters [Fri, 9 Nov 2012 17:39:05 +0000 (17:39 +0000)]
another DISTCLEANFILES entry, for proper "make distclean" behavior (fixes "distclean" target error last night)
Clark Barrett [Fri, 9 Nov 2012 03:18:00 +0000 (03:18 +0000)]
Fix for another model assertion failure
Tim King [Thu, 8 Nov 2012 23:54:18 +0000 (23:54 +0000)]
Turns on TheoryUF when non-linear arithmetic is turned on. Adds test cases for division by 0.
Morgan Deters [Thu, 8 Nov 2012 22:16:26 +0000 (22:16 +0000)]
fix "make distcheck"
Morgan Deters [Thu, 8 Nov 2012 21:53:14 +0000 (21:53 +0000)]
Review of trunk r4525 (TypeNode::getBaseType()):
* fixed TypeNode::getBaseType() for predicate subtypes
* added Type::getBaseType() for public interface
* added unit testing
To avoid confusion, also:
* renamed PredicateType::getBaseType() to "getParentType()"
* renamed TypeNode::getSubtypeBaseType() to "getSubtypeParentType()"
(this commit was certified error- and warning-free by the test-and-commit script.)
Tim King [Thu, 8 Nov 2012 21:25:27 +0000 (21:25 +0000)]
Improved support for division by zero. This adds the *_TOTAL kinds and uninterpreted functions for division by 0.
Morgan Deters [Thu, 8 Nov 2012 21:08:58 +0000 (21:08 +0000)]
exception fix
Clark Barrett [Thu, 8 Nov 2012 12:22:06 +0000 (12:22 +0000)]
Fixed two small bugs in model generation
Clark Barrett [Thu, 8 Nov 2012 12:21:43 +0000 (12:21 +0000)]
Added getBaseType - Morgan please check
Andrew Reynolds [Thu, 8 Nov 2012 00:07:22 +0000 (00:07 +0000)]
added support for parametric datatypes in smt2 parser, includes support for 'as' qualifier
Morgan Deters [Wed, 7 Nov 2012 20:34:09 +0000 (20:34 +0000)]
* Type ascription bug fixed (resolves bug 432), but there are others I discovered (still outstanding). :-(
* Fix a documentation-building problem when building from tarballs (fixes distcheck build failure last night)
* Provide expected output for arith regression 'mod.01.smt2'
* Also, fix a compiler warning in inst_gen.cpp
(this commit was certified error- and warning-free by the test-and-commit script.)
Tim King [Wed, 7 Nov 2012 19:43:34 +0000 (19:43 +0000)]
Fix to a bug in integer mod lemmas.
Morgan Deters [Tue, 6 Nov 2012 20:24:46 +0000 (20:24 +0000)]
fix issue in compatibility layer that could segfault
Tim King [Mon, 5 Nov 2012 23:52:22 +0000 (23:52 +0000)]
Fix to the context dependent static learning code.
Morgan Deters [Mon, 5 Nov 2012 23:21:37 +0000 (23:21 +0000)]
fixes for replacement function library
Morgan Deters [Mon, 5 Nov 2012 22:53:04 +0000 (22:53 +0000)]
fixes for mac os
Morgan Deters [Mon, 5 Nov 2012 22:34:33 +0000 (22:34 +0000)]
fix for tarball building (fixes debian and distcheck problems in nightly builds)
Andrew Reynolds [Fri, 2 Nov 2012 20:54:11 +0000 (20:54 +0000)]
more minor updates to inst gen and representative selection, clean up of equality query
Andrew Reynolds [Wed, 31 Oct 2012 00:54:24 +0000 (00:54 +0000)]
cleaning up some of the equality query stuff, implemented a new representative selection strategy for quantifier instantiation
Dejan Jovanović [Tue, 30 Oct 2012 23:22:07 +0000 (23:22 +0000)]
delta of a model-building failure case
Andrew Reynolds [Mon, 29 Oct 2012 21:49:41 +0000 (21:49 +0000)]
more updates and minor bug fixes for fmf/inst-gen quantifier instantiation
Clark Barrett [Mon, 29 Oct 2012 18:25:48 +0000 (18:25 +0000)]
Tweak to options configuration for turning off minisat elimination when models are on
Clark Barrett [Mon, 29 Oct 2012 13:50:54 +0000 (13:50 +0000)]
Disable minisat elimination when models are on
Clark Barrett [Mon, 29 Oct 2012 13:50:34 +0000 (13:50 +0000)]
Disable some array optimizations when models are on
Clark Barrett [Mon, 29 Oct 2012 02:30:36 +0000 (02:30 +0000)]
auflia directory missing from regression summary - fixed
Morgan Deters [Fri, 26 Oct 2012 23:32:38 +0000 (23:32 +0000)]
Fix to subrange type enumerator, and its unit test. Resolves bug 436.
(this commit was certified error- and warning-free by the test-and-commit script.)
Andrew Reynolds [Fri, 26 Oct 2012 22:19:20 +0000 (22:19 +0000)]
bug fix for parametric datatypes, previously datatypes theory/rewriter was not recognizing parametric datatype types as being datatype types
Tim King [Fri, 26 Oct 2012 21:14:58 +0000 (21:14 +0000)]
Fix for bug 430. d_delta in PartialModel was never being computed. (Delta remained at its initial non-sensical value of -1.) There was a problem with guarding d_delta with d_deltaIsSafe in PartialModel.
Morgan Deters [Fri, 26 Oct 2012 20:49:57 +0000 (20:49 +0000)]
build options sources into distribution tarballs (in the same way that antlr grammars are pre-generated for tarballs). this speeds up user builds by not requiring them to run the mkoptions script (unless they change an options meta-file). i've tested this, but let me know if there are any problems you encounter.
Morgan Deters [Fri, 26 Oct 2012 20:31:30 +0000 (20:31 +0000)]
new boost.m4 makes boost-thread require boost-system. relax this dependence (since it doesn't appear to affect us?!), and make it non-fatal anyway, since threads aren't strictly required for all cvc4 builds. give a warning.
Morgan Deters [Fri, 26 Oct 2012 20:13:28 +0000 (20:13 +0000)]
better parametric datatype arity checking; fixes bug 433
Clark Barrett [Fri, 26 Oct 2012 19:54:06 +0000 (19:54 +0000)]
Fixed a failing datatype regression with check-models
ACSYS [Fri, 26 Oct 2012 18:15:32 +0000 (18:15 +0000)]
today's build system fix: sometimes examples weren't built with "make examples"; fixed
Andrew Reynolds [Fri, 26 Oct 2012 17:18:14 +0000 (17:18 +0000)]
fixed bug in datatypes decision procedure enforcing rewriting of incorrectly applied selector terms, this effects two regression test where TCC fails, using --disable-dt-rewrite-error-sel changes answer of both regression tests
Clark Barrett [Fri, 26 Oct 2012 02:37:38 +0000 (02:37 +0000)]
More bug fixes and more checks for models
ACSYS [Thu, 25 Oct 2012 19:56:39 +0000 (19:56 +0000)]
last build system fix for now: fix some typos affecting Mac
Morgan Deters [Thu, 25 Oct 2012 19:47:29 +0000 (19:47 +0000)]
extra quoting for special character
ACSYS [Thu, 25 Oct 2012 19:44:52 +0000 (19:44 +0000)]
more minor fixes to build system
Morgan Deters [Thu, 25 Oct 2012 16:26:24 +0000 (16:26 +0000)]
One of my changes to the build system yesterday broke the nightly build because:
1. The source tree was configured.
2. The builds directory was removed.
3. The source tree was re-configured.
Which led to a nasty dangling symlink that caused (3) to abort.
Fixed.
Andrew Reynolds [Wed, 24 Oct 2012 23:20:10 +0000 (23:20 +0000)]
fixed assertion failures in efficient e-matching
Morgan Deters [Wed, 24 Oct 2012 22:24:34 +0000 (22:24 +0000)]
Includes many fixes to build system for Solaris (thanks Tim!), and also
just in general, and some documentation adjustments.
Tim King [Wed, 24 Oct 2012 21:46:34 +0000 (21:46 +0000)]
Updated the ArithStaticLearner to be user context dependent.
Tim King [Wed, 24 Oct 2012 21:28:52 +0000 (21:28 +0000)]
Fix for systems that do not have the MAP_FILE macro defined.
Dejan Jovanović [Wed, 24 Oct 2012 19:41:33 +0000 (19:41 +0000)]
fix for bug 429
* not all asserted units were tracked in the user trail, moved the tracking into uncheckedEnqueue
Dejan Jovanović [Wed, 24 Oct 2012 19:14:01 +0000 (19:14 +0000)]
two smaller random pure LRA push-pop cases that fail
dejan@church:~/workspace/fuzz/problems$ ./check.sh arith_lra_01.smt2
z3: sat sat sat sat sat sat sat sat sat unsat sat sat sat sat sat unsat sat
cvc4: sat sat sat sat sat sat sat sat sat unsat sat sat sat sat sat unsat unsat
dejan@church:~/workspace/fuzz/problems$ ./check.sh arith_lra_02.smt2
z3: sat sat sat sat sat sat sat sat sat sat sat sat sat sat sat unsat unsat sat
cvc4: sat sat sat sat sat sat sat sat sat sat sat sat sat sat sat unsat unsat unsat
Andrew Reynolds [Wed, 24 Oct 2012 01:06:15 +0000 (01:06 +0000)]
efficient e-matching now specific to rewrite rules
Andrew Reynolds [Tue, 23 Oct 2012 23:40:29 +0000 (23:40 +0000)]
more major cleanup of quantifiers code, separating rewrite-rules-specific code from quantifiers-specific code
Andrew Reynolds [Tue, 23 Oct 2012 22:27:38 +0000 (22:27 +0000)]
fixed problem with datatypes giving incorrect explanations, now corrected and improved. this update fixes bug 428, also changes the result for 2 benchmarks where tcc in cvc3 fails (cvc4 had previously had been answering correctly by accident).
Clark Barrett [Tue, 23 Oct 2012 20:05:38 +0000 (20:05 +0000)]
More debugging info, small changes to model builder
Morgan Deters [Tue, 23 Oct 2012 20:04:18 +0000 (20:04 +0000)]
some fixes for "make examples" and "make install-examples" when invoked from tarballs (non-subversion-checkouts); should fix "INSTALL" failure we saw in last night's build email
Clark Barrett [Tue, 23 Oct 2012 20:02:56 +0000 (20:02 +0000)]
Added reads that were missing in collectModelInfo
Liana Hadarean [Tue, 23 Oct 2012 19:46:55 +0000 (19:46 +0000)]
fixed TheoryBV collectModel info to check for shared terms; this seems to fix bug424
Tim King [Tue, 23 Oct 2012 19:41:12 +0000 (19:41 +0000)]
The contrib/get-antlr-3.4 script:
- Has no outdated reference to /usr/share/java/stringtemplate.jar (as discussed on the mailing list).
- Attempts to determine if the computer is 64 or 32 bit and configure antlr appropriately.
- Warns the user about it's guess.
- Tells the user how to correct an incorrect guess.
Andrew Reynolds [Tue, 23 Oct 2012 15:28:24 +0000 (15:28 +0000)]
more updates to inst gen: fixed partial instantiations, recognize duplicate defaults for uf
Morgan Deters [Mon, 22 Oct 2012 20:09:08 +0000 (20:09 +0000)]
fix parser generation in distributed tarballs (should fix bug #427)
Morgan Deters [Mon, 22 Oct 2012 20:01:54 +0000 (20:01 +0000)]
one more incorrect #line fixed
Morgan Deters [Mon, 22 Oct 2012 18:58:01 +0000 (18:58 +0000)]
fix misleading comment in example
Morgan Deters [Mon, 22 Oct 2012 18:38:42 +0000 (18:38 +0000)]
fix installation of certain header files
Morgan Deters [Mon, 22 Oct 2012 18:04:31 +0000 (18:04 +0000)]
add bug 425 models regression; fix mac-build execute permission
Tim King [Fri, 19 Oct 2012 19:26:31 +0000 (19:26 +0000)]
Fix for model building with shared terms for arithmetic.
(this commit was certified error- and warning-free by the test-and-commit script.)
Kshitij Bansal [Fri, 19 Oct 2012 19:10:42 +0000 (19:10 +0000)]
Fix problem with incremental with portfolio. Fixes bug 420.
(this commit was certified error- and warning-free by the test-and-commit script.)
Liana Hadarean [Fri, 19 Oct 2012 18:38:54 +0000 (18:38 +0000)]
BV theory model fix
Kshitij Bansal [Fri, 19 Oct 2012 00:56:11 +0000 (00:56 +0000)]
--fallback-sequential / --no-fallback-sequential option
closes bug 419, fix typo, fix warning
(this commit was certified error- and warning-free by the test-and-commit script.)
Andrew Reynolds [Wed, 17 Oct 2012 02:59:07 +0000 (02:59 +0000)]
first working version of new inst-gen-style quantifier instantiation technique for fmf (--fmf-new-inst-gen), minor cleanup
Andrew Reynolds [Tue, 16 Oct 2012 21:59:50 +0000 (21:59 +0000)]
more cleanup of quantifiers code
Andrew Reynolds [Tue, 16 Oct 2012 17:10:47 +0000 (17:10 +0000)]
first draft of new inst gen method (still with bugs), some cleanup of quantifiers code
Morgan Deters [Sun, 14 Oct 2012 00:08:52 +0000 (00:08 +0000)]
fix #line number warnings (sorry!)
Clark Barrett [Fri, 12 Oct 2012 21:36:06 +0000 (21:36 +0000)]
Added assertions and tracing code for collectModelInfo phase
Clark Barrett [Fri, 12 Oct 2012 12:38:54 +0000 (12:38 +0000)]
Latest changes to model code
Morgan Deters [Thu, 11 Oct 2012 21:17:12 +0000 (21:17 +0000)]
Fix bug 421, again, and add a second, independent test case for the same
with --check-models (which caused the same bug, for a different reason,
due to some unintended interaction between the checkModel() function and
the UserContext, which rolled back the Model object. (Groan...)
(this commit was certified error- and warning-free by the test-and-commit script.)
Morgan Deters [Thu, 11 Oct 2012 17:32:45 +0000 (17:32 +0000)]
minor changes in wording for "cvc4 --version", and point to the COPYING file for full info
Morgan Deters [Thu, 11 Oct 2012 17:06:16 +0000 (17:06 +0000)]
Standardizing copyright notice. Touches **ALL** sources, guys, sorry.. it's
just the header comments at the top, though. Don't update to this rev if
you don't have time for a complete rebuild, and exclude this rev if you
want to see what's new across a range of commits.
(this commit was certified error- and warning-free by the test-and-commit script.)
Morgan Deters [Thu, 11 Oct 2012 13:19:09 +0000 (13:19 +0000)]
Fix wording on GPL in legal notices; also remove an unnecessary source dependence.
(this commit was certified error- and warning-free by the test-and-commit script.)
Morgan Deters [Thu, 11 Oct 2012 12:15:59 +0000 (12:15 +0000)]
compliance note
Morgan Deters [Wed, 10 Oct 2012 21:20:40 +0000 (21:20 +0000)]
Abstract values for SMT-LIB.
Also fix bug 421 relating to incrementality and models.
(this commit was certified error- and warning-free by the test-and-commit script.)
Andrew Reynolds [Wed, 10 Oct 2012 19:24:37 +0000 (19:24 +0000)]
cleanup up some static data members in the quantifiers code
Dejan Jovanović [Wed, 10 Oct 2012 19:07:16 +0000 (19:07 +0000)]
fixing the cvc bv parser and typechecker
Kshitij Bansal [Tue, 9 Oct 2012 22:24:35 +0000 (22:24 +0000)]
typo
Kshitij Bansal [Tue, 9 Oct 2012 22:23:32 +0000 (22:23 +0000)]
bugfix: isQuantified, bugfix: flush
Andrew Reynolds [Tue, 9 Oct 2012 21:59:58 +0000 (21:59 +0000)]
fixed datatypes rewriter to detect clashes between non-datatype subfields. cleaned up model code, TheoryModel::getValue is now const.
Morgan Deters [Tue, 9 Oct 2012 20:22:01 +0000 (20:22 +0000)]
* make Model class private (as discussed at meeting today)
* fix minor issue with s-expr parsing in CVC and SMT grammars
* other minor things
(this commit was certified error- and warning-free by the test-and-commit script.)
Liana Hadarean [Tue, 9 Oct 2012 20:05:46 +0000 (20:05 +0000)]
fixed bv rewriter to evaluate bvurem over constants
Clark Barrett [Tue, 9 Oct 2012 19:22:17 +0000 (19:22 +0000)]
More fixes to model code
Andrew Reynolds [Tue, 9 Oct 2012 17:44:02 +0000 (17:44 +0000)]
made datatypes rewrite incorrect selectors to ground term. this feature can be turned off by --disable-dt-rewrite-error-sel. changed regression answer to reflect new default behavior.
Morgan Deters [Tue, 9 Oct 2012 16:54:02 +0000 (16:54 +0000)]
usability: remove --no-interactive from --smtlib option
Dejan Jovanović [Tue, 9 Oct 2012 14:23:19 +0000 (14:23 +0000)]
fix for bug 415
Morgan Deters [Tue, 9 Oct 2012 13:22:28 +0000 (13:22 +0000)]
* Add assertion in TheoryModel code to ensure we don't get inconsistent
substitutions for solved variables. Related to bug 418 (and might
resolve it).
* Respect phase-locking in Minisat (one phase-saving site was unguarded).
(this commit was certified error- and warning-free by the test-and-commit script.)