3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-25 01:55:32 +00:00
Commit graph

9522 commits

Author SHA1 Message Date
Nikolaj Bjorner
d1854ab4d2 fix assertion in model converter for incremental mode
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-13 15:24:40 -08:00
Nikolaj Bjorner
aeabdb4aae add checks for flipping externals / assumptions in model converter, fix scc converter bug
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-13 14:06:35 -08:00
Nikolaj Bjorner
387e984bd3 Merge branch 'master' of https://github.com/z3prover/z3 2017-12-13 13:48:34 -08:00
Nikolaj Bjorner
5a479fca76 generalize model finder code to be independent of conjunction elimination
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-13 13:48:24 -08:00
Ivan Gotovchits
49678065bd fixes compilation flags for OCaml plugins
The `-linkall` option is needed for a plugin to be standalone,
otherwise it will miss those dependencies that are not used.
2017-12-13 14:45:06 -05:00
Miguel Angelo Da Terra Neves
51fc54fdd1 merge
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-13 11:15:03 -08:00
Miguel Angelo Da Terra Neves
bffa0facee pre-merge commit
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-13 10:09:44 -08:00
Nikolaj Bjorner
caaad8825d merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-13 02:58:45 -08:00
Nikolaj Bjorner
71c52396cb fix transitive reduction bug, eliminate blocked tag on binary clauses, separate BIG structure from scc
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-13 02:38:06 -08:00
Miguel Angelo Da Terra Neves
7ab042763b Merge branch 'opt' of https://github.com/NikolajBjorner/z3 into opt 2017-12-12 14:35:27 -08:00
Miguel Angelo Da Terra Neves
c92e6ac658 merge
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-12 14:35:24 -08:00
Nikolaj Bjorner
dbe7828f1d inherit incremental override on the solver state
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-12 14:33:23 -08:00
Nikolaj Bjorner
deda8f46f8 fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-12 13:25:36 -08:00
Nikolaj Bjorner
159df60336 local changes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-12 13:22:31 -08:00
Miguel Angelo Da Terra Neves
e8ac0575eb merge
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-12 11:44:45 -08:00
Nikolaj Bjorner
921423ec80 fix model conversions for incremental SAT, fix lookahead with ba_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-12 10:43:23 -08:00
Nikolaj Bjorner
7afbf8165e snapshot
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-12 01:36:44 -08:00
Murphy Berzish
d2d79e3207 Merge branch 'master' into develop 2017-12-11 17:36:12 -05:00
Miguel Angelo Da Terra Neves
1e22cb73d5 merge
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-11 14:14:44 -08:00
Miguel Angelo Da Terra Neves
9f0a8af255 fixed adaptive apsat
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-12-11 14:14:16 -08:00
Nikolaj Bjorner
35a3523fd6 fix bug in double collection of declarations
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-11 14:09:34 -08:00
Thai Trinh
c07a63cf8e coalesce seq.unit into string in mk_skolem 2017-12-12 05:00:34 +08:00
Nikolaj Bjorner
82c26509ae
Merge pull request #1396 from mtrberzi/substr-bug
Fix incorrect term in theory_str str.substr reduction
2017-12-11 12:36:07 -08:00
Nikolaj Bjorner
6d729f1f15 disable UHLT
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-11 10:36:42 -08:00
Murphy Berzish
83bd103cd4 Merge remote-tracking branch 'upstream/master' into develop 2017-12-11 13:05:04 -05:00
Christoph M. Wintersteiger
2e186633ee Turned assertion failure into proper error message. 2017-12-11 14:59:25 +00:00
Murphy Berzish
9d2c86f214 fix incorrect clause in argumentsValid subterm of substr reduction 2017-12-08 20:31:22 -05:00
Thai Trinh
8bf4a15c27 update "seq.align" skolem function 2017-12-09 00:47:48 +08:00
Thai Trinh
a2641909d0 initialize pointers 2017-12-08 19:40:20 +08:00
Thai Trinh
b819b368f1 minor 2017-12-08 19:29:07 +08:00
Thai Trinh
b8ce5509b0 change to "auto" 2017-12-08 19:16:28 +08:00
Thai Trinh
0c7343d3df Merge branch 'Z3Prover-master' 2017-12-08 19:02:48 +08:00
Thai Trinh
c33dfc80e0 Merge branch 'master' of https://github.com/Z3Prover/z3 into Z3Prover-master
Conflicts:
	src/smt/theory_seq.cpp
2017-12-08 19:02:24 +08:00
Nikolaj Bjorner
faebbc5384 add shortcuts for concatenation and equality propagation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-08 16:17:04 +05:30
Thai Trinh
b181d9d5fa fix set-up 2017-12-08 18:45:56 +08:00
Thai Trinh
3a5c30bd9b use obj_ref_map 2017-12-08 18:36:20 +08:00
trinhmt
9ea01d521a
Merge pull request #2 from Z3Prover/master
fix build of obj_ref_hashtable
2017-12-08 17:26:43 +08:00
Thai Trinh
6253faece7 fixed redundant check 2017-12-08 17:20:30 +08:00
Thai Trinh
7ece37f9a1 added assertions 2017-12-08 17:10:28 +08:00
Nikolaj Bjorner
c8d9be0bbf fix build of obj_ref_hashtable
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-08 14:22:25 +05:30
trinhmt
034e72572f
Merge pull request #1 from Z3Prover/master 2017-12-08 14:42:34 +08:00
Thai Trinh
ff567412c1 Simplify code 2017-12-08 14:26:20 +08:00
Thai Trinh
2c48ffe7a7 Fixed setup_QF_S(): using configuration to choose the corresponding string solver 2017-12-08 13:41:18 +08:00
Nikolaj Bjorner
a5d5dfdf86 fix setup for non-linear real arithmetic per QF_UFNRA regresssions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-08 09:23:57 +05:30
Nikolaj Bjorner
3f19c12a12 add obj_ref_map to make it easier to maintain reference counts with a map of objects
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-08 05:48:34 +05:30
Thai Trinh
b6806eb1c2 Add more splitting rules for string equations (including rules based on length constraints) 2017-12-08 04:34:50 +08:00
Nikolaj Bjorner
8c8d229ca9 Merge branch 'master' of https://github.com/z3prover/z3 2017-12-07 18:43:53 +05:30
Nikolaj Bjorner
8e1ab23c3d remove deprecated functions from ML API. #1393
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-07 18:43:29 +05:30
Nikolaj Bjorner
0cfea8946b
Merge pull request #1391 from delcypher/cxx_example_use_cxx11
[CMake] Use C++11 is C++ API example
2017-12-07 18:38:05 +05:30
Dan Liew
1941a53999 [Release Notes] Note that C++11 is required to build Z3 and is also
required by the C++ API bindings.
2017-12-07 10:56:44 +00:00