Nikolaj Bjorner
|
19d4b0a97a
|
resolve conflicts
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-06-02 10:38:37 -07:00 |
|
Nikolaj Bjorner
|
3ce82ea8ce
|
merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-06-02 10:37:22 -07:00 |
|
Nikolaj Bjorner
|
2908ab4069
|
fix reference count issue with pinning to expr_ref
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-06-01 09:56:25 -07:00 |
|
Nikolaj Bjorner
|
e9ed3af455
|
fix regression in str
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-06-01 09:35:35 -07:00 |
|
Nikolaj Bjorner
|
1fa60f4893
|
Merge branch 'master' of https://github.com/Z3Prover/z3
|
2017-06-01 09:11:09 -07:00 |
|
Nikolaj Bjorner
|
52e0f3b539
|
add string accessors to managed APIs #1051
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-06-01 09:10:49 -07:00 |
|
Christoph M. Wintersteiger
|
596652ed36
|
Merge branch 'master' of https://github.com/Z3Prover/z3
|
2017-05-31 18:35:52 +01:00 |
|
Christoph M. Wintersteiger
|
4f0a87299c
|
Fixed signed/unsigned comparison warnings
|
2017-05-31 18:35:06 +01:00 |
|
Christoph M. Wintersteiger
|
a7d5bb7b36
|
Tabs
|
2017-05-31 12:18:00 +01:00 |
|
Nikolaj Bjorner
|
415824b600
|
put temporaries on trail
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-30 11:18:33 -07:00 |
|
Nikolaj Bjorner
|
e0a86ccc1a
|
add lrb/chb and experiment with them
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-28 10:48:31 -07:00 |
|
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
|
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
|
fc53c5b638
|
adding nra solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-24 14:41:02 -07:00 |
|
Nikolaj Bjorner
|
49faaaa8f1
|
allowing non-literal assumptions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-23 15:01:00 -07:00 |
|
Nikolaj Bjorner
|
6f2cd4817b
|
ensure arith.reflect has default true
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-23 14:09:45 -07:00 |
|
Nikolaj Bjorner
|
23ff580a67
|
get rid of timeb dependencies, pull request #1040
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-23 12:16:43 -07:00 |
|
Nikolaj Bjorner
|
edb164587f
|
get rid of a simplifier dependency
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-23 10:12:32 -07:00 |
|
Nikolaj Bjorner
|
af4346f16a
|
expose arith reflection, get rid of long m_manager attribute in asserted fromulas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-23 10:04:29 -07:00 |
|
Nikolaj Bjorner
|
90af406338
|
Merge branch 'master' of https://github.com/Z3Prover/z3
|
2017-05-23 08:51:38 -07:00 |
|
Nikolaj Bjorner
|
8e9739d3b0
|
work around crash #1039
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-23 08:51:26 -07:00 |
|
Nikolaj Bjorner
|
f698efa403
|
Merge branch 'master' of https://github.com/z3prover/z3 into opt
|
2017-05-22 12:59:36 -07:00 |
|
Nikolaj Bjorner
|
f90ae40480
|
Merge branch 'master' of https://github.com/NikolajBjorner/z3 into opt
|
2017-05-22 12:53:19 -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
|
7b433bee2b
|
track which var is an integer
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
|
2017-05-16 17:36:32 -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 |
|
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 |
|
Lev Nachmanson
|
cf8b35a6f3
|
fix init reorder warning
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
|
2017-05-11 10:54:18 -07:00 |
|
Nikolaj Bjorner
|
eb8da3fb9d
|
fixing setup for LRA, re-enable LRA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-11 09:34:07 -07:00 |
|
Nikolaj Bjorner
|
7e004fe331
|
fix build warnings part 7, disable LRA for regression t201.smt2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-11 09:28:59 -07:00 |
|
Nikolaj Bjorner
|
9b3e2a9afe
|
re-enable LRA after fixing dispatch for LRA in smt-setup
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-11 09:16:07 -07:00 |
|
Nikolaj Bjorner
|
f176e1e5e5
|
disable LRA until unit tests are fixed
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-11 08:40:20 -07:00 |
|
Nikolaj Bjorner
|
e9a085a0e2
|
enable LRA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-11 08:23:43 -07:00 |
|
Lev Nachmanson
|
1d5fafd558
|
disable lev's solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2017-05-10 21:18:20 -07:00 |
|
Lev Nachmanson
|
b08f094620
|
merging with the lp fork
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2017-05-10 16:53:25 -07:00 |
|
Lev Nachmanson
|
cf695ab876
|
taking changes from the fork
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2017-05-10 10:43:01 -07:00 |
|
Nikolaj Bjorner
|
74ac58de2b
|
enable generic parameters with smt-tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-10 10:18:50 -07:00 |
|
Christoph M. Wintersteiger
|
284436aa5a
|
Merge branch 'master' of https://github.com/Z3Prover/Z3
|
2017-05-10 12:47:15 +01:00 |
|
Christoph M. Wintersteiger
|
248dd601ae
|
Whitespace, newlines
|
2017-05-10 12:44:25 +01:00 |
|
Nikolaj Bjorner
|
f4544eb060
|
disambiguating arguments to unordered map erase and dealing with unused and uninitialized variables
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-09 15:35:00 -07:00 |
|
Nikolaj Bjorner
|
f12f83af83
|
fix warnings, avoid class qualification in static function
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-09 14:56:38 -07:00 |
|
Nikolaj Bjorner
|
c5f1f8ba59
|
missing files
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-09 14:14:58 -07:00 |
|
Nikolaj Bjorner
|
2a63c56ae0
|
A faster and more scalable LRA solver by Lev Nachmanson. It is disabled in the initial merge pending a few bug fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-09 14:03:30 -07:00 |
|
Nikolaj Bjorner
|
911b24784a
|
merge LRA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-05-09 10:46:11 -07:00 |
|