Clark Barrett [Wed, 6 Jun 2012 17:49:51 +0000 (17:49 +0000)]
Fixed broken test case, removed one that is a mistake
Morgan Deters [Wed, 6 Jun 2012 17:35:09 +0000 (17:35 +0000)]
unconstrained regressions are now run with "make check", but with --unconstrained-simp option
Morgan Deters [Wed, 6 Jun 2012 16:17:19 +0000 (16:17 +0000)]
Fixing numerous issues with tests and "make dist":
* test/regress/regress0/unconstrained wasn't being distributed. This caused the debian build failure last night. (It still doesn't run on "make check", but had to be distributed properly.)
* Fixing an issue where a test name was longer than 99 characters and couldn't be distributed in the "old" tar format. (Told automake to use a newer tar format.)
Dejan Jovanović [Wed, 6 Jun 2012 16:03:37 +0000 (16:03 +0000)]
disabling a super-expensive assertions to speed up debug runs
Dejan Jovanović [Wed, 6 Jun 2012 06:12:40 +0000 (06:12 +0000)]
Changes to the combination mechanism, lots of details. Not done yet, there are still the AUFBV wrong results, but it seems better.
http://church.cims.nyu.edu/regress-results/compare_jobs.php?job_id=4382&reference_id=4359&p=5
Clark Barrett [Wed, 6 Jun 2012 01:06:15 +0000 (01:06 +0000)]
Fixed problem causing crash at destruction time
Clark Barrett [Tue, 5 Jun 2012 20:40:22 +0000 (20:40 +0000)]
More clean-up
Clark Barrett [Tue, 5 Jun 2012 19:48:30 +0000 (19:48 +0000)]
Fixed a performance issue with unconstrained simplifier
Clark Barrett [Tue, 5 Jun 2012 14:43:11 +0000 (14:43 +0000)]
Adding missing files...
Clark Barrett [Mon, 4 Jun 2012 22:26:40 +0000 (22:26 +0000)]
Added preprocessing pass that propagates unconstrained values - solves all of
the unconstrained examples in QF_AUFBV/brummayerbiere3 - should also help
generally on at least BV and maybe others.
Off by default for now - results are mixed and it's hard to evaluate with so
many existing assertion failures and segfaults - will re-evaluate once those
are fixed
Morgan Deters [Fri, 1 Jun 2012 20:31:24 +0000 (20:31 +0000)]
add a global user-context push/pop in smt engine, just like clark's addition the other day of a push/pop of the sat context
Clark Barrett [Thu, 31 May 2012 17:15:02 +0000 (17:15 +0000)]
Fixed bug in bv: one more case where non-shared equality was getting propagated
Added a global push and pop around solving - fixes an assertion failure when
TNodes are still around in a CDHashMap at destruction time.
Morgan Deters [Thu, 31 May 2012 14:46:38 +0000 (14:46 +0000)]
svn:ignore a parallel-tests driver file that automake deposits in config/
Morgan Deters [Thu, 31 May 2012 14:45:09 +0000 (14:45 +0000)]
pass JAVA_CPPFLAGS properly
Clark Barrett [Wed, 30 May 2012 20:33:40 +0000 (20:33 +0000)]
Added BitwiseEq bitvector rewrite
Added option "--repeat-simp" which repeats nonclausal simplification: 4 times,
twice before ite removal and twice after
Enabled these options (plus ite-simp) on QF_AUFBV, obtaining significant
speedup on dwp examples
Clark Barrett [Wed, 30 May 2012 16:16:18 +0000 (16:16 +0000)]
Fixed problem with array queue growing too large
Morgan Deters [Wed, 30 May 2012 16:14:56 +0000 (16:14 +0000)]
remove unused/broken check build target
Morgan Deters [Tue, 29 May 2012 23:12:06 +0000 (23:12 +0000)]
removing now-unused TheoryEngine::setLogic() interface function
Clark Barrett [Tue, 29 May 2012 17:56:51 +0000 (17:56 +0000)]
Enabled SolveEq bv rewrite
Clark Barrett [Mon, 28 May 2012 16:27:50 +0000 (16:27 +0000)]
Added some BV rewrites, fixed bugs in array theory, made ite simp work with BV
Dejan Jovanović [Sun, 27 May 2012 16:59:01 +0000 (16:59 +0000)]
some reordering to keep invariants
Dejan Jovanović [Sun, 27 May 2012 05:44:13 +0000 (05:44 +0000)]
Committing the work on equality engine, I need to see how it does on the regressions. New additions:
* areDisequal(x, y) -> areDisequal(x, y, needProof): when asking for a disequality you must say needProof if you will ask for an explanation later.
* propagation of shared dis-equalities (not yet complete, once case missing)
* changes to the theories that use it, authors should check up on the changes
Clark Barrett [Sun, 27 May 2012 00:39:27 +0000 (00:39 +0000)]
Another expensive function call in a Debug trace
Clark Barrett [Sun, 27 May 2012 00:38:30 +0000 (00:38 +0000)]
Another expensive function call in a Debug line
Kshitij Bansal [Fri, 25 May 2012 16:45:21 +0000 (16:45 +0000)]
init bug fix
Clark Barrett [Fri, 25 May 2012 00:21:53 +0000 (00:21 +0000)]
Checking in fix for bug 340 - somehow didn't get checked in earlier
Dejan Jovanović [Thu, 24 May 2012 16:03:38 +0000 (16:03 +0000)]
Separating the subtheory implementations in the bitvector theory.
Dejan Jovanović [Thu, 24 May 2012 05:54:39 +0000 (05:54 +0000)]
Significant changes to the internals of the equality engine. Equality is not handled natively and not as a generic predicate. The changes also change the order of propagation, and can produce different conflicts. Since the engine is now used everywhere this means that so some crazy results are to be expected.
Tim King [Tue, 22 May 2012 15:09:03 +0000 (15:09 +0000)]
This commit merges in the branch arithmetic/cprop.
Dejan Jovanović [Mon, 21 May 2012 20:15:52 +0000 (20:15 +0000)]
Updating equality manager to handle tagged trigger terms. Notifications are pushed out for relationships between terms tagged with the same tag. No performance impact.
Morgan Deters [Mon, 21 May 2012 16:33:53 +0000 (16:33 +0000)]
main() no longer catches non-CVC4 exceptions. This means on memout and other C++-level exceptions, we'll exit the C++ way rather than our custom way (so we don't get statistics etc.)
Tim King [Sat, 19 May 2012 17:45:37 +0000 (17:45 +0000)]
Adding regress test for bug 341.
Tim King [Sat, 19 May 2012 17:24:52 +0000 (17:24 +0000)]
- The array type rules were fixed to use isSubtypeOf.
- The type of (kind::DIVISION x y) is RealType.
- A reference to util/pseudoboolean.i was removed.
- rec5.cvc is disabled for now. The type of 2 is Integer which is not a subtype of [0..11].
Tim King [Fri, 18 May 2012 23:48:38 +0000 (23:48 +0000)]
This commit adds TypeNode::leastCommonTypeNode(). The special case for arithmetic in TypeNode::operator==() has been removed. A number of faulty type checking checks were switched to use isSubtypeOf. The resolves bug #339
Tim King [Fri, 18 May 2012 20:20:58 +0000 (20:20 +0000)]
This commit removes the dead psuedoboolean code.
Tim King [Fri, 18 May 2012 16:02:50 +0000 (16:02 +0000)]
Removing long unsigned operator+ from CDList's const_iterator.
Dejan Jovanović [Fri, 18 May 2012 14:24:02 +0000 (14:24 +0000)]
removing failing regression
Tim King [Thu, 17 May 2012 23:00:43 +0000 (23:00 +0000)]
This fixes a fascinating segfault. This is the sequence of events:
1) A restart occurs
2) A shared term is registered to arithmetic.
3) Arithmetic sets this up.
4) No new linear relations are added to arithmetic.
5) Eventually a restart occurs.
6) Arithmetic resets the tableau as it has not had a row added since the last restart.
7) A new variable is added.
8) This exceeds the size of the column vector of the saved tableau by exactly one.
9) segfault
Morgan Deters [Thu, 17 May 2012 20:45:32 +0000 (20:45 +0000)]
Fixing an issue with LogicInfo::isPure() that turned off simplification in QF_UF and maybe others
Liana Hadarean [Thu, 17 May 2012 18:42:13 +0000 (18:42 +0000)]
Fixed bug 338:
- fixed buggy rewrite rules assuming certain nodes only had 2 children
- added support for bv-rewrite dump
- fixed smt2_printer for bv constants
Tim King [Thu, 17 May 2012 15:33:13 +0000 (15:33 +0000)]
Adding failing regression for ite type computation.
Dejan Jovanović [Thu, 17 May 2012 04:34:03 +0000 (04:34 +0000)]
Queueing up asserted literals in the proxy instead of sending them off to the theory engine immediately. The queue is discharged just before a check().
Dejan Jovanović [Wed, 16 May 2012 19:28:25 +0000 (19:28 +0000)]
adding simple-minded handling of (dis-)equalities where constants are involved
Morgan Deters [Wed, 16 May 2012 18:20:09 +0000 (18:20 +0000)]
Fixing C compatibility library (it still had a reference to CONST_INTEGER).
This hopefully fixes the Debian build.
Dejan Jovanović [Wed, 16 May 2012 17:54:16 +0000 (17:54 +0000)]
testcase for bug 337
Dejan Jovanović [Wed, 16 May 2012 17:53:41 +0000 (17:53 +0000)]
Changes to SAT solver:
* allowing propagation of false literals (handles conflict)
* allowing lemmas during BCP (bug 337)
* UF does direct propagation, without checking for literal value anymore
Dejan Jovanović [Wed, 16 May 2012 16:18:52 +0000 (16:18 +0000)]
equality status for bitvectors can now look into the sat solver to check for IN_MODEL status
Dejan Jovanović [Wed, 16 May 2012 16:01:48 +0000 (16:01 +0000)]
removing duplicate literals in explanations of propagations
Liana Hadarean [Wed, 16 May 2012 15:21:18 +0000 (15:21 +0000)]
refactored TheoryBV bitblaster and equality engine into subtheories (similar to TheoryEngine
Liana Hadarean [Tue, 15 May 2012 22:02:47 +0000 (22:02 +0000)]
fixed QF_BV performance problem due to using CDList instead of CDQueue
Dejan Jovanović [Tue, 15 May 2012 21:58:36 +0000 (21:58 +0000)]
Dejan Jovanović [Tue, 15 May 2012 21:58:09 +0000 (21:58 +0000)]
test cases
Tim King [Tue, 15 May 2012 21:20:56 +0000 (21:20 +0000)]
Fix to shared terms visitor.
Morgan Deters [Tue, 15 May 2012 19:28:18 +0000 (19:28 +0000)]
Implement TypeNode::isComparableTo() and add a unit test for it.
Clark Barrett [Tue, 15 May 2012 19:24:09 +0000 (19:24 +0000)]
Fixed several bugs in shared terms database
Tim King [Tue, 15 May 2012 19:01:19 +0000 (19:01 +0000)]
This commit removes the CONST_INTEGER kind from nodes. This code comes from the branch arithmetic/remove_const_int.
Liana Hadarean [Tue, 15 May 2012 18:53:54 +0000 (18:53 +0000)]
renamed bv_sat.h, bv_sat.cpp to bitblaster.h, bitblaster.cpp respectively
Morgan Deters [Tue, 15 May 2012 18:47:20 +0000 (18:47 +0000)]
removing all extended commands (as inspired by the Z3 extended command set) except for declare-datatypes
Morgan Deters [Tue, 15 May 2012 18:22:14 +0000 (18:22 +0000)]
Fix QF_AUFLIA (resolves bug #331).
Dejan Jovanović [Tue, 15 May 2012 14:22:34 +0000 (14:22 +0000)]
fixing warnings, grr
Liana Hadarean [Tue, 15 May 2012 00:11:07 +0000 (00:11 +0000)]
several bug fixes: in TheoryBV::NotifyClass missing NOT in predicate notify and now term notify handles boolean constants; fixed bug 328
Dejan Jovanović [Mon, 14 May 2012 20:57:12 +0000 (20:57 +0000)]
fixes for shared term registration. previously the type was not considered when looking at theories of the term and for a term like
read(a, f(x))
the term f(x) would not be registered to arithmetic in AUFLIA. this fixies the issue of bug 330 and moves it to some other assertion fail.
Clark Barrett [Mon, 14 May 2012 19:33:15 +0000 (19:33 +0000)]
Fixed assertion failures in array theory
This fixes bugs 335 and 333.
Morgan Deters [Mon, 14 May 2012 19:10:39 +0000 (19:10 +0000)]
in debug builds, -d can be used for trace tags that aren't also debug tags
Dejan Jovanović [Mon, 14 May 2012 15:13:05 +0000 (15:13 +0000)]
fixing up preregistration again
Dejan Jovanović [Sun, 13 May 2012 15:51:27 +0000 (15:51 +0000)]
fixing build warnings
Morgan Deters [Fri, 11 May 2012 20:13:28 +0000 (20:13 +0000)]
fix regex in Debug_tags and Trace_tags generation for Mac OS
Morgan Deters [Fri, 11 May 2012 19:59:04 +0000 (19:59 +0000)]
fix typo in sed line
Morgan Deters [Fri, 11 May 2012 19:11:56 +0000 (19:11 +0000)]
output a warning message when a function type (or datatype, or array, etc.) is created with a Boolean term inside it
Clark Barrett [Fri, 11 May 2012 15:20:05 +0000 (15:20 +0000)]
Disabled arith-rewrite-equalities by default unless in a pure arithmetic theory
Clark Barrett [Fri, 11 May 2012 14:00:27 +0000 (14:00 +0000)]
Added some ITE rewrites,
Added ITE simplifier - on by default only for QF_LIA benchmarks
Fixed one bug in arrays
Added negate() to node.h - it returns kind == NOT ? kind[0] : kind.notNode()
Tim King [Fri, 11 May 2012 01:29:11 +0000 (01:29 +0000)]
Partially fixes something-like-a-problem with TheoryArith::getDeltaValue().
Tim King [Thu, 10 May 2012 14:50:45 +0000 (14:50 +0000)]
Removing now unneeded (as of r3425) typenames from EqualityEngine. trunk now compiles on Debian.
Morgan Deters [Wed, 9 May 2012 22:40:48 +0000 (22:40 +0000)]
fix an issue which breaks language bindings (so this commit fixes debian nightly builds)
Morgan Deters [Wed, 9 May 2012 21:52:38 +0000 (21:52 +0000)]
--disable-tracing at configure time now disables Trace() and Debug() gestures both.
Dejan Jovanović [Wed, 9 May 2012 21:25:17 +0000 (21:25 +0000)]
* simplifying equality engine interface
* notifications are now through the interface subclass instead of a template
* notifications include constants being merged
* changed contextNotifyObj::notify to contextNotifyObj::contextNotifyPop so it's more descriptive and doesn't clutter methods when subclassed
* sat solver now has explicit methods to make true and false constants
* 0-level literals are removed from explanations of propagations
Kshitij Bansal [Wed, 9 May 2012 21:09:31 +0000 (21:09 +0000)]
rm something for a future merge that sneaked in
(gets rid of warning)
Kshitij Bansal [Wed, 9 May 2012 05:45:36 +0000 (05:45 +0000)]
Merge from decision branch (ITE support)
Major changes from last merge
* ITEs supported
* Don't share theory lemmas to DE, only assertions
Should probably be noted that 'make regress' doesn't quite
pass with --decision=justification. Throws off search in couple
of arith benchmarks.
No serious performance changes expected. Keep an eye.
Dejan Jovanović [Wed, 9 May 2012 03:31:50 +0000 (03:31 +0000)]
Fixing the debug tags generation and related methods in configuration.cpp that disallowed me to debug my bugs by reporting that the debug tag doesn't exists, where in fact it was in the code.
1) The grep and sed for tags wasn't picking up on .isOn("tag")
2) The isDebugTag a) didn't take a parameter b) was using binary search using strcmp which is non-portable and didn't work for tags including special characters
Morgan should vet this, since there is some crazy sed stuff going on
Liana Hadarean [Tue, 8 May 2012 21:54:55 +0000 (21:54 +0000)]
Merging in bvprop branch, with proper bit-vector propagation.
This should also fix bug 325.
Tim King [Mon, 7 May 2012 22:17:35 +0000 (22:17 +0000)]
Fixing a bug with TheoryArith::ppAssert() and shared terms.
Tim King [Mon, 7 May 2012 22:06:07 +0000 (22:06 +0000)]
Fixes a sign bug in the DioSolver.
Clark Barrett [Fri, 4 May 2012 17:18:02 +0000 (17:18 +0000)]
Guard for expensive Debug trace
François Bobot [Fri, 4 May 2012 14:28:08 +0000 (14:28 +0000)]
options: fail if the debug or trace tag specified doesn't exist (-d -t)
François Bobot [Fri, 4 May 2012 14:28:00 +0000 (14:28 +0000)]
fix: getNumTraceTags, getNumDebugTags
Tim King [Fri, 4 May 2012 03:03:34 +0000 (03:03 +0000)]
- This fixes a problem where simplex produced the same conflict in the single check call.
- This increases the number of substitutions that ppAssert can solve on integer equations.
Dejan Jovanović [Thu, 3 May 2012 20:18:18 +0000 (20:18 +0000)]
Some cleanup starting off from trying to understand the sharing code. Changes include
* fixed term visitor from the bvprop branch
* removed all the warnings from builds -- warnings are there to be noted *NOT* to be used as scribbles
* moved the LogicInfo into the theory constructor
Clark Barrett [Wed, 2 May 2012 00:44:40 +0000 (00:44 +0000)]
Changing d_sharedTermsExist to logicInfo.isSharingEnabled()
Clark Barrett [Mon, 30 Apr 2012 14:42:28 +0000 (14:42 +0000)]
Added map from skolem variables to new ite formulas in ite removal.
d_sharedTermsExist is now set based on logicInfo instead of dynamically when
shared terms are found.
Morgan Deters [Sat, 28 Apr 2012 01:12:21 +0000 (01:12 +0000)]
New LogicInfo functionality.
src/theory/logic_info.{h,cpp} contains the CVC4::LogicInfo class, which keeps
track of which theories are active (which should remain constant throughout
the life of an SmtEngine) and other details (like integers, reals,
linear/nonlinear, etc.).
This class has a default constructor which is the most all-inclusive logic.
Alternatively, this class can be constructed from an SMT-LIB logic string
(the empty string gives the same as "QF_SAT"). Once constructed, theories
can be enabled or disabled, quantifiers flipped on and off, integers flipped
on and off, etc. At any point an SMT-LIB-like logic string can be extracted.
The SmtEngine keeps a LogicInfo for itself and shares with the TheoryEngine
(and, in turn, the theories) only a const reference to it. This ensures that
the logic info doesn't mutate over the course of the run.
As part of this commit, the TheoryEngine's old notion of "active theories"
has been completely removed. As a result, SMT benchmarks that are incorrectly
tagged with a logic will assert-fail or worse. (We should probably fail
more gracefully in this case.) One such example was bug303.smt2,
which used UF reasoning but was tagged QF_LIA. This has been fixed.
Morgan Deters [Sat, 28 Apr 2012 00:49:10 +0000 (00:49 +0000)]
require boost library (but not the threading support---that's only necessary for portfolio)
Morgan Deters [Sat, 28 Apr 2012 00:17:03 +0000 (00:17 +0000)]
undo, again
Morgan Deters [Sat, 28 Apr 2012 00:15:52 +0000 (00:15 +0000)]
adding THEORY_QUANTIFIERS and THEORY_REWRITERULES to the theory enumeration manually; this will make the LogicInfo commit coming up much easier to integrate into trunk, and will anyway be cleaned up when quantifiers2 branch is merged into trunk.
Morgan Deters [Fri, 27 Apr 2012 23:04:32 +0000 (23:04 +0000)]
undo previous commit (as it will break a number of things without additional support I haven't yet committed)
Morgan Deters [Fri, 27 Apr 2012 23:03:33 +0000 (23:03 +0000)]
adding THEORY_QUANTIFIERS and THEORY_REWRITERULES to the theory enumeration manually; this will make the LogicInfo commit coming up much easier to integrate into trunk, and will anyway be cleaned up when quantifiers2 branch is merged into trunk.
Morgan Deters [Fri, 27 Apr 2012 23:01:29 +0000 (23:01 +0000)]
fix parser logic-handling oversights: QF_UFBV should now be supported
Morgan Deters [Fri, 27 Apr 2012 22:07:44 +0000 (22:07 +0000)]
break dependence on zlib-dev for now
Clark Barrett [Fri, 27 Apr 2012 19:26:01 +0000 (19:26 +0000)]
Fixed warning in decision_engine.h, minor tweak to caregraph function in
arrays, fixed bug with equalities between constants in shared terms database
Tim King [Fri, 27 Apr 2012 14:47:10 +0000 (14:47 +0000)]
This merges in the branch cvc4/branches/arithmetic/matrix into trunk.
- Splits the functionality of having a sparse matrix of Ts and a solved matrix of rationals in tableau.
- Splits ArithVarSet into DenseMap and CDDenseSet and simplifies the code.
- No performance loss!
Kshitij Bansal [Wed, 25 Apr 2012 22:33:00 +0000 (22:33 +0000)]
portfolio driver: respect parseOnly option