Christoph M. Wintersteiger
|
95dea3922d
|
Merge branch 'pure' of https://github.com/Z3Prover/z3
Conflicts:
src/api/ml/z3.ml
src/api/ml/z3.mli
src/api/python/z3util.py
|
2015-10-02 19:47:24 +01:00 |
|
Christoph M. Wintersteiger
|
a9d395ed7a
|
Fixed comments about contributed code.
|
2015-10-02 19:45:33 +01:00 |
|
Murphy Berzish
|
96d99dfb38
|
process_concat_eq_type2 implementation, not tested WIP
|
2015-10-02 14:05:17 -04:00 |
|
Christoph M. Wintersteiger
|
18a0314f6b
|
Fix for ast_map in ML API
|
2015-10-02 15:52:33 +01:00 |
|
Christoph M. Wintersteiger
|
e0026a1cbb
|
Merge branch 'contrib' of https://github.com/Z3Prover/z3
|
2015-10-02 15:20:06 +01:00 |
|
Christoph M. Wintersteiger
|
0a95df8960
|
removed automatically generated file
|
2015-10-02 15:11:53 +01:00 |
|
Christoph M. Wintersteiger
|
08a3ab92f3
|
Added --noomp to mk_make
|
2015-10-02 12:38:56 +01:00 |
|
Murphy Berzish
|
bdf755156c
|
fix model generation: don't build interpretations for Length()
|
2015-10-01 20:31:40 -04:00 |
|
Christoph M. Wintersteiger
|
1294a2ac15
|
Fixed a memory leak
|
2015-10-01 13:31:37 +01:00 |
|
Murphy Berzish
|
fb5f3cbc13
|
fix greater-than bug
now we just have to tweak model gen for internal variables
|
2015-09-30 11:41:55 -04:00 |
|
Murphy Berzish
|
f8c13792a3
|
mark the position of the bug I found so I can recall it later
in process_concat_eq_type1() line 1048
|
2015-09-30 09:45:00 -04:00 |
|
Murphy Berzish
|
5189c24d42
|
fix theory of arithmetic complaints about wanting to write A > B
"what could possibly go wrong?"
|
2015-09-30 05:45:16 -04:00 |
|
Murphy Berzish
|
ecb2116927
|
fix memory corruption bug caused by invalid use of delete[]
|
2015-09-30 05:23:22 -04:00 |
|
Murphy Berzish
|
e2901fff1e
|
fix compilation errors
|
2015-09-30 05:21:16 -04:00 |
|
Murphy Berzish
|
ed7b343822
|
detect and process concat eq type 1 (WIP UNTESTED)
|
2015-09-30 05:15:14 -04:00 |
|
Murphy Berzish
|
a62d15403e
|
start simplify_concat_eq(), WIP but some cases OK
also fix model generation for concats and nested concats
|
2015-09-29 22:31:11 -04:00 |
|
Murphy Berzish
|
1cdfe159b8
|
simplify_concat_equality() and easy cases there
still WIP especially wrt. model generation but what's here does work
|
2015-09-29 20:19:43 -04:00 |
|
Nikolaj Bjorner
|
5d71190468
|
add catch for cancellation intermixed with return value l_true. To address regressions in QF_LIA tests
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-09-29 16:50:59 -07:00 |
|
Murphy Berzish
|
8ed86d2f19
|
add concatenation axiom
|
2015-09-29 18:02:05 -04:00 |
|
Murphy Berzish
|
191c50b529
|
fix solve_concat_eq_str() case 4: prefixStr should have been suffixStr
|
2015-09-29 17:52:19 -04:00 |
|
Murphy Berzish
|
2320b6dc48
|
solve_concat_eq_str() case 4: somewhat working
something's wrong but it may be very simple to fix
|
2015-09-29 17:46:51 -04:00 |
|
Nikolaj Bjorner
|
77c423b9aa
|
annotate enode hash as signed character to address issue #210
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-09-29 14:14:29 -07:00 |
|
Nikolaj Bjorner
|
074ff58739
|
include rlimit in nlsat, include dedicated error message, for issue #216
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-09-29 09:27:34 -07:00 |
|
Nikolaj Bjorner
|
d9b6623400
|
include rlimit in nlsat, include dedicated error message, for issue #216
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-09-29 09:16:46 -07:00 |
|
Christoph M. Wintersteiger
|
0cf18ab18e
|
Propagated rlimit changes to sat::solver into sat_user_scope tests
|
2015-09-29 11:50:10 +01:00 |
|
Murphy Berzish
|
f473b92d5c
|
solve_concat_eq_str() case 4 WIP
|
2015-09-28 17:41:01 -04:00 |
|
Nikolaj Bjorner
|
1f9d5249a3
|
fix build break regarind z3test.py and added rlimit
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-09-28 14:05:57 -07:00 |
|
Nikolaj Bjorner
|
f3b8fe130a
|
adding rlimit resource limit facility to provide platform and architecture independent method for canceling activities. This is to address issue #216
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-09-28 13:40:54 -07:00 |
|
Nikolaj Bjorner
|
9b3e242990
|
adding rlimit resource limit facility to provide platform and architecture independent method for canceling activities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-09-28 13:37:59 -07:00 |
|
Murphy Berzish
|
871b08bd8c
|
solve_concat_eq_str() case 3
|
2015-09-28 14:52:43 -04:00 |
|
Murphy Berzish
|
876af399e3
|
probably fix duplication of mk_string() terms
also implement Case 2 of solve_concat_eq_str()
|
2015-09-28 14:44:25 -04:00 |
|
Nikolaj Bjorner
|
ad16cc0ce2
|
fix unit test for datalog parser, fixes issue #224
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2015-09-28 11:16:55 -07:00 |
|
Christoph M. Wintersteiger
|
ac7e8b352f
|
Improved support for UFs in FPA theory
|
2015-09-28 18:20:45 +01:00 |
|
Christoph M. Wintersteiger
|
de3ead9ff1
|
build fix
|
2015-09-28 18:20:22 +01:00 |
|
Murphy Berzish
|
9bc685b21d
|
solve_concat_eq_str() for concat(const,const) == const
|
2015-09-28 10:43:34 -04:00 |
|
Murphy Berzish
|
62cd633b63
|
create helper function theory_str::assert_implication()
|
2015-09-28 03:26:46 -04:00 |
|
Murphy Berzish
|
bccadedfee
|
instead of building axiom (=> x y), build (or (not x) y)
this may be a bug in Z3 as it suggests that implications are ignored
e.g. I can assert the axiom (=> true false) and Z3 is okay with this
|
2015-09-28 03:20:13 -04:00 |
|
Murphy Berzish
|
5fe129b571
|
use mk_ismt2_pp() instead of mk_bounded_pp()
|
2015-09-28 02:09:35 -04:00 |
|
Murphy Berzish
|
87b5765e3d
|
clean up traces and make them much easier to read
|
2015-09-28 02:04:35 -04:00 |
|
Murphy Berzish
|
7da3854a8b
|
really lousy model-building, WIP
|
2015-09-28 01:56:13 -04:00 |
|
Murphy Berzish
|
0d54e4e4ae
|
implement str_decl_plugin::is_value() and ::is_unique_value()
we can now prove that (= "abc" "def") is unsatisfiable
|
2015-09-27 23:57:41 -04:00 |
|
Murphy Berzish
|
02cb329ca5
|
defer equalities uncovered during init_search
|
2015-09-27 23:24:41 -04:00 |
|
Murphy Berzish
|
86e6087718
|
starting solve_concat_eq_str(); currently there is an unsoundness bug
|
2015-09-27 21:30:45 -04:00 |
|
Murphy Berzish
|
6481fe941a
|
instantiate string-eq length-eq axiom
|
2015-09-27 17:48:53 -04:00 |
|
Murphy Berzish
|
114b51dec8
|
only handle equalities in assignments during init_search_eh
|
2015-09-27 17:26:52 -04:00 |
|
Murphy Berzish
|
91e9cf272a
|
assert string axiom 2
|
2015-09-27 00:12:04 -04:00 |
|
Murphy Berzish
|
4085db9990
|
recursive descent through all assertions to discover all String terms
set up axioms on these terms to be asserted during propagation
|
2015-09-26 23:35:23 -04:00 |
|
Murphy Berzish
|
f6affe64d0
|
deferred addition of basic string axioms
no longer crashes the solver and got our first correct UNSAT!
|
2015-09-26 21:02:56 -04:00 |
|
Murphy Berzish
|
4d5a0ea53f
|
WIP add axioms
|
2015-09-26 18:51:02 -04:00 |
|
Christoph M. Wintersteiger
|
076e680433
|
Improved UF suppport in fpa2bv_converter.
|
2015-09-25 17:28:31 +01:00 |
|