Liana Hadarean [Wed, 20 Mar 2013 02:09:55 +0000 (22:09 -0400)]
merged master with dejan's constant evaluating equality engine
Liana Hadarean [Wed, 20 Mar 2013 01:54:22 +0000 (21:54 -0400)]
inequality reasoning works on small examples added to regressions (not incremental); currently disabled though
Dejan Jovanović [Wed, 20 Mar 2013 01:10:27 +0000 (21:10 -0400)]
Adding evaluation of constant terms to the equality engine. Evaluation on a particular kind can be set by setting interpreted = true when calling addFunctionKind.
Morgan Deters [Tue, 12 Feb 2013 04:56:10 +0000 (23:56 -0500)]
Minor cleanup of sources
Morgan Deters [Fri, 8 Feb 2013 15:57:38 +0000 (10:57 -0500)]
Fixes for miplib-trick application (and a new testcase)
Morgan Deters [Thu, 31 Jan 2013 19:29:58 +0000 (14:29 -0500)]
Remove PropositionalQuery class and all CUDD-related build stuff (and references)
Morgan Deters [Tue, 19 Mar 2013 19:07:46 +0000 (15:07 -0400)]
Minor fixes to build system
Liana Hadarean [Tue, 19 Mar 2013 18:25:56 +0000 (14:25 -0400)]
added the cpp file for the inequality graph
Liana Hadarean [Tue, 19 Mar 2013 04:51:17 +0000 (00:51 -0400)]
implementing more inequality graph stuff; work in progress doesn't compile
lianah [Mon, 18 Mar 2013 23:10:47 +0000 (19:10 -0400)]
more work on inequality reasoning for bv
lianah [Sat, 16 Mar 2013 19:48:51 +0000 (15:48 -0400)]
started work on the inequality bv subtheory
Morgan Deters [Fri, 15 Mar 2013 17:30:05 +0000 (13:30 -0400)]
Boolean terms rewriting for quantified variables of type Bool, when quantifier body uses them in term context
Morgan Deters [Fri, 15 Mar 2013 16:34:58 +0000 (12:34 -0400)]
Merge branch '1.0.x'
Morgan Deters [Fri, 15 Mar 2013 16:34:52 +0000 (12:34 -0400)]
fix up build system for swig (
d242c30 introduced a subtle error)
Andrew Reynolds [Fri, 15 Mar 2013 14:15:23 +0000 (09:15 -0500)]
changed default option for quantifier instantiation
Morgan Deters [Thu, 14 Mar 2013 21:27:19 +0000 (17:27 -0400)]
Merge branch '1.0.x'
Morgan Deters [Thu, 14 Mar 2013 21:23:43 +0000 (17:23 -0400)]
Fix warning (line annotation)
Morgan Deters [Thu, 14 Mar 2013 21:16:02 +0000 (17:16 -0400)]
fix to build system: #include the proper file when they are in both builds and src
Clark Barrett [Thu, 14 Mar 2013 00:37:57 +0000 (20:37 -0400)]
Added a rewrite for iff:
x = c iff x = d ---> false
This fixes Andy's problem if unconstrained simplification is turned on.
lianah [Wed, 13 Mar 2013 17:44:33 +0000 (13:44 -0400)]
post failed attempts at getting the incremental solver to work
Andrew Reynolds [Mon, 11 Mar 2013 21:29:22 +0000 (16:29 -0500)]
ite removal option for quantifiers --ite-remove-quant, e-matching for boolean terms, improvement for pre skolemization
Morgan Deters [Fri, 22 Feb 2013 21:48:13 +0000 (16:48 -0500)]
Disallow overflow in bitvector literals (parser only)
* For example, (_ bv5 1) is now an error instead of being silently truncated.
* Probably inappropriate for 1.0.x because it changes exception specifications.
lianah [Wed, 6 Mar 2013 21:35:38 +0000 (16:35 -0500)]
more slicer changes for incremental
Clark Barrett [Wed, 6 Mar 2013 19:17:43 +0000 (14:17 -0500)]
Best heuristics for handling decision requests from arrays
Andrew Reynolds [Wed, 6 Mar 2013 16:46:07 +0000 (10:46 -0600)]
fixed two bugs for the new E-matching implementation, added aggressive miniscoping option --ag-miniscope-quant, minor cleanup
Morgan Deters [Tue, 5 Mar 2013 22:49:25 +0000 (17:49 -0500)]
Merge branch '1.0.x'
Conflicts:
src/smt/smt_engine.cpp
Morgan Deters [Tue, 5 Mar 2013 00:58:09 +0000 (19:58 -0500)]
Bugfix for SmtEngine: proper unsubscribing for NodeManager events
Morgan Deters [Fri, 1 Mar 2013 23:28:22 +0000 (18:28 -0500)]
Merge branch '1.0.x'
Morgan Deters [Tue, 26 Feb 2013 21:41:56 +0000 (16:41 -0500)]
Bug fix for rep-set.
(Cherry-picked from commit
c71ec27 in master.)
Morgan Deters [Fri, 22 Feb 2013 15:52:46 +0000 (10:52 -0500)]
Fix for quantifiers containing Boolean terms.
lianah [Tue, 26 Feb 2013 21:02:52 +0000 (16:02 -0500)]
Merge branch '1.0.x'
lianah [Tue, 26 Feb 2013 20:50:48 +0000 (15:50 -0500)]
Merge branch '1.0.x' of https://github.com/CVC4/CVC4 into 1.0.x
lianah [Tue, 26 Feb 2013 20:50:37 +0000 (15:50 -0500)]
fix for bv crash in incremental mode; this is a temporary fix for bug 493
Andrew Reynolds [Sun, 24 Feb 2013 22:37:46 +0000 (16:37 -0600)]
added option --model-u-dt-enum for outputting uninterpreted sorts as datatype enumerations + minor update to array rewriter to improve output for this option, minor refactoring of representative selection for quantifier instantiation, initial draft of disequality propagation option --uf-ss-deq-prop, other refactoring of uf strong solver, fixed bug 496, improvement for fmf enumeration of finite built-in sorts
Morgan Deters [Sat, 16 Feb 2013 20:35:16 +0000 (15:35 -0500)]
Single -q quiets messages/warnings. Double -qq silences sat/unsat output too.
Morgan Deters [Wed, 20 Feb 2013 23:09:59 +0000 (18:09 -0500)]
Some exception specification fixes in SmtEngine/Command infrastructure
Morgan Deters [Mon, 18 Feb 2013 16:04:43 +0000 (11:04 -0500)]
Fix for gitinfo (resolves bug 399).
Kshitij Bansal [Sun, 17 Feb 2013 04:57:57 +0000 (23:57 -0500)]
Merge branch '1.0.x'
Kshitij Bansal [Sun, 17 Feb 2013 04:56:22 +0000 (23:56 -0500)]
gitinfo modifications fix
Kshitij Bansal [Sun, 17 Feb 2013 03:28:14 +0000 (19:28 -0800)]
Merge pull request #6 from kbansal/decNewoptions
decision/ code refactoring
Kshitij Bansal [Sun, 17 Feb 2013 01:52:03 +0000 (20:52 -0500)]
decision: jh: more refactoring (.h->.cpp, xor/iff)
Kshitij Bansal [Sun, 17 Feb 2013 00:58:07 +0000 (19:58 -0500)]
decision/ : jh: refactor embedded ITE, other minor
other minor: cleanup some remaning fragments of GiveUpException(),
hopefully all is gone now.
Kshitij Bansal [Sun, 17 Feb 2013 00:22:31 +0000 (19:22 -0500)]
decision/: justification: refactor ITE out
Kshitij Bansal [Sat, 16 Feb 2013 23:19:02 +0000 (18:19 -0500)]
refactoring justification_heuristic code
Kshitij Bansal [Wed, 13 Feb 2013 21:39:51 +0000 (16:39 -0500)]
rm decision jh GiveUp related code
Morgan Deters [Fri, 15 Feb 2013 16:19:08 +0000 (11:19 -0500)]
Some cleanup and copyright updating
* update some copyrights for 2013
* cleaned up some comments/ifdefs, indentation
* some spelling corrections
* add some missing makefiles
Morgan Deters [Sat, 16 Feb 2013 20:22:14 +0000 (15:22 -0500)]
Merge branch '1.0.x'
Morgan Deters [Fri, 25 Jan 2013 22:11:44 +0000 (17:11 -0500)]
Fix version identification for new git repository.
Morgan Deters [Fri, 15 Feb 2013 20:16:23 +0000 (15:16 -0500)]
Fix typo in error message
Kshitij Bansal [Fri, 15 Feb 2013 22:21:00 +0000 (17:21 -0500)]
Merge branch '1.0.x'
Kshitij Bansal [Fri, 15 Feb 2013 22:10:50 +0000 (17:10 -0500)]
prvs commit: lower warning to notice
Signed-off-by: Kshitij Bansal <kshitij@cs.nyu.edu>
Kshitij Bansal [Fri, 15 Feb 2013 21:43:30 +0000 (16:43 -0500)]
Merge branch '1.0.x'
Kshitij Bansal [Fri, 15 Feb 2013 20:54:04 +0000 (15:54 -0500)]
make incremental+portfolio experimental
Kshitij Bansal [Fri, 15 Feb 2013 21:40:29 +0000 (13:40 -0800)]
Merge pull request #5 from kbansal/1.0.x
make incremental+portfolio experimental
Kshitij Bansal [Fri, 15 Feb 2013 20:54:04 +0000 (15:54 -0500)]
make incremental+portfolio experimental
Morgan Deters [Fri, 15 Feb 2013 17:37:50 +0000 (12:37 -0500)]
Merge branch '1.0.x'
Morgan Deters [Fri, 15 Feb 2013 17:00:29 +0000 (12:00 -0500)]
Fix builds/ links to survive configuring twice with different prefixes
Morgan Deters [Fri, 15 Feb 2013 16:48:24 +0000 (11:48 -0500)]
Fix ECHO command in CVC language parser to not output quotation marks
Tim King [Fri, 15 Feb 2013 16:35:34 +0000 (11:35 -0500)]
Merge branch '1.0.x'
Tianyi Liang [Thu, 14 Feb 2013 05:12:04 +0000 (23:12 -0600)]
repairs a bug in rewriterule engine: constructor cannot be used as a pattern
(cherry picked from commit
c33a1abc78bcd51f3f95562b117498caf252cafc)
Signed-off-by: Morgan Deters <mdeters@cs.nyu.edu>
Dejan Jovanović [Thu, 14 Feb 2013 22:10:20 +0000 (14:10 -0800)]
Merge pull request #4 from tiliang/master
a bugfix in rewriting rules
Tim King [Thu, 14 Feb 2013 21:11:42 +0000 (16:11 -0500)]
Removing BVDebug and replacing with Debug.
Tianyi Liang [Thu, 14 Feb 2013 05:12:04 +0000 (23:12 -0600)]
repairs a bug in rewriterule engine: constructor cannot be used as a pattern
lianah [Thu, 14 Feb 2013 00:20:23 +0000 (19:20 -0500)]
started working on incremental slicer - not compiling
Morgan Deters [Wed, 13 Feb 2013 04:04:53 +0000 (23:04 -0500)]
Fix a preprocessing performance issue.
lianah [Mon, 11 Feb 2013 17:33:28 +0000 (12:33 -0500)]
undid the caching that actually hurt performance
Morgan Deters [Fri, 8 Feb 2013 22:23:32 +0000 (17:23 -0500)]
Fix user-values in SMT-LIB v1.2
Morgan Deters [Fri, 8 Feb 2013 00:03:09 +0000 (19:03 -0500)]
Merge branch '1.0.x'
Conflicts:
src/theory/quantifiers/theory_quantifiers.cpp
Morgan Deters [Thu, 7 Feb 2013 21:18:08 +0000 (16:18 -0500)]
Only put quantifier assertions in model equality engine if fullModel==true
Morgan Deters [Fri, 1 Feb 2013 23:00:12 +0000 (18:00 -0500)]
Significant work on bug #491 (not yet closed).
Morgan Deters [Fri, 21 Dec 2012 23:44:34 +0000 (18:44 -0500)]
More complete fix for bug 484 (includes fixes for records and tuples).
Morgan Deters [Thu, 7 Feb 2013 20:34:23 +0000 (15:34 -0500)]
Fix error in tuple type-checking.
Morgan Deters [Thu, 7 Feb 2013 20:28:20 +0000 (15:28 -0500)]
Make --default-dag-thresh apply to stringstreams
Morgan Deters [Thu, 7 Feb 2013 18:58:22 +0000 (13:58 -0500)]
Do not install the "private-library" header
Morgan Deters [Thu, 7 Feb 2013 02:30:35 +0000 (21:30 -0500)]
make datatypes enumerator behavior clearer (no exceptions in normal operation)
Morgan Deters [Thu, 7 Feb 2013 02:30:35 +0000 (21:30 -0500)]
make datatypes enumerator behavior clearer (no exceptions in normal operation)
Morgan Deters [Tue, 5 Feb 2013 21:39:30 +0000 (16:39 -0500)]
Merge branch '1.0.x'
Morgan Deters [Tue, 5 Feb 2013 21:30:17 +0000 (16:30 -0500)]
Fix a compiler warning in NodeBuilder
Kshitij Bansal [Tue, 5 Feb 2013 21:24:02 +0000 (16:24 -0500)]
Merge remote-tracking branch 'origin/1.0.x'
Kshitij Bansal [Tue, 5 Feb 2013 21:08:13 +0000 (13:08 -0800)]
Merge pull request #3 from kbansal/1.0.x
decision/ : save d_prvsIndex in JH
Morgan Deters [Tue, 5 Feb 2013 21:03:43 +0000 (16:03 -0500)]
Merge branch '1.0.x'
Morgan Deters [Tue, 5 Feb 2013 20:25:38 +0000 (15:25 -0500)]
remove now-unnecessary wrappers from Type interface
Morgan Deters [Tue, 5 Feb 2013 21:00:02 +0000 (16:00 -0500)]
Fix to miplib trick to make it less "cautious" and apply in more cases
Kshitij Bansal [Wed, 30 Jan 2013 16:59:59 +0000 (11:59 -0500)]
decision/ : save d_prvsIndex in JH
Morgan Deters [Tue, 5 Feb 2013 19:28:52 +0000 (14:28 -0500)]
dos2unix conversion for a number of files; this avoids spurious conflicts when merging to master
Andrew Reynolds [Tue, 5 Feb 2013 07:35:21 +0000 (01:35 -0600)]
More improvements for E-matching
Liana Hadarean [Tue, 5 Feb 2013 05:49:39 +0000 (00:49 -0500)]
Added path compression and caching for getBaseDecomposition.
lianah [Tue, 5 Feb 2013 02:16:55 +0000 (21:16 -0500)]
Fixing regression failure. The only unfixed ones seem model related which would require some graph coloring algorithm.
Morgan Deters [Mon, 4 Feb 2013 23:11:40 +0000 (18:11 -0500)]
Merge branch '1.0.x'
Morgan Deters [Mon, 4 Feb 2013 23:11:09 +0000 (18:11 -0500)]
Fix NodeBuilder bug which could attempt to allocate beyond hard limit
Morgan Deters [Wed, 30 Jan 2013 23:55:44 +0000 (18:55 -0500)]
driver::totalTime statistic is now reported correctly on crashes, too
Morgan Deters [Mon, 4 Feb 2013 22:30:18 +0000 (17:30 -0500)]
fixed files with DOS newlines; fixed contrib/ scripts to use git
Morgan Deters [Mon, 4 Feb 2013 21:01:17 +0000 (16:01 -0500)]
Some fixes for the miplib preprocessing pass.
* TNode violation bug fix (thanks to Tim King for discovery & fix)
* change Boolean miplib-trick substitution option into a threshold
* ppAssert() the generated miplib constraints to arithmetic
Morgan Deters [Mon, 4 Feb 2013 21:24:33 +0000 (16:24 -0500)]
Printing commands as they're executed now requires verbosity 3+
Morgan Deters [Mon, 4 Feb 2013 18:53:16 +0000 (13:53 -0500)]
Merge branch '1.0.x'
Morgan Deters [Mon, 4 Feb 2013 18:52:45 +0000 (13:52 -0500)]
Model no longer adds subterms of quantifiers to equality engine, this fixed bug 492 and resolves previous issue for bug 486.
(cherry picked from *part* of commit
e54c0f73712b25f1d6d49a3817c923eea077da81)
Signed-off-by: Morgan Deters <mdeters@cs.nyu.edu>
Andrew Reynolds [Mon, 4 Feb 2013 06:08:32 +0000 (00:08 -0600)]
Model no longer adds subterms of quantifiers to equality engine, this fixed bug 492 and resolves previous issue for bug 486.\n Multiple improvements for E-matching: do not choose multi-triggers if single triggers exist, only create multi-triggers that contain all variables, consider multiple terms per equivalence class but only add one instantiation per round per (trigger,term) pair.\nImprovements for strong solver: make use of sort inference information when choosing splits, check for cliques eagerly when disequalities are asserted.
Morgan Deters [Sun, 3 Feb 2013 21:05:37 +0000 (16:05 -0500)]
Some cleanup of miplib regressions and options
Morgan Deters [Sun, 3 Feb 2013 20:57:01 +0000 (15:57 -0500)]
Merge from mdeters/miplib branch (commit '
ce7c485182902ae43871057185095f71f74a8a58')
Morgan Deters [Sun, 3 Feb 2013 20:37:04 +0000 (15:37 -0500)]
new option for doing top-level miplib substitutions (or not)