Murphy Berzish
9e8a4e2a01
Merge branch 'upstream-master' into develop
...
Conflicts:
src/smt/smt_context.cpp
2017-04-24 12:28:16 -04:00
Nikolaj Bjorner
5068d2083d
tidy
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-22 11:36:03 -07:00
Murphy Berzish
367cc4b77f
check result of unsat core validation
2017-04-22 13:36:09 -04:00
Murphy Berzish
06cd07e3c2
Merge branch 'theory-assumptions' into develop
...
Conflicts:
src/smt/smt_context.cpp
src/smt/smt_context.h
src/smt/smt_theory.h
2017-04-22 13:31:43 -04:00
Murphy Berzish
a1bb1f2a13
pre-init assumptions and unsat core validation for smt theories
2017-04-22 13:15:00 -04:00
Murphy Berzish
5cfe5e15ac
unsat core validation for smt theories
2017-04-21 17:51:14 -04:00
Murphy Berzish
bef64961ae
add pre-init assumptions for smt theories
2017-04-18 13:12:03 -04:00
Murphy Berzish
7207cabc97
experimental new unsat core based overlap detection
2017-04-12 17:09:35 -04:00
Murphy Berzish
a8935e99bc
Merge branch 'upstream-master' into develop
2017-04-04 16:47:30 -04:00
Nikolaj Bjorner
e05cee757b
properly handle recursive function definitions #898
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-24 10:10:42 -07:00
Nikolaj Bjorner
1ab7ab9d74
fix double ownership of enode marking causing crash during tracing. Issue #952
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-23 11:09:36 -07:00
Murphy Berzish
94d5f242b8
Merge branch 'str-at-semantics' into develop
2017-03-13 14:40:40 -04:00
Nikolaj Bjorner
8bec1e25a8
move restore relevancy until after literals have been replayed
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-12 08:32:06 +01:00
Nikolaj Bjorner
228111511c
fixing build break, addressing #935
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-11 18:41:36 +01:00
Nikolaj Bjorner
fbf81c88a2
remove print breaking build
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-09 11:13:38 +01:00
Murphy Berzish
5107e5cafc
refactor: remove t_str_refcount_hack traces
2017-02-23 15:01:55 -05:00
Murphy Berzish
235ea79043
Merge branch 'upstream-master' into release-1.0
...
Conflicts:
src/cmd_context/check_logic.cpp
src/cmd_context/cmd_context.cpp
src/cmd_context/cmd_context.h
src/smt/params/smt_params_helper.pyg
src/smt/smt_context.cpp
2017-02-18 15:04:44 -05:00
Nikolaj Bjorner
b0dd3f3238
add recursive function graphs to model, adapt rewriter to bypass branches whose evaluation is redundant
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-16 13:58:12 -08:00
Nikolaj Bjorner
777091e653
fix part 1 of #875
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-25 18:09:27 -08:00
Nikolaj Bjorner
0aa912371b
Another fix for #847 . Reset wmax theory solver state between lex calls, otherwise it uses stale constraints
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-17 14:19:24 -08:00
Murphy Berzish
1363f50e4f
demonstration of theory-aware branching in theory_str, WIP
2017-01-10 19:50:46 -05:00
Christoph M. Wintersteiger
8047f0d91a
GCC compilation/keyword fix. Relates to #864
2017-01-10 14:06:56 +00:00
Nikolaj Bjorner
8d09b6e4a8
add at-least and pbge to API, fix for issue #864
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-09 21:23:00 -08:00
Murphy Berzish
df63b62763
fix vector manip bug in theory case split
2016-12-20 17:32:51 -05:00
Murphy Berzish
ab0fcc42f9
theory case split heuristic
2016-12-20 16:21:07 -05:00
Murphy Berzish
a04bc9974b
theory case split WIP
2016-12-20 11:14:42 -05:00
Murphy Berzish
e85f9d33c4
add "legacy" support for theory case splits
...
this replicates what was done in theory_str to add axioms excluding each
pair of literals from being assigned True at the same time;
no new heuristics are being used in smt_context (yet)
2016-12-16 15:50:03 -05:00
Murphy Berzish
dd8cd8199b
theory_str refcount debug messages and beginning theory case split
2016-12-16 14:37:34 -05:00
Nikolaj Bjorner
024082a45f
adding preferred sat, currently disabled, to wmax. Fixing issue #815
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-30 09:52:05 -08:00
Murphy Berzish
e2d05578d6
add extra trace message in smt_context for theory_str results change
2016-11-17 15:25:39 -05:00
Christoph M. Wintersteiger
026309a325
bugfix for disequality propagation in smt_context
2016-11-01 14:21:06 +00:00
Nikolaj Bjorner
7d7e03e377
rewind qhead to ensure re-propagation after cancellation
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-27 16:23:33 -07:00
Nikolaj Bjorner
41deae52c6
fix enum2bv to handle singleton enumeration types, differentiate disequality conflicts for theories that handle disequalities vs. theories that don't
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-27 13:35:53 -07:00
Nikolaj Bjorner
4bd83724dd
remove conflict on false disequality, introduced regression
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-26 19:15:05 -07:00
Nikolaj Bjorner
a880e5f49b
fix incorrection assertion when checking signs of literals, exposed by miTLS regressions
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-24 13:12:36 -07:00
Murphy Berzish
9615b191de
theory_str hacking for theory var stuff WIP
2016-09-19 23:40:17 -04:00
Nikolaj Bjorner
c5dd441947
fixes to consequence generation and cancellation
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-09-07 11:50:26 -07:00
Murphy Berzish
2b8f165cc4
patch UNSAT to UNKNOWN in cmd_context for theory_str
2016-09-02 19:04:20 -04:00
Nikolaj Bjorner
dc48008d46
fixestoconsequences
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-09-02 11:00:40 +08:00
Nikolaj Bjorner
bbfe02b25a
modulating data-type solver
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-08-03 11:16:29 -07:00
Nikolaj Bjorner
7346098895
fix unsat core extraction code in smt_context
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-07-30 11:22:34 -07:00
Nikolaj Bjorner
8221a09659
fast path for antecedent extraction in smt_context
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-07-28 16:49:19 -07:00
Nikolaj Bjorner
4c786c5f70
add n-ary disjunction and conjunction
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-07-01 08:15:50 -07:00
Nikolaj Bjorner
3aea63edb1
check for cancellation before internalizing and during to avoid errors. Issue #625
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-05-27 17:27:37 -07:00
Nikolaj Bjorner
96e157e201
fix warnings for unused variables
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-05-17 13:54:22 -07:00
Nikolaj Bjorner
ce8862d415
fix bug in conflict clause generation in seq-branch-variable
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-26 18:15:45 -08:00
Nikolaj Bjorner
85d44c5d66
fix axioms for extract, add extensionality checking for shared variables, convert exceptions to unknown status per #419
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-18 11:09:41 +05:30
Nikolaj Bjorner
082dcda7f7
Fix Issue #405 : Horn normal form ignores implication
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-10 19:16:59 -08:00
Nikolaj Bjorner
fce286db91
Issue #354 . Fix unsoundness in Array theory based on missing propagation of selects over ite expressions
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-10 17:11:12 -08:00
Nikolaj Bjorner
0c2334417c
fix build warnigs with && vs ||, tuning seq
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-07 06:53:00 -08:00