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
Morgan Deters [Wed, 13 Feb 2013 04:04:53 +0000 (23:04 -0500)]
Fix a preprocessing performance issue.
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
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)
Morgan Deters [Fri, 1 Feb 2013 23:05:39 +0000 (18:05 -0500)]
extended miplib trick to 6 vars, should work on pp miplib examples now
Morgan Deters [Tue, 29 Jan 2013 22:39:12 +0000 (17:39 -0500)]
new miplib pass, works for 1 or 2 vars
Morgan Deters [Thu, 31 Jan 2013 19:29:12 +0000 (14:29 -0500)]
Remove old miplibtrick from arith static learner
Morgan Deters [Wed, 30 Jan 2013 20:43:33 +0000 (15:43 -0500)]
correct output language bug with --dump-to
Morgan Deters [Fri, 1 Feb 2013 14:17:46 +0000 (09:17 -0500)]
Merge branch '1.0.x'
Morgan Deters [Fri, 1 Feb 2013 13:31:34 +0000 (08:31 -0500)]
Fix a tuple attribute bug that was causing model-generation problems for tuples
Morgan Deters [Thu, 31 Jan 2013 23:30:48 +0000 (18:30 -0500)]
Merge branch '1.0.x'
Morgan Deters [Thu, 31 Jan 2013 21:54:22 +0000 (16:54 -0500)]
Fix a small problem in clang builds due to namespaces and symbol lookup
Morgan Deters [Thu, 31 Jan 2013 21:54:22 +0000 (16:54 -0500)]
Fix a small problem in clang builds due to namespaces and symbol lookup
Tim King [Thu, 31 Jan 2013 21:34:12 +0000 (16:34 -0500)]
Adding a heuristic to more eagerly split bounded integer variables.
Morgan Deters [Wed, 30 Jan 2013 20:43:33 +0000 (15:43 -0500)]
correct output language bug with --dump-to
Andrew Reynolds [Tue, 29 Jan 2013 06:07:52 +0000 (00:07 -0600)]
currently disabling bug486 regression. we need to discuss getValue/collectModelInfo for quantifiers more.
Andrew Reynolds [Tue, 29 Jan 2013 05:19:12 +0000 (23:19 -0600)]
fix for finite model finding caused by new collectModelInfo code
Morgan Deters [Mon, 28 Jan 2013 20:26:41 +0000 (15:26 -0500)]
Updated NEWS for recent changes.
Morgan Deters [Mon, 28 Jan 2013 20:21:52 +0000 (15:21 -0500)]
Fixes for Win32 (closes bugs 488 and 489)
* timer statistics now supported (closes bug 488)
* use of --mmap doesn't crash anymore (closes bug 489)
Morgan Deters [Mon, 28 Jan 2013 16:53:01 +0000 (11:53 -0500)]
Merge branch '1.0.x'
Morgan Deters [Fri, 25 Jan 2013 20:57:54 +0000 (15:57 -0500)]
Fix the regression test for bug 486, and enable it
(cherry-picked from master
23b4fd82d1ed326cd57e9bc57ef9fab98b0b1c87)
Morgan Deters [Fri, 25 Jan 2013 20:57:54 +0000 (15:57 -0500)]
Fix the regression test for bug 486, and enable it
Andrew Reynolds [Mon, 28 Jan 2013 07:57:20 +0000 (01:57 -0600)]
made QuantifiersEngine::d_inst_match_trie and QuantifiersEngine::d_lemmas_produced user-level context dependent. this fixes bug 486
(cherry-picked from master
c5d1a5d8f898bf22c6bbc98f1d484b07706c035b)
Morgan Deters [Mon, 28 Jan 2013 14:30:12 +0000 (09:30 -0500)]
some fixes for win32, including ability to "make check" win32 builds via wine
Andrew Reynolds [Mon, 28 Jan 2013 07:57:20 +0000 (01:57 -0600)]
made QuantifiersEngine::d_inst_match_trie and QuantifiersEngine::d_lemmas_produced user-level context dependent. this fixes bug 486
Andrew Reynolds [Sun, 27 Jan 2013 17:35:22 +0000 (11:35 -0600)]
some fixes for Intel benchmarks regarding quantifiers and datatypes, datatypes theory still crashes for datatypes with boolean subfields
(cherry picked from master
bcbf52ffbe0416ecf70bdb644017c338c0540793)
Andrew Reynolds [Sun, 27 Jan 2013 17:35:22 +0000 (11:35 -0600)]
some fixes for Intel benchmarks regarding quantifiers and datatypes, datatypes theory still crashes for datatypes with boolean subfields
Morgan Deters [Sun, 27 Jan 2013 02:11:36 +0000 (21:11 -0500)]
Merge branch '1.0.x'
Morgan Deters [Sun, 27 Jan 2013 02:09:55 +0000 (21:09 -0500)]
another fix for quantifier models (related to bug 486)
Morgan Deters [Fri, 25 Jan 2013 22:06:02 +0000 (17:06 -0500)]
fix --check-model --finite-model-find when used together (related to bug 486)
Morgan Deters [Fri, 25 Jan 2013 20:16:43 +0000 (15:16 -0500)]
Fix errors and reduce warnings on clang (merge from mdeters/clang)
Morgan Deters [Fri, 25 Jan 2013 22:06:02 +0000 (17:06 -0500)]
fix --check-model --finite-model-find when used together (related to bug 486)
Morgan Deters [Tue, 18 Dec 2012 20:33:43 +0000 (15:33 -0500)]
Add win32 support (merge from mdeters/win32, with some cleanup).
Tim King [Wed, 23 Jan 2013 21:35:16 +0000 (16:35 -0500)]
Adding miplibtrick option.
Tim King [Wed, 23 Jan 2013 21:34:07 +0000 (16:34 -0500)]
Adding substitution size cap.
Morgan Deters [Wed, 23 Jan 2013 22:07:11 +0000 (17:07 -0500)]
Merge branch '1.0.x'
Conflicts:
NEWS
Morgan Deters [Wed, 23 Jan 2013 22:04:43 +0000 (17:04 -0500)]
fix to workaround ANTLR 3.2 issue with initialization
Morgan Deters [Wed, 23 Jan 2013 22:00:56 +0000 (17:00 -0500)]
partially address bug 486: allow some model inspection of quantifiers
Morgan Deters [Wed, 23 Jan 2013 22:00:56 +0000 (17:00 -0500)]
partially address bug 486: allow some model inspection of quantifiers
Morgan Deters [Wed, 23 Jan 2013 21:11:55 +0000 (16:11 -0500)]
update NEWS file
Morgan Deters [Wed, 23 Jan 2013 20:53:31 +0000 (15:53 -0500)]
add user patterns to the Smt1 parser; update NEWS file
Morgan Deters [Tue, 22 Jan 2013 23:03:56 +0000 (18:03 -0500)]
Merge branch '1.0.x'
Morgan Deters [Tue, 22 Jan 2013 23:03:46 +0000 (18:03 -0500)]
fix for theory preprocessing cache on clang, perhaps others.
Morgan Deters [Tue, 22 Jan 2013 17:29:01 +0000 (12:29 -0500)]
Merge branch '1.0.x'
Morgan Deters [Tue, 22 Jan 2013 17:28:45 +0000 (12:28 -0500)]
update ANTLR URLs (antlr.org -> antlr3.org)
Morgan Deters [Sat, 19 Jan 2013 16:28:10 +0000 (11:28 -0500)]
Merge branch '1.0.x'
Morgan Deters [Sat, 19 Jan 2013 16:27:03 +0000 (11:27 -0500)]
Fix an options-processing bug on some platforms (e.g., MacOS).
Morgan Deters [Tue, 8 Jan 2013 22:56:46 +0000 (17:56 -0500)]
SMT-LIB get-model output now is easier to machine-parse: contains (model...) bracketing
Dejan Jovanović [Sat, 22 Dec 2012 00:14:45 +0000 (19:14 -0500)]
Merge branch '1.0.x'
Dejan Jovanović [Sat, 22 Dec 2012 00:08:26 +0000 (19:08 -0500)]
adding copy constructor for the datatype enumerator
fixes bug 484
Morgan Deters [Tue, 18 Dec 2012 20:52:13 +0000 (15:52 -0500)]
Merge branch '1.0.x'
Morgan Deters [Tue, 18 Dec 2012 20:31:45 +0000 (15:31 -0500)]
Fix bug 483: readline checks must come after Boost checks in configure
Morgan Deters [Sun, 16 Dec 2012 01:58:31 +0000 (20:58 -0500)]
Fix printing of EXISTS in CVC language printer
Morgan Deters [Tue, 18 Dec 2012 20:31:45 +0000 (15:31 -0500)]
Fix bug 483: readline checks must come after Boost checks in configure
Morgan Deters [Sun, 16 Dec 2012 01:58:31 +0000 (20:58 -0500)]
Fix printing of EXISTS in CVC language printer
Tim King [Sat, 15 Dec 2012 02:07:00 +0000 (21:07 -0500)]
Merging in patch from branch '1.0.x'.
Tim King [Sat, 15 Dec 2012 02:04:41 +0000 (21:04 -0500)]
Adding unit test for different versions of division.