3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-15 15:25:26 +00:00
Commit graph

46 commits

Author SHA1 Message Date
Nuno Lopes
dedae29300 add a few more statics to avoid symbol clashes 2016-12-01 17:37:07 +00:00
Nikolaj Bjorner
2a051719d8 cleanup deprecated critical sections, fix cancellation for par_or_else tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 09:43:00 -08:00
Nikolaj Bjorner
baee4225a7 reworking cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 16:21:24 -08:00
Nikolaj Bjorner
52619b9dbb pull unstable
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-01 14:57:11 -07:00
Christoph M. Wintersteiger
0746ede537 BV SLS: Final adjustments
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-20 15:59:25 +00:00
Christoph M. Wintersteiger
85ff954bc6 merge fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:43 +00:00
Andreas Froehlich
de028e7a30 Almost cleaned up version. 2015-01-12 17:19:24 +00:00
Andreas Froehlich
c56e55b230 Current version before integration ... 2015-01-12 17:19:23 +00:00
Andreas Froehlich
ad8cac7d88 uct forget and minisat restarts added 2015-01-12 17:19:13 +00:00
Christoph M. Wintersteiger
7451e5cae0 SLS refactoring
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:11 +00:00
Andreas Froehlich
442827e523 Current version for relocating. 2015-01-12 17:18:52 +00:00
Christoph M. Wintersteiger
664fa82c6c removed tabs
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:18:51 +00:00
Andreas Froehlich
140d28b6b3 plenty of new stuff 2015-01-12 17:18:50 +00:00
Andreas Froehlich
dfe2d945e9 some extensions/modifications. versions added. 2015-01-12 17:18:36 +00:00
Christoph M. Wintersteiger
aa0980b83b merge fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:15:31 +00:00
Andreas Froehlich
8a30a2caa9 Almost cleaned up version. 2015-01-12 17:15:04 +00:00
Andreas Froehlich
42702c8d8a Current version before integration ... 2015-01-12 17:14:46 +00:00
Andreas Froehlich
1e55b3bfb5 uct forget and minisat restarts added 2015-01-12 17:14:12 +00:00
Christoph M. Wintersteiger
b1eeb9adf4 SLS refactoring
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:13:59 +00:00
Andreas Froehlich
aa6f8a4b8a Current version for relocating. 2015-01-12 17:13:42 +00:00
Christoph M. Wintersteiger
e33e637ad8 removed tabs
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:13:12 +00:00
Andreas Froehlich
e310ab5cd7 plenty of new stuff 2015-01-12 17:13:12 +00:00
Andreas Froehlich
b002697e03 some extensions/modifications. versions added. 2015-01-12 17:13:11 +00:00
Nikolaj Bjorner
e6725b2344 merge unstable into opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-26 12:12:24 -07:00
Nikolaj Bjorner
36816e3b2f clear cache for crash
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-06 19:03:37 -07:00
Christoph M. Wintersteiger
ac206bacbf Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt
Conflicts:
	src/tactic/sls/sls_compilation_settings.h

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-25 18:05:53 +01:00
Andreas Froehlich
c1741d7941 Almost cleaned up version. 2014-04-22 00:32:45 +01:00
Andreas Froehlich
ef1d8f2acc Current version before integration ... 2014-04-20 16:38:49 +01:00
Nikolaj Bjorner
b300041075 resetting SLS engine between calls, moved statistics collection to engine
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-19 16:52:57 -07:00
Andreas Froehlich
202eb7b0ef Merge branch 'bvsls' of https://git01.codeplex.com/z3 into bvsls
Conflicts:
	src/tactic/sls/sls_tactic.cpp
2014-03-20 16:32:24 +00:00
Andreas Froehlich
c615bc0c34 uct forget and minisat restarts added 2014-03-20 15:58:53 +00:00
Christoph M. Wintersteiger
3d6f8840c6 SLS refactoring
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-03-19 17:04:38 +00:00
Andreas Froehlich
eabebedabf Merge branch 'bvsls' of https://git01.codeplex.com/z3 into bvsls
Conflicts:
	src/tactic/sls/sls_evaluator.h
	src/tactic/sls/sls_tactic.cpp
	src/tactic/sls/sls_tracker.h
2014-03-19 12:09:29 +00:00
Andreas Froehlich
90245021b2 Current version for relocating. 2014-03-19 11:49:44 +00:00
Christoph M. Wintersteiger
5aa352fd16 removed tabs
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-03-19 09:40:01 +00:00
Andreas Froehlich
853ce522cc plenty of new stuff 2014-03-09 15:42:51 +00:00
Andreas Froehlich
25378f7989 some extensions/modifications. versions added. 2014-02-18 14:01:47 +00:00
Christoph M. Wintersteiger
86f39cd4c1 Changed references to _DEBUG to Z3DEBUG.
(gcc does not define _DEBUG for debug builds.)

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-11-08 19:21:55 +00:00
Christoph M. Wintersteiger
4be468d312 Reorganized the SLS code.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-09-19 16:18:23 +01:00
Christoph M. Wintersteiger
8a44766382 qfbv-sls tactic bugfix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-09-18 13:47:20 +01:00
Christoph M. Wintersteiger
7c32df93a4 SLS tactic: compilation fixes
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-06-03 18:17:41 +01:00
Leonardo de Moura
6d7d205e13 fixed more problems in the new param framework
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-03 15:02:34 -08:00
Leonardo de Moura
cf28cbab0a saved params work
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-11-29 17:19:12 -08:00
Leonardo de Moura
683687b153 more cleanup
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-10-31 10:54:59 -07:00
Leonardo de Moura
d8f627c6c8 Fixed warnings produced by gcc 4.6.3 when compiling in debug mode
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-10-30 23:43:00 -07:00
Leonardo de Moura
0990a2e045 using a consistent naming convention for naming tactic subfolders
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-10-24 15:11:44 -07:00
Renamed from src/tactic/sls_tactic/sls_tactic.cpp (Browse further)