Tim King [Mon, 12 May 2014 17:08:53 +0000 (13:08 -0400)]
Merging in additional glpk options and statistics from CAV submission.
Tianyi Liang [Mon, 12 May 2014 03:14:46 +0000 (22:14 -0500)]
Merge branch 'master' of github.com:tiliang/CVC4
Tianyi Liang [Mon, 12 May 2014 03:13:17 +0000 (22:13 -0500)]
Replace lemma sending with EQ assertions. Fix a typo in hex_to_int function.
Tianyi Liang [Mon, 12 May 2014 03:13:17 +0000 (22:13 -0500)]
Replace lemma sending with EQ assertions. Fix a typo in hex_to_int function.
Andrew Reynolds [Sun, 11 May 2014 19:36:50 +0000 (14:36 -0500)]
More preparation for CASC proofs. Minor fix for sort inference (rewrite new assertions). Bug fix for ambqi : simplify correctly for multi-sorted case. Bug fix for fmc : only do exh-simplification for uninterpreted sorts, ensure reps are enumerated for quantification over Real.
Andrew Reynolds [Sat, 10 May 2014 20:14:34 +0000 (15:14 -0500)]
Bug fixes to CBQI. Add first draft of CASC j7 TFF script. Add regression, minor changes.
Morgan Deters [Fri, 9 May 2014 15:11:31 +0000 (11:11 -0400)]
Fix for example installation.
Andrew Reynolds [Fri, 9 May 2014 21:53:57 +0000 (16:53 -0500)]
Initial draft of run scripts for CASC j7
Andrew Reynolds [Fri, 9 May 2014 11:51:43 +0000 (06:51 -0500)]
Add variable ordering to ambqi. Bug fix to macros. More preparation for CASC proofs.
ajreynol [Thu, 8 May 2014 16:18:53 +0000 (18:18 +0200)]
Major simplifications to macros module.
Andrew Reynolds [Thu, 8 May 2014 13:13:05 +0000 (08:13 -0500)]
Fixes to quantifiers rewriter to prevent miniscoping nested quantifiers. Minor fixes to ambqi. Preparation for CASC proof output. Add NNF option.
Andrew Reynolds [Thu, 8 May 2014 07:18:54 +0000 (02:18 -0500)]
Basic optimizations for ambqi : only normalize UF applied to variables, direct handling of NOT
Dejan Jovanovic [Thu, 8 May 2014 06:26:42 +0000 (23:26 -0700)]
Adding encoding of sha1 collision for the hashing example
Tianyi Liang [Thu, 8 May 2014 00:32:03 +0000 (19:32 -0500)]
patch to the last commit: add a single character case
Tianyi Liang [Wed, 7 May 2014 20:49:09 +0000 (15:49 -0500)]
fix a bug in contain
Tianyi Liang [Wed, 7 May 2014 19:45:57 +0000 (14:45 -0500)]
Merge branch 'master' of github.com:tiliang/CVC4
Tianyi Liang [Wed, 7 May 2014 19:43:42 +0000 (14:43 -0500)]
add splits
Tianyi Liang [Wed, 7 May 2014 19:43:42 +0000 (14:43 -0500)]
add splits
Andrew Reynolds [Wed, 7 May 2014 18:36:58 +0000 (13:36 -0500)]
Fixes to ambqi, now solution-sound.
Andrew Reynolds [Tue, 6 May 2014 13:19:04 +0000 (08:19 -0500)]
First draft of ambqi_builder (new implementation of MBQI based on disjoint sets).
Tianyi Liang [Tue, 6 May 2014 01:17:31 +0000 (20:17 -0500)]
fix a bug in replace and contains
Tianyi Liang [Mon, 5 May 2014 23:01:14 +0000 (18:01 -0500)]
add constant regular expression check for intersection.
Tim King [Mon, 5 May 2014 21:20:38 +0000 (17:20 -0400)]
Improving documentation for glpk-cut-log switch.
Morgan Deters [Mon, 5 May 2014 18:10:10 +0000 (14:10 -0400)]
Valuation::entailmentCheck() proxy for TheoryEngine version. Signature and contract is the same as for TheoryEngine version.
Morgan Deters [Fri, 2 May 2014 23:22:26 +0000 (19:22 -0400)]
Fix typo in bitvectors example; thanks to Adam Gashlin for reporting the issue.
Andrew Reynolds [Fri, 2 May 2014 21:25:56 +0000 (16:25 -0500)]
Simplification of EqualityEngine::areDisequal. Comparison for production : church.cims.nyu.edu/regress-results/compare_jobs.php?job_id=6444&reference_id=6445&p=5. Comparison for debug : http://church.cims.nyu.edu/regress-results/compare_jobs.php?job_id=6449&reference_id=6446&p=5.
ajreynol [Fri, 2 May 2014 12:45:09 +0000 (14:45 +0200)]
Fix assertion from previous commit.
Andrew Reynolds [Fri, 2 May 2014 12:11:08 +0000 (07:11 -0500)]
Add option --dt-stc-ind for strengthening skolemization. Refactor skolemization.
ajreynol [Fri, 2 May 2014 08:57:51 +0000 (10:57 +0200)]
More minor optimizations for datatypes.
ajreynol [Thu, 1 May 2014 11:28:56 +0000 (13:28 +0200)]
Minor optimizations to datatypes, revert to checkClash not mod eq. Minor clean up.
Kshitij Bansal [Thu, 1 May 2014 04:04:21 +0000 (00:04 -0400)]
Merge remote-tracking branch 'upstream/master' into sets
Kshitij Bansal [Wed, 30 Apr 2014 20:09:32 +0000 (16:09 -0400)]
decision engine: cache start index for and/or nodes
This is done only in "hard" case. Limited testing has not shown
improvement in the "easy" case.
This was triggerred by a benchmark sent by andy/viktor.
performance comparison notes for the change on wiki
http://church.cims.nyu.edu/wiki/User:Kshitij/decisioncacheindex
Tim King [Wed, 30 Apr 2014 21:28:00 +0000 (17:28 -0400)]
T-entailment work, and QCF (quant conflict find) work that uses it.
This commit includes work from the past month on the T-entailment check
infrastructure (due to Tim), an entailment check for arithmetic
(also Tim), and QCF work that uses T-entailment (due to Andrew Reynolds).
Signed-off-by: Morgan Deters <mdeters@cs.nyu.edu>
Morgan Deters [Wed, 30 Apr 2014 01:57:16 +0000 (21:57 -0400)]
Fix warnings, cleanup in strings typechecker.
Morgan Deters [Wed, 30 Apr 2014 01:48:49 +0000 (21:48 -0400)]
Fix compiler warning re: TheoryUF destructor.
Morgan Deters [Wed, 30 Apr 2014 01:28:25 +0000 (21:28 -0400)]
Fix simplify output for SMT2 printer.
Morgan Deters [Tue, 29 Apr 2014 22:04:38 +0000 (18:04 -0400)]
Fix for (user) context-dependence of arith TO_INT/IS_INT rewriting and rewrite-divk.
Morgan Deters [Tue, 29 Apr 2014 23:51:29 +0000 (19:51 -0400)]
Mostly resolves bug #561 memory leaks, and more.
Morgan Deters [Tue, 29 Apr 2014 21:57:17 +0000 (17:57 -0400)]
Fix for --force-logic to extend its reach to the parser.
Kshitij Bansal [Tue, 29 Apr 2014 23:38:29 +0000 (19:38 -0400)]
fixed couple of more warnings
Kshitij Bansal [Tue, 29 Apr 2014 23:07:20 +0000 (19:07 -0400)]
fix was compiler warning in antlr_input, crashing test case with the old fix
Morgan Deters [Tue, 29 Apr 2014 22:14:34 +0000 (18:14 -0400)]
Revert a compiler warning fix from
ea6a5a6.
Tianyi Liang [Tue, 29 Apr 2014 21:54:26 +0000 (16:54 -0500)]
fix a typo: --string-exp => --strings-exp; fix a signed int warning in antlr
Tianyi Liang [Tue, 29 Apr 2014 20:32:38 +0000 (15:32 -0500)]
add leading zeros support for str.to.int
ajreynol [Tue, 29 Apr 2014 13:39:11 +0000 (15:39 +0200)]
Significantly improve performance for producing datatypes models.
Kshitij Bansal [Mon, 28 Apr 2014 23:11:59 +0000 (19:11 -0400)]
Merge remote-tracking branch 'upstream/master' into sets
Tianyi Liang [Mon, 28 Apr 2014 22:38:56 +0000 (17:38 -0500)]
Merge branch 'master' of github.com:tiliang/CVC4
Tianyi Liang [Mon, 28 Apr 2014 21:29:27 +0000 (16:29 -0500)]
add strings-opt2 for regular splitting
Kshitij Bansal [Mon, 28 Apr 2014 22:18:24 +0000 (18:18 -0400)]
cleanup
Tianyi Liang [Mon, 28 Apr 2014 22:21:25 +0000 (17:21 -0500)]
minor change with kshitij's change
Kshitij Bansal [Mon, 28 Apr 2014 22:18:07 +0000 (18:18 -0400)]
nodemanager robust skolem numbering
Tianyi Liang [Mon, 28 Apr 2014 21:29:27 +0000 (16:29 -0500)]
add strings-opt2 for regular splitting
Kshitij Bansal [Mon, 28 Apr 2014 18:11:14 +0000 (14:11 -0400)]
Merge pull request #25 from kbansal/sets
Sets
Andrew Reynolds [Mon, 28 Apr 2014 17:28:16 +0000 (12:28 -0500)]
Preparation for models for co-inductive datatypes. Minor cleanup.
ajreynol [Mon, 28 Apr 2014 15:34:00 +0000 (17:34 +0200)]
Optimizations for datatypes: check for clashes modulo equality. Avoid building model at fullModel=false when possible. Minor cleanup.
Kshitij Bansal [Mon, 28 Apr 2014 15:31:29 +0000 (11:31 -0400)]
minor fix
Kshitij Bansal [Mon, 28 Apr 2014 15:28:25 +0000 (11:28 -0400)]
Merge remote-tracking branch 'upstream/master' into sets
Kshitij Bansal [Mon, 28 Apr 2014 04:20:26 +0000 (00:20 -0400)]
travis, please!
Kshitij Bansal [Fri, 25 Apr 2014 01:35:03 +0000 (21:35 -0400)]
attempt to improve CVC4's "parse error" message
Kshitij Bansal [Sun, 27 Apr 2014 22:41:03 +0000 (18:41 -0400)]
rm undocument/non-working* "feature"
*test of unsigned for negative
Tianyi Liang [Thu, 24 Apr 2014 22:30:15 +0000 (17:30 -0500)]
minor change: add a heuristic for preventing constant splitting.
Kshitij Bansal [Thu, 24 Apr 2014 21:06:43 +0000 (17:06 -0400)]
optimization
ajreynol [Thu, 24 Apr 2014 14:47:46 +0000 (16:47 +0200)]
Avoid assigning constructor terms to 1-constructor datatype eqcs, when possible, to ensure termination for codatatypes. Minor changes.
Andrew Reynolds [Thu, 24 Apr 2014 12:27:38 +0000 (14:27 +0200)]
Compute care graph for datatypes. Preliminary results show 20x speed up on larger problems. Improve datatypes rewriter.
Andrew Reynolds [Thu, 24 Apr 2014 08:35:08 +0000 (03:35 -0500)]
Add --inst-max-level=N option for Kshitij. Support define-const command in Smt2.
Andrew Reynolds [Tue, 22 Apr 2014 08:16:56 +0000 (03:16 -0500)]
Minor fix to avoid rewriting datatype equalities into non-equalitiers, as required. Add APPLY_UF to congruence types to avoid model construction bugs.
Kshitij Bansal [Sat, 19 Apr 2014 20:44:20 +0000 (16:44 -0400)]
Eh, what?
Kshitij Bansal [Sat, 19 Apr 2014 20:45:13 +0000 (16:45 -0400)]
fix warnings in strings/
Morgan Deters [Thu, 17 Apr 2014 19:16:42 +0000 (15:16 -0400)]
Allow fmf-bound-int to be set with set-option and via API.
Kshitij Bansal [Thu, 17 Apr 2014 17:03:30 +0000 (13:03 -0400)]
simplify mkSkolem naming system: don't use $$
Short summary: By default NODEID is appeneded, just continue doing what you
were, just don't add the _$$ at the end.
Long summary:
Before this commit there were four (yes!) ways to specify the names for new
skolems, which result in names as given below
1) mkSkolem("name", ..., SKOLEM_FLAG_DEFAULT) -> "name_NODEID"
2) mkSkolem("name", ..., SKOLEM_EXACT_NAME) -> "name"
3) mkSkolem("name_$$", ..., SKOLEM_FLAG_DEFAULT) -> "name_NODEID"
4) mkSkolem("na_$$_me", ..., SKOLEM_FLAG_DEFAULT) -> "na_NODEID_me"
After this commit, only 1) and 2) stay.
90% usage is of 1) or 3), which results in exact same behavior (and
looking at the source code it doesn't look like everyone realized that
the _$$ is just redundant).
Almost no one used 4), which is the only reason to even have $$. Post this
commit if you really want a number in the middle, manually construct the
name and use the SKOLEM_EXACT_NAME flag.
Kshitij Bansal [Wed, 9 Apr 2014 20:56:56 +0000 (16:56 -0400)]
use internal skolem numbering
Andrew Reynolds [Thu, 17 Apr 2014 09:24:11 +0000 (04:24 -0500)]
Minor refactoring and optimizing.
Andrew Reynolds [Mon, 14 Apr 2014 20:36:28 +0000 (15:36 -0500)]
Fix bug in mbqi=fmc handling theory symbols. Fix mbqi=fmc models (Bug 557). Improve datatypes rewrite, make option for previous dt semantics.
Andrew Reynolds [Mon, 14 Apr 2014 09:28:44 +0000 (04:28 -0500)]
Add initial support for co-datatypes.
Morgan Deters [Fri, 11 Apr 2014 19:30:31 +0000 (15:30 -0400)]
Better support for building with mingw64; thanks to Nicolas Roche @ Altran for the fix.
Morgan Deters [Fri, 11 Apr 2014 00:06:31 +0000 (20:06 -0400)]
setType -> setOfType, resolves bug 556
Morgan Deters [Thu, 10 Apr 2014 22:34:44 +0000 (18:34 -0400)]
Fix the build; --check-proof works for UF but not for the new UFC logic.
Andrew Reynolds [Thu, 10 Apr 2014 20:50:56 +0000 (15:50 -0500)]
Expand definitions in theory datatypes, now has the expected semantics for incorrectly applied selector terms.
Morgan Deters [Thu, 10 Apr 2014 20:38:37 +0000 (16:38 -0400)]
Boolean terms conversion fix for datatypes, fixes a problem Andy discovered on his branch.
Tianyi Liang [Thu, 10 Apr 2014 17:57:38 +0000 (12:57 -0500)]
Merge branch 'master' of github.com:tiliang/CVC4
Tianyi Liang [Thu, 10 Apr 2014 17:56:53 +0000 (12:56 -0500)]
minor fix for strings
Tianyi Liang [Thu, 10 Apr 2014 17:56:53 +0000 (12:56 -0500)]
minor fix for strings
Andrew Reynolds [Thu, 10 Apr 2014 15:31:47 +0000 (10:31 -0500)]
Add support for cardinality constraints logic UFC. Add regressions in fmf/. Fix datatypes E-matching bug. Change defaults : mbqi=fmc, decision heuristic stoponly=false for quantified logics, decision=justification for ALL_SUPPORTED, full-saturate-quant=false. Minor fix for fmc models. Add infrastructure to datatypes to prepare for next commit.
Kshitij Bansal [Thu, 10 Apr 2014 13:29:58 +0000 (09:29 -0400)]
refactor .travis.yml
Kshitij Bansal [Wed, 9 Apr 2014 22:07:32 +0000 (18:07 -0400)]
Merge pull request #24 from kbansal/sets-model
sets, misc
Morgan Deters [Wed, 9 Apr 2014 15:18:18 +0000 (11:18 -0400)]
Minor change to better support parameterized partial/total kinds (for upcoming datatypes work).
Andrew Reynolds [Wed, 9 Apr 2014 21:12:19 +0000 (16:12 -0500)]
Revert E-matching datatypes fix.
Andrew Reynolds [Wed, 9 Apr 2014 20:43:37 +0000 (15:43 -0500)]
Handle fmf.card as input from user, add support in SMT2 parser, as requested by Martin Brain. Fix two minor bugs : E-matching with datatypes, instantiation caching with incremental.
Kshitij Bansal [Wed, 9 Apr 2014 18:35:37 +0000 (14:35 -0400)]
fix get-info error-behavior
Kshitij Bansal [Wed, 9 Apr 2014 18:04:26 +0000 (14:04 -0400)]
add tests
Kshitij Bansal [Wed, 9 Apr 2014 18:03:35 +0000 (14:03 -0400)]
fix
Kshitij Bansal [Wed, 9 Apr 2014 17:46:00 +0000 (13:46 -0400)]
prep for fix
Kshitij Bansal [Wed, 9 Apr 2014 16:21:07 +0000 (12:21 -0400)]
try foreach on CD datastructure
Kshitij Bansal [Wed, 9 Apr 2014 15:35:41 +0000 (11:35 -0400)]
inputs to trigger bug
Kshitij Bansal [Tue, 8 Apr 2014 19:06:38 +0000 (15:06 -0400)]
more
Kshitij Bansal [Tue, 8 Apr 2014 14:29:02 +0000 (10:29 -0400)]
some debugging changes
Kshitij Bansal [Sun, 6 Apr 2014 23:46:34 +0000 (19:46 -0400)]
Merge branch 'master' of https://github.com/CVC4/CVC4
Tim King [Sun, 6 Apr 2014 22:57:53 +0000 (18:57 -0400)]
Reduced example from pcc's bug report.
Tim King [Sun, 6 Apr 2014 22:41:32 +0000 (18:41 -0400)]
Merge pull request #21 from pcc/ite-fix
Fix for ite of >=64bit wide bitvectors with unconstrained condition.
Kshitij Bansal [Sun, 6 Apr 2014 10:25:08 +0000 (06:25 -0400)]
fix for hiding prompt/header in shell, error-behavior options as in SMTLIB