Nikolaj Bjorner
|
e306287d7b
|
updates to nra_solver integration to call it directly from theory_lra instead of over lar_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-25 14:04:48 -07:00 |
|
Nikolaj Bjorner
|
d2b2aedef3
|
Merge branch 'dev' of https://github.com/nikolajbjorner/z3
|
2017-05-25 08:54:00 -07:00 |
|
Nikolaj Bjorner
|
1086eaaa1f
|
debugging nra
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-24 21:46:19 -07:00 |
|
Nikolaj Bjorner
|
b18dc7d052
|
adding nra
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-24 17:24:36 -07:00 |
|
Nikolaj Bjorner
|
7a809fe4f0
|
adding nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-24 14:56:59 -07:00 |
|
Nikolaj Bjorner
|
80bb084611
|
add missing initialization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-24 14:47:09 -07:00 |
|
Nikolaj Bjorner
|
d45c56da3f
|
adding nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-24 14:44:16 -07:00 |
|
Nikolaj Bjorner
|
fc53c5b638
|
adding nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-24 14:41:02 -07:00 |
|
Lev Nachmanson
|
09530bb6bc
|
adding some content to the new check_int_feasibility()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2017-05-24 10:12:42 -07:00 |
|
Nikolaj Bjorner
|
dcc6284557
|
adding constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-24 08:57:10 -07:00 |
|
Nikolaj Bjorner
|
b9ca8b435f
|
nlsat integration
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-23 20:45:58 -07:00 |
|
Nikolaj Bjorner
|
e231f4bc87
|
adding more nlsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-23 18:50:18 -07:00 |
|
Lev Nachmanson
|
93a3c486b0
|
small fix in lar_solver.cpp
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2017-05-23 18:32:08 -07:00 |
|
Nikolaj Bjorner
|
8ecd8a2a52
|
Dev (#50)
* initial skeletons for nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* initial skeletons for nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-23 18:07:58 -07:00 |
|
Nikolaj Bjorner
|
db54cab8b2
|
initial skeletons for nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-23 16:26:46 -07:00 |
|
Nikolaj Bjorner
|
f1ca1de408
|
initial skeletons for nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-23 16:12:46 -07:00 |
|
Lev Nachmanson
|
1f425824ff
|
adding stub check_int_feasibility()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2017-05-23 15:46:53 -07:00 |
|
Nikolaj Bjorner
|
f1f0f78617
|
remove foci reference from cmakelist.txt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-19 18:31:34 -07:00 |
|
Nikolaj Bjorner
|
4b61a864e2
|
Merge pull request #1033 from kenmcmil/remove_foci
removing FOCI2 interface from interp
|
2017-05-19 18:29:23 -07:00 |
|
Ken McMillan
|
bf7c6292bd
|
removing FOCI2 interface from interp
|
2017-05-19 16:21:57 -07:00 |
|
Christoph M. Wintersteiger
|
a258236229
|
Disabled debug output
|
2017-05-19 18:51:52 +01:00 |
|
Nikolaj Bjorner
|
bc9740c54a
|
Merge pull request #1031 from levnach/123
change in a comment
|
2017-05-18 13:53:18 -07:00 |
|
Lev Nachmanson
|
1b62592015
|
change in a comment
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2017-05-18 13:44:00 -07:00 |
|
Lev Nachmanson
|
21bddd94bf
|
after merge with Z3Prover
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2017-05-18 13:28:32 -07:00 |
|
Lev Nachmanson
|
942f8f8c49
|
merge
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2017-05-18 13:18:16 -07:00 |
|
Nikolaj Bjorner
|
79a8e9aab0
|
fix build break #1029
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-18 12:09:51 -07:00 |
|
Lev Nachmanson
|
b92f0acae3
|
fix add_constraint and substitute_terms_in_linear_expression
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
|
2017-05-18 10:56:50 -07:00 |
|
Lev Nachmanson
|
e9d9354885
|
add_constraint has got a body
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
|
2017-05-17 19:00:33 -07:00 |
|
Lev Nachmanson
|
d28b8b33b4
|
add file
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
|
2017-05-17 11:04:35 -07:00 |
|
Lev Nachmanson
|
9a58eb63cb
|
resurrect lp_tst in its own director lp
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
|
2017-05-17 11:01:04 -07:00 |
|
Nikolaj Bjorner
|
4069e76ab0
|
remove unused column function field, #1021
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-16 21:27:43 -07:00 |
|
Lev Nachmanson
|
d5e06303ef
|
add queries for integrality of vars
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
|
2017-05-16 17:54:09 -07:00 |
|
Lev Nachmanson
|
7b433bee2b
|
track which var is an integer
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
|
2017-05-16 17:36:32 -07:00 |
|
Lev Nachmanson
|
e78a799b53
|
Merge remote-tracking branch 'upstream/master'
|
2017-05-16 12:04:20 -07:00 |
|
Lev Nachmanson
|
06e1151ca0
|
add int_solver class
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2017-05-16 12:01:16 -07:00 |
|
Nikolaj Bjorner
|
ceec81de0b
|
simplify code, issue #1028
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-16 08:32:08 -07:00 |
|
Nikolaj Bjorner
|
7fab670719
|
fix regression, issue #1028
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-16 08:21:32 -07:00 |
|
Lev Nachmanson
|
4eec8cbadd
|
introduce int_solver.h
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2017-05-15 15:32:31 -07:00 |
|
Nikolaj Bjorner
|
d2ac59f238
|
Merge branch 'master' of https://github.com/Z3Prover/z3
|
2017-05-14 14:10:01 -07:00 |
|
Nikolaj Bjorner
|
3290a933b5
|
remove spurious include file
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-14 14:09:42 -07:00 |
|
Nikolaj Bjorner
|
22386d3727
|
Merge pull request #1026 from Owlz/setup_bin_fix
Fixing z3 binary setup to data_files
|
2017-05-14 14:06:16 -07:00 |
|
Nikolaj Bjorner
|
a0efdc21c3
|
add missing locks around mpz operations that access object allocator. Use internal skolem constant for theory assumption to hide it from models
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-14 14:04:00 -07:00 |
|
Owlz
|
aad186f6a5
|
Fixing z3 binary setup to data_files
|
2017-05-14 15:25:17 -04:00 |
|
Nikolaj Bjorner
|
0ddbd32a42
|
Merge pull request #1024 from mtrberzi/str-const-fix
Fix problems with string constant handling in theory_str
|
2017-05-13 15:21:33 -07:00 |
|
Murphy Berzish
|
3c692a37eb
|
fix consistency check involving strings with escape characters
|
2017-05-13 16:13:32 -04:00 |
|
Murphy Berzish
|
14355a15c8
|
use correct operator for lower bound assignment
fixes #1022
|
2017-05-13 16:02:41 -04:00 |
|
Murphy Berzish
|
bf147556a6
|
add counter to theory_str::mk_fresh_const()
|
2017-05-13 14:18:05 -04:00 |
|
Nikolaj Bjorner
|
169295c9ba
|
fix build warnings for theory_str
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-12 08:06:24 -07:00 |
|
Nikolaj Bjorner
|
07474e4887
|
Merge branch 'master' of https://github.com/Z3Prover/z3
|
2017-05-12 07:59:30 -07:00 |
|
Nikolaj Bjorner
|
64f3b3e316
|
remove lp_main from test branch to ensure test build only builds a single entry point
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-12 07:59:16 -07:00 |
|