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
|
0915e6fcd7
|
Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt
|
2014-04-25 22:03:49 +01:00 |
|
Christoph M. Wintersteiger
|
39b562da44
|
compilation fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
|
2014-04-25 22:03:26 +01:00 |
|
Christoph M. Wintersteiger
|
da4a2d6426
|
Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt
|
2014-04-25 21:54:40 +01:00 |
|
Christoph M. Wintersteiger
|
23dccdc7d5
|
compilation fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
|
2014-04-25 21:54:08 +01:00 |
|
Christoph M. Wintersteiger
|
5f0739cdc0
|
Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt
|
2014-04-25 21:50:29 +01:00 |
|
Christoph M. Wintersteiger
|
c9c40877a7
|
compilation fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
|
2014-04-25 21:49:35 +01:00 |
|
Christoph M. Wintersteiger
|
5fab191c6c
|
compilation fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
|
2014-04-25 18:58:19 +01: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 |
|
Nikolaj Bjorner
|
27fa7077a6
|
fix compiler warnings/errors reported by Robert White
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-04-23 09:22:31 +02:00 |
|
Christoph M. Wintersteiger
|
859013e9c9
|
bvsls opt engine bugfix/debugging
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
|
2014-04-22 19:13:43 +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
|
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 |
|
Christoph M. Wintersteiger
|
64106af5ec
|
bvsls_opt_engine fixes
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
|
2014-04-14 17:48:09 +01:00 |
|
Christoph M. Wintersteiger
|
71af72eed4
|
bugfix for bvsls_opt_engine
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
|
2014-04-14 15:24:47 +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
|
7d896e5a9a
|
bvsls_opt_engine bugfix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
|
2014-03-31 17:58:19 +01: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
|
c068db16e8
|
first attempts at getting to the bvsls from opt_context.
|
2014-03-28 17:46:26 +00:00 |
|
Christoph M. Wintersteiger
|
f8ee58b301
|
bvsls bugfix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
|
2014-03-28 15:28:02 +00:00 |
|
Christoph M. Wintersteiger
|
0f5d2e010d
|
bvsls refactoring
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
|
2014-03-28 15:26:52 +00:00 |
|
Christoph M. Wintersteiger
|
24d662ba49
|
bvsls refactoring
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
|
2014-03-28 14:58:59 +00: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
|
c5e059211f
|
bugfix
|
2014-03-27 13:37:04 +00:00 |
|
Christoph M. Wintersteiger
|
be2066a1a6
|
disabled old code
|
2014-03-27 13:34:21 +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
|
e3ae0ba0bd
|
SLS refactoring
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
|
2014-03-19 17:26:05 +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 |
|