3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-18 22:59:02 +00:00
Commit graph

1440 commits

Author SHA1 Message Date
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
Nikolaj Bjorner d8c3b273d3 adding benign initialization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-08 10:50:06 -07:00
Murphy Berzish 6b2a800c7f fix warnings: unused variables, string constants 2017-05-07 18:23:47 -04:00
Nikolaj Bjorner 3ae722025f relaxing condition for assumptions, add theory-assumption to skolem functions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-07 14:54:47 -07:00
Nikolaj Bjorner e02392c0e3 use skolem function to avoid exposing temporary variables in models
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-07 14:03:24 -07:00
Nikolaj Bjorner 82bdd26817 clean up some warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-06 13:40:53 -04:00
Murphy Berzish f904b033ad formatting theory_str.h 2017-05-05 19:29:53 -04:00
Murphy Berzish 21c8f4aae0 formatting theory_str.cpp 2017-05-05 19:26:15 -04:00
Murphy Berzish 7ddd43e16d first-class re.range support in theory_str 2017-05-05 15:29:58 -04:00
Murphy Berzish 75ba4d5a4d remove unneeded include 2017-05-05 14:54:36 -04:00
Murphy Berzish 8029b6b889 Merge branch 'upstream-master' into develop 2017-05-05 14:44:29 -04:00
Nikolaj Bjorner 7e1fae418a fix #1005, disable expansion of regular expression range to union as it degrades performance significantly
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-05 10:59:47 -04:00
Murphy Berzish c2b5e8cfda fix overlap detection internalization 2017-05-03 17:46:06 -04:00
Murphy Berzish ab4fbe40b6 cleanup 2017-05-03 17:45:56 -04:00
Murphy Berzish 41a242fab1 Merge branch 'upstream-master' into develop
Conflicts:
	src/smt/params/smt_params.h
	src/smt/params/smt_params_helper.pyg
	src/smt/smt_case_split_queue.cpp
	src/smt/smt_context.h
	src/smt/smt_setup.cpp
	src/smt/smt_setup.h
2017-05-03 17:03:13 -04:00
Nikolaj Bjorner 1177be6391 add common utility to set up seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-02 20:52:39 -07:00
Nikolaj Bjorner 52dfdedb9b Merge pull request #1000 from mtrberzi/theory_str-smt-setup
smt_setup for strings/sequences
2017-05-02 20:44:23 -07:00
Murphy Berzish 92755b0185 smt_setup framework, all hooks to theory_str are redirected to theory_seq 2017-05-02 17:16:35 -04:00
Murphy Berzish a418f0c30b fix spacing 2017-05-02 15:52:35 -04:00
Murphy Berzish e6d527c5d5 remove trace code from theory_arith 2017-05-02 15:39:15 -04:00
Murphy Berzish 15cb2d7dba cleanup 2017-05-02 14:08:48 -04:00
Murphy Berzish a8d069ba46 refactor: add asserts, use case split strategy param 2017-05-02 13:06:08 -04:00
Murphy Berzish 5b4792955d theory-aware branching heuristic 2017-05-02 10:43:40 -04:00
Murphy Berzish 6cd1f877b8 params for theory aware branching 2017-05-02 10:39:32 -04:00
Murphy Berzish 0862949e66 Merge branch 'upstream-master' into develop
Conflicts:
	src/smt/params/smt_params.cpp
	src/smt/params/smt_params.h
	src/smt/smt_context.cpp
	src/smt/smt_context.h
2017-05-01 21:33:23 -04:00
Nikolaj Bjorner 48e37b0e16 pass qhead
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-01 16:54:22 -07:00
Nikolaj Bjorner 8ba78081ec fix build break
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-01 16:41:17 -07:00
Nikolaj Bjorner 61e0fc9099 Merge pull request #995 from mtrberzi/theory-case-split
Theory case split heuristic (for theory_str)
2017-05-01 15:27:45 -07:00
Murphy Berzish 16a5e944d7 use reference for case split sets 2017-05-01 18:25:54 -04:00
Murphy Berzish b86d472eaf simplify theory case split handling 2017-05-01 18:22:49 -04:00
Nikolaj Bjorner d14f2af5ae deal with subtraction that manages to sneak in. Issue #996
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-01 15:22:06 -07:00
Murphy Berzish 3bce61e0d4 fix warning 2017-05-01 10:43:33 -04:00
Murphy Berzish 2f56d128b0 add theory case split support to smt_context 2017-05-01 10:34:43 -04:00
Murphy Berzish f655e1976e add params for theory case split 2017-05-01 10:18:38 -04:00