3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-14 04:48:45 +00:00
Commit graph

80 commits

Author SHA1 Message Date
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
Christoph M. Wintersteiger 8fe2db1eed Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-04-25 18:11:48 +01:00
Christoph M. Wintersteiger 4ff6a7c38d compilation fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-25 18:11:30 +01:00
Christoph M. Wintersteiger 216b4d1aaa Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-04-25 18:06:03 +01: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
Christoph M. Wintersteiger bfdea4242c removed unused file
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-25 18:03:35 +01:00
Christoph M. Wintersteiger a3f20774a8 BVSLS comments
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-25 17:17:47 +01:00
Andreas Froehlich 3df2967be9 Cleaned up final SLS version. Enjoy! 2014-04-25 13:56:15 +01:00
Andreas Froehlich 9ebfb119db Moved parameters to the right file. Almost clean. 2014-04-23 14:52:18 +01:00
Andreas Froehlich c441bb4388 Backup before I touch early pruning ... 2014-04-22 16:10:44 +01:00
Andreas Froehlich 8346aed39c Fixed bug with VNS repick. 2014-04-22 01:07:30 +01:00
Andreas Froehlich c1741d7941 Almost cleaned up version. 2014-04-22 00:32:45 +01:00
Andreas Froehlich 5ab65d52a6 Merge branch 'bvsls' of https://git01.codeplex.com/z3 into bvsls
Conflicts:
	src/tactic/sls/sls_engine.cpp
	src/tactic/sls/sls_engine.h
	src/tactic/sls/sls_evaluator.h
	src/tactic/sls/sls_tracker.h
2014-04-21 17:05:19 +01:00
Andreas Froehlich ef1d8f2acc Current version before integration ... 2014-04-20 16:38:49 +01:00
Nikolaj Bjorner 1db7e0a149 fix compiler warnings reported by Robert White
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-02 15:54:28 +02:00
Christoph M. Wintersteiger 3bc31b6603 bvsls integration with opt::wmaxsmt
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-03-31 17:41:34 +01:00
Christoph M. Wintersteiger 8e5659ac4c compilation fixes
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-03-28 12:30:15 +00:00
Christoph M. Wintersteiger 176715aea0 compilation fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-03-28 12:28:40 +00:00
Christoph M. Wintersteiger 883762d54a removed dependency of bvsls on goal_refs
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-03-28 12:27:06 +00:00
Christoph M. Wintersteiger 6f9a348f63 removed dependency of bvsls on goal_refs
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-03-26 17:26:06 +00: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 4be468d312 Reorganized the SLS code.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-09-19 16:18:23 +01:00