cvc5.git
11 years agoMerge branch '1.2.x'
Morgan Deters [Mon, 20 May 2013 23:07:03 +0000 (19:07 -0400)]
Merge branch '1.2.x'

Conflicts:
library_versions
src/parser/parser.h

11 years agoFix error reporting on use of (nonlinear) div,mod,/ symbols
Morgan Deters [Fri, 17 May 2013 20:53:21 +0000 (16:53 -0400)]
Fix error reporting on use of (nonlinear) div,mod,/ symbols

11 years agoUpdate THANKS to mention David Cok's contributions.
Morgan Deters [Fri, 17 May 2013 21:13:36 +0000 (17:13 -0400)]
Update THANKS to mention David Cok's contributions.

11 years agoDetect multiply-defined :named annotations and issue an error.
Morgan Deters [Fri, 17 May 2013 22:14:18 +0000 (18:14 -0400)]
Detect multiply-defined :named annotations and issue an error.

Thanks to David Cok for pointing out this issue.

Conflicts:
library_versions

11 years agoFix parsing of SMT-LIBv2 |quoted| symbols that span newlines in interactive mode.
Morgan Deters [Fri, 17 May 2013 21:04:34 +0000 (17:04 -0400)]
Fix parsing of SMT-LIBv2 |quoted| symbols that span newlines in interactive mode.

Thanks to David Cok for raising this issue.

11 years agoCompliance fixes for :named annotations: they must name closed subterms, the names...
Morgan Deters [Fri, 17 May 2013 16:36:54 +0000 (12:36 -0400)]
Compliance fixes for :named annotations: they must name closed subterms, the names must be user-permitted names, etc.

Thanks to David Cok for raising this issue.

11 years agoDon't allow get-model & co after a user push/pop
Morgan Deters [Fri, 17 May 2013 16:03:29 +0000 (12:03 -0400)]
Don't allow get-model & co after a user push/pop

This makes us more strictly adhere to the spec, but it's useful anyway:
previously we would support a get-model until the problem was explicitly
changed with e.g. a new assertion.  That meant you could check-sat, then
pop, then get-model, but you'd only get the part of the model still in
scope.  This is strange, and would likely lead to problems, so it's now
disabled.

Thanks to David Cok for inquiring about this.

11 years agoAs per SMT-LIB standard: make - and xor take n>2 args and be left-assoc; => takes...
Morgan Deters [Fri, 17 May 2013 15:18:12 +0000 (11:18 -0400)]
As per SMT-LIB standard: make - and xor take n>2 args and be left-assoc; => takes n>2 args and is right-assoc.

Thanks to David Cok for pointing out this issue.

11 years agoFix for equality-chaining of Booleans in SMT-LIBv2.
Morgan Deters [Fri, 17 May 2013 15:12:36 +0000 (11:12 -0400)]
Fix for equality-chaining of Booleans in SMT-LIBv2.

Thanks to David Cok for reporting this.

11 years agoFix destruction issue in GetValueCommand leading to crash.
Morgan Deters [Fri, 17 May 2013 14:38:03 +0000 (10:38 -0400)]
Fix destruction issue in GetValueCommand leading to crash.

Thanks to David Cok for reporting this.

11 years agoBetter error on invalid logic strings.
Morgan Deters [Fri, 17 May 2013 14:19:54 +0000 (10:19 -0400)]
Better error on invalid logic strings.

Thanks to David Cok for reporting this issue.

Conflicts:
library_versions

11 years agoBetter error on illegal (pop N); also more compliant SMT-LIB error messages in some...
Morgan Deters [Fri, 17 May 2013 13:54:15 +0000 (09:54 -0400)]
Better error on illegal (pop N); also more compliant SMT-LIB error messages in some places

Thanks to David Cok for reporting these issues.

11 years agoA couple of fixes to the get-option command for compliance with SMT-LIB.
Morgan Deters [Fri, 17 May 2013 13:27:55 +0000 (09:27 -0400)]
A couple of fixes to the get-option command for compliance with SMT-LIB.

Thanks to David Cok for reporting this issue.

11 years agoDisallow construction of (_ BitVec 0).
Morgan Deters [Fri, 17 May 2013 12:59:25 +0000 (08:59 -0400)]
Disallow construction of (_ BitVec 0).

Thanks to David Cok for reporting this issue.

11 years agoFixed "success" response to (push N) / (pop N) with N > 1.
Morgan Deters [Fri, 17 May 2013 12:51:36 +0000 (08:51 -0400)]
Fixed "success" response to (push N) / (pop N) with N > 1.

Thanks to David Cok for reporting this issue.

11 years agoFix to empty response to (get-assignment).
Morgan Deters [Fri, 17 May 2013 12:43:24 +0000 (08:43 -0400)]
Fix to empty response to (get-assignment).

Thanks to David Cok for reporting this issue.

11 years agoconfigure fix for building with glpk on redhat, perhaps others
Morgan Deters [Thu, 16 May 2013 22:55:08 +0000 (18:55 -0400)]
configure fix for building with glpk on redhat, perhaps others

11 years agominor changes to language bindings
Morgan Deters [Thu, 16 May 2013 21:30:13 +0000 (17:30 -0400)]
minor changes to language bindings

11 years agodisable Logic-checking with finite model finding for now, since FMF uses Rationals...
Morgan Deters [Fri, 10 May 2013 21:08:23 +0000 (17:08 -0400)]
disable Logic-checking with finite model finding for now, since FMF uses Rationals, making the check think arithmetic should be enabled (but it's not)

11 years agoFix erroneous results when the logic was incorrectly specified (by throwing LogicExce...
Morgan Deters [Fri, 10 May 2013 17:01:02 +0000 (13:01 -0400)]
Fix erroneous results when the logic was incorrectly specified (by throwing LogicException).  Also correct a case where sharing was doing some work during pure theory solving.

11 years agoPossible final version of run scripts for casc.
Andrew Reynolds [Mon, 20 May 2013 16:06:02 +0000 (11:06 -0500)]
Possible final version of run scripts for casc.

11 years agoAdd model-producing run script for casc.
Andrew Reynolds [Fri, 17 May 2013 23:17:50 +0000 (18:17 -0500)]
Add model-producing run script for casc.

11 years agoAdd support for --dump-models option, in preparation for casc.
Andrew Reynolds [Fri, 17 May 2013 22:40:34 +0000 (17:40 -0500)]
Add support for --dump-models option, in preparation for casc.

11 years agoAs per SMT-LIB standard: make - and xor take n>2 args and be left-assoc; => takes...
Morgan Deters [Fri, 17 May 2013 15:18:12 +0000 (11:18 -0400)]
As per SMT-LIB standard: make - and xor take n>2 args and be left-assoc; => takes n>2 args and is right-assoc.

Thanks to David Cok for pointing out this issue.

11 years agoFix for equality-chaining of Booleans in SMT-LIBv2.
Morgan Deters [Fri, 17 May 2013 15:12:36 +0000 (11:12 -0400)]
Fix for equality-chaining of Booleans in SMT-LIBv2.

Thanks to David Cok for reporting this.

11 years agoFix destruction issue in GetValueCommand leading to crash.
Morgan Deters [Fri, 17 May 2013 14:38:03 +0000 (10:38 -0400)]
Fix destruction issue in GetValueCommand leading to crash.

Thanks to David Cok for reporting this.

11 years agoBetter error on invalid logic strings.
Morgan Deters [Fri, 17 May 2013 14:19:54 +0000 (10:19 -0400)]
Better error on invalid logic strings.

Thanks to David Cok for reporting this issue.

11 years agoBetter error on illegal (pop N); also more compliant SMT-LIB error messages in some...
Morgan Deters [Fri, 17 May 2013 13:54:15 +0000 (09:54 -0400)]
Better error on illegal (pop N); also more compliant SMT-LIB error messages in some places

Thanks to David Cok for reporting these issues.

11 years agoA couple of fixes to the get-option command for compliance with SMT-LIB.
Morgan Deters [Fri, 17 May 2013 13:27:55 +0000 (09:27 -0400)]
A couple of fixes to the get-option command for compliance with SMT-LIB.

Thanks to David Cok for reporting this issue.

11 years agoDisallow construction of (_ BitVec 0).
Morgan Deters [Fri, 17 May 2013 12:59:25 +0000 (08:59 -0400)]
Disallow construction of (_ BitVec 0).

Thanks to David Cok for reporting this issue.

11 years agoFixed "success" response to (push N) / (pop N) with N > 1.
Morgan Deters [Fri, 17 May 2013 12:51:36 +0000 (08:51 -0400)]
Fixed "success" response to (push N) / (pop N) with N > 1.

Thanks to David Cok for reporting this issue.

11 years agoFix to empty response to (get-assignment).
Morgan Deters [Fri, 17 May 2013 12:43:24 +0000 (08:43 -0400)]
Fix to empty response to (get-assignment).

Thanks to David Cok for reporting this issue.

11 years agoconfigure fix for building with glpk on redhat, perhaps others
Morgan Deters [Thu, 16 May 2013 22:55:08 +0000 (18:55 -0400)]
configure fix for building with glpk on redhat, perhaps others

11 years agoFix minor bug in full_model_check.cpp
Andrew Reynolds [Thu, 16 May 2013 21:54:20 +0000 (16:54 -0500)]
Fix minor bug in full_model_check.cpp

11 years agominor changes to language bindings
Morgan Deters [Thu, 16 May 2013 21:30:13 +0000 (17:30 -0400)]
minor changes to language bindings

11 years agoUpdate casc24-fnt run script. Add casc24-fof run script.
Andrew Reynolds [Tue, 14 May 2013 21:42:23 +0000 (16:42 -0500)]
Update casc24-fnt run script.  Add casc24-fof run script.

11 years agoadded some extra options to the bit-vector theory
lianah [Tue, 14 May 2013 20:28:12 +0000 (16:28 -0400)]
added some extra options to the bit-vector theory

11 years agoAdd support for quantifier patterns in smt2 printer.
Andrew Reynolds [Tue, 14 May 2013 20:18:29 +0000 (15:18 -0500)]
Add support for quantifier patterns in smt2 printer.

11 years agoRefactoring to separate old and new model building/checking code.
Andrew Reynolds [Tue, 14 May 2013 17:11:14 +0000 (12:11 -0500)]
Refactoring to separate old and new model building/checking code.

11 years agoPreliminary version of finite model finding over bounded integer quantification....
Andrew Reynolds [Sat, 11 May 2013 22:36:07 +0000 (17:36 -0500)]
Preliminary version of finite model finding over bounded integer quantification. Minor update to casc script.

11 years agodisable Logic-checking with finite model finding for now, since FMF uses Rationals...
Morgan Deters [Fri, 10 May 2013 21:08:23 +0000 (17:08 -0400)]
disable Logic-checking with finite model finding for now, since FMF uses Rationals, making the check think arithmetic should be enabled (but it's not)

11 years agonow proofs print mapping between atom and propositional variable as a comment in...
lianah [Fri, 10 May 2013 22:23:20 +0000 (18:23 -0400)]
now proofs print mapping between atom and propositional variable as a comment in LFSC

11 years agoUpdate casc run script. Work on compliance for SZS output.
Andrew Reynolds [Fri, 10 May 2013 20:18:20 +0000 (15:18 -0500)]
Update casc run script.  Work on compliance for SZS output.

11 years agofixes to the proof system so it works with theory lemmas and explanations
lianah [Fri, 10 May 2013 19:52:37 +0000 (15:52 -0400)]
fixes to the proof system so it works with theory lemmas and explanations

11 years agoFix erroneous results when the logic was incorrectly specified (by throwing LogicExce...
Morgan Deters [Fri, 10 May 2013 17:01:02 +0000 (13:01 -0400)]
Fix erroneous results when the logic was incorrectly specified (by throwing LogicException).  Also correct a case where sharing was doing some work during pure theory solving.

11 years agoAdd documentation for --disable-fmf-inst-gen, which removes a warning
Morgan Deters [Fri, 10 May 2013 16:57:58 +0000 (12:57 -0400)]
Add documentation for --disable-fmf-inst-gen, which removes a warning

11 years agoAdd simplification option --fo-prop-quant. Add model support for new model-checking...
Andrew Reynolds [Fri, 10 May 2013 02:39:03 +0000 (21:39 -0500)]
Add simplification option --fo-prop-quant.  Add model support for new model-checking procedure.  Add run script for casc24-fnt.

11 years agoMerge branch 'master' of ssh://github.com/CVC4/CVC4
Kshitij Bansal [Thu, 9 May 2013 21:47:53 +0000 (17:47 -0400)]
Merge branch 'master' of ssh://github.com/CVC4/CVC4

11 years agoChanging the integer normal form to increase matching.
Tim King [Thu, 9 May 2013 18:33:35 +0000 (14:33 -0400)]
Changing the integer normal form to increase matching.

11 years agoAdd new method for checking candidate models, --fmf-fmc. Add infrastructure for...
Andrew Reynolds [Thu, 9 May 2013 01:02:10 +0000 (20:02 -0500)]
Add new method for checking candidate models, --fmf-fmc.  Add infrastructure for handling bounded integer quantification (quantifiers/bounded_integers.h and .cpp).  Add option for disabling model minimality restriction for finite model finding, --disable-uf-ss-min-model.  Add option for relational triggers such as x = f(y), --relational-trigger.

11 years agorm decision/relevancy
Kshitij Bansal [Sat, 27 Apr 2013 00:30:41 +0000 (20:30 -0400)]
rm decision/relevancy

11 years agoPrerelease versioning for 1.2.x
Morgan Deters [Wed, 8 May 2013 12:07:56 +0000 (08:07 -0400)]
Prerelease versioning for 1.2.x

11 years agoPrerelease versioning for master
Morgan Deters [Wed, 8 May 2013 12:08:49 +0000 (08:08 -0400)]
Prerelease versioning for master

11 years agoMerge tag 'smteval2013'
Morgan Deters [Wed, 8 May 2013 22:13:30 +0000 (18:13 -0400)]
Merge tag 'smteval2013'

11 years agoCutting release 1.2.
Morgan Deters [Wed, 8 May 2013 22:05:08 +0000 (18:05 -0400)]
Cutting release 1.2.

11 years agoRemoving arithmetic compile warning for release
Morgan Deters [Wed, 8 May 2013 21:07:05 +0000 (17:07 -0400)]
Removing arithmetic compile warning for release

11 years agoupdate versioning
Morgan Deters [Tue, 30 Apr 2013 17:59:52 +0000 (13:59 -0400)]
update versioning

11 years agofinal updates for smt-eval script
Morgan Deters [Wed, 8 May 2013 20:51:54 +0000 (16:51 -0400)]
final updates for smt-eval script

11 years agoFixed assertion bug
Clark Barrett [Wed, 8 May 2013 15:25:14 +0000 (11:25 -0400)]
Fixed assertion bug

11 years agofix for smt-eval run script
Morgan Deters [Wed, 8 May 2013 02:12:35 +0000 (22:12 -0400)]
fix for smt-eval run script

11 years agoBV strategy for SMT-EVAL
Morgan Deters [Tue, 7 May 2013 21:38:47 +0000 (17:38 -0400)]
BV strategy for SMT-EVAL

11 years agofix for nonterminating model-based array loop
Morgan Deters [Tue, 7 May 2013 20:59:59 +0000 (16:59 -0400)]
fix for nonterminating model-based array loop

11 years agoadded type checking rule to check for bit-vector constants of size 0
lianah [Tue, 7 May 2013 21:21:58 +0000 (17:21 -0400)]
added type checking rule to check for bit-vector constants of size 0

11 years agoone more fix for rewrites
lianah [Tue, 7 May 2013 20:32:07 +0000 (16:32 -0400)]
one more fix for rewrites

11 years agofixed bv rewrite blow-up
lianah [Tue, 7 May 2013 20:03:56 +0000 (16:03 -0400)]
fixed bv rewrite blow-up

11 years agofix for bug500
Dejan Jovanović [Tue, 7 May 2013 19:01:16 +0000 (15:01 -0400)]
fix for bug500

11 years agoFixes a bug with arithmetic's new attempt solution infrastructure. This caused arith...
Tim King [Tue, 7 May 2013 18:38:46 +0000 (14:38 -0400)]
Fixes a bug with arithmetic's new attempt solution infrastructure.  This caused arithmetic to think it was in a conflict incorrectly. This lead to it not properly responding to new input and lead to an inconsistency bug.

This could be triggered previously by running:
./builds/bin/cvc4 --stats --no-restrict-pivots --enable-miplib-trick --miplib-trick-subs=2 --fc-penalties --collect-pivot-stats --new-prop --dio-decomps --unconstrained-simp --fancy-final /home/taking/benchmarks/smtlib2/QF_LRA/miplib/opt1217--17.smt2

11 years agoImproving arithmetic debugging output.
Tim King [Tue, 7 May 2013 18:35:22 +0000 (14:35 -0400)]
Improving arithmetic debugging output.

11 years agoDisabling an incorrect prototyping line from the simplex merges. Fixes bug 510.
Tim King [Tue, 7 May 2013 04:44:27 +0000 (00:44 -0400)]
Disabling an incorrect prototyping line from the simplex merges.  Fixes bug 510.

11 years agoChange SMT-EVAL run-script to use Tim's best QF_LRA command-line parameters
Morgan Deters [Tue, 7 May 2013 03:07:28 +0000 (23:07 -0400)]
Change SMT-EVAL run-script to use Tim's best QF_LRA command-line parameters

11 years agofixed bv rewrite rule bug
Liana Hadarean [Tue, 7 May 2013 01:46:30 +0000 (21:46 -0400)]
fixed bv rewrite rule bug

11 years agoRemoving excess verbosity from ApproxSimplex (after discussing with Tim)
Morgan Deters [Mon, 6 May 2013 23:38:59 +0000 (19:38 -0400)]
Removing excess verbosity from ApproxSimplex (after discussing with Tim)

11 years agoAdding a heuristic for guessing an optimization function when using glpk.
Tim King [Mon, 6 May 2013 22:38:12 +0000 (18:38 -0400)]
Adding a heuristic for guessing an optimization function when using glpk.

11 years agoDisables justification stop only for LRA if the problem contains no ites. This is...
Tim King [Mon, 6 May 2013 19:00:34 +0000 (15:00 -0400)]
Disables justification stop only for LRA if the problem contains no ites. This is a bandaid for constraints-tempo-width family of benchmarks.

11 years agoSome bug fixes for mb arrays
Clark Barrett [Mon, 6 May 2013 13:58:15 +0000 (09:58 -0400)]
Some bug fixes for mb arrays

11 years agoAdding cut offs for likely integer infeasible paths.
Tim King [Sat, 4 May 2013 01:55:40 +0000 (21:55 -0400)]
Adding cut offs for likely integer infeasible paths.

11 years agoAdding a smarter technique for pivoting in solutions for glpk.
Tim King [Sat, 4 May 2013 00:53:25 +0000 (20:53 -0400)]
Adding a smarter technique for pivoting in solutions for glpk.

11 years agoFixing compilation of unit tests. These problems were due to splitLemma() being pure...
Tim King [Fri, 3 May 2013 20:32:11 +0000 (16:32 -0400)]
Fixing compilation of unit tests. These problems were due to splitLemma() being pure virtual.

11 years agoMore misc. arithmetic cleanup. Removing unused files and functions. Also removing...
Tim King [Fri, 3 May 2013 19:52:11 +0000 (15:52 -0400)]
More misc. arithmetic cleanup. Removing unused files and functions. Also removing an ugly forward declaration that was needed to get error set bound information on basic variables.

11 years agoCode cleanup. Reducing misc. warnings in arithmetic.
Tim King [Fri, 3 May 2013 19:16:50 +0000 (15:16 -0400)]
Code cleanup.  Reducing misc. warnings in arithmetic.

11 years agoRemoving arithmetic legacy code and unifying functions.
Tim King [Fri, 3 May 2013 19:01:02 +0000 (15:01 -0400)]
Removing arithmetic legacy code and unifying functions.

11 years agoFixing a debug typo.
Tim King [Fri, 3 May 2013 17:36:53 +0000 (13:36 -0400)]
Fixing a debug typo.

11 years agoMerging branch 'soiquickexplain'.
Tim King [Fri, 3 May 2013 17:15:26 +0000 (13:15 -0400)]
Merging branch 'soiquickexplain'.

11 years agoMerge branch 'fcexplanations'
Tim King [Fri, 3 May 2013 17:14:17 +0000 (13:14 -0400)]
Merge branch 'fcexplanations'

11 years agoAdding quick explain for soi simplex.
Tim King [Thu, 2 May 2013 21:15:53 +0000 (17:15 -0400)]
Adding quick explain for soi simplex.

11 years ago* splitLemma to request atoms
Dejan Jovanović [Fri, 26 Apr 2013 16:55:13 +0000 (12:55 -0400)]
* splitLemma to request atoms
* normalizing in bv before bitblasting

11 years agomerged master
lianah [Thu, 2 May 2013 18:38:46 +0000 (14:38 -0400)]
merged master

11 years agoMerge branch 'master' of https://github.com/CVC4/CVC4
lianah [Thu, 2 May 2013 18:14:48 +0000 (14:14 -0400)]
Merge branch 'master' of https://github.com/CVC4/CVC4

11 years agoComment out some debug-related things in attribute code, no longer needed
Morgan Deters [Wed, 1 May 2013 18:27:41 +0000 (14:27 -0400)]
Comment out some debug-related things in attribute code, no longer needed

11 years agoFix to dumping re: boolean terms, datatypes
Morgan Deters [Wed, 1 May 2013 18:04:00 +0000 (14:04 -0400)]
Fix to dumping re: boolean terms, datatypes

11 years agoFix to boolean-terms; resolves bug #507
Morgan Deters [Wed, 1 May 2013 18:02:17 +0000 (14:02 -0400)]
Fix to boolean-terms; resolves bug #507

11 years agoremoved tracing code causing slowdown; cleaned up some code
lianah [Wed, 1 May 2013 19:31:10 +0000 (15:31 -0400)]
removed tracing code causing slowdown; cleaned up some code

11 years agoWorking on the new explanation system.
Tim King [Wed, 1 May 2013 18:59:39 +0000 (14:59 -0400)]
Working on the new explanation system.

11 years agoadded back BitwiseEq rule
lianah [Wed, 1 May 2013 17:22:29 +0000 (13:22 -0400)]
added back BitwiseEq rule

11 years agoAdding a missing makefile to the dist (fixes distcheck)
Morgan Deters [Wed, 1 May 2013 14:50:39 +0000 (10:50 -0400)]
Adding a missing makefile to the dist (fixes distcheck)

11 years agoMaking propagation more conversative.
Tim King [Tue, 30 Apr 2013 23:32:08 +0000 (19:32 -0400)]
Making propagation more conversative.

11 years agoDraft of the new propagation code.
Tim King [Tue, 30 Apr 2013 23:09:06 +0000 (19:09 -0400)]
Draft of the new propagation code.

11 years agofixed merge conflicts
lianah [Tue, 30 Apr 2013 20:43:09 +0000 (16:43 -0400)]
fixed merge conflicts

11 years agomerged cvc4 master
lianah [Tue, 30 Apr 2013 20:39:52 +0000 (16:39 -0400)]
merged cvc4 master

11 years agoupdated the author name
lianah [Tue, 30 Apr 2013 19:52:40 +0000 (15:52 -0400)]
updated the author name