3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-22 08:35:31 +00:00
Commit graph

2099 commits

Author SHA1 Message Date
Nikolaj Bjorner
9c1f85e564 addressing compiler warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 11:03:11 -07:00
Nikolaj Bjorner
05a39cb2cf fix wrong simplex backtracking
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 08:51:07 -07:00
Nikolaj Bjorner
d2db8007d8 tuning pb/max
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-06 04:01:10 -07:00
Nikolaj Bjorner
7ade3f2c04 fix sls based on pkb120
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-05 19:22:34 -07:00
Nikolaj Bjorner
f1ebf2002a tuning sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-05 16:40:54 -07:00
Nikolaj Bjorner
25ad9d2ee1 tuning based on benchmarks from Robert White
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-05 14:43:06 -07:00
Nikolaj Bjorner
182fea2d7b fix bcd2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-05 10:21:16 -07:00
Christoph M. Wintersteiger
c3b7c738f8 Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt
Conflicts:
	scripts/mk_project.py
	src/duality/duality.h
	src/duality/duality_solver.cpp
	src/duality/duality_wrapper.h
	src/interp/iz3hash.h

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-25 22:18:41 +01:00
Christoph M. Wintersteiger
fceaf97c95 Merge branch 'unstable' of https://git01.codeplex.com/z3 into bvsls 2014-04-25 22:11:34 +01:00
Christoph M. Wintersteiger
a5ce28d82a bugfix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-25 22:10:53 +01: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
Nikolaj Bjorner
20cb8a3092 added pareto utility
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-25 03:00:31 +02:00
Christoph M. Wintersteiger
fb4c07a2ea FPA refactoring in preparation for FPA support in the kernel.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-23 18:36:38 +01:00
Andreas Froehlich
9ebfb119db Moved parameters to the right file. Almost clean. 2014-04-23 14:52:18 +01:00
Nikolaj Bjorner
4d2d334999 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2014-04-23 14:44:03 +02:00
Nikolaj Bjorner
7d16ed9fdc fix exception class in python API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-23 14:13:01 +02:00
Nikolaj Bjorner
55863b4bb5 fix build problems, fix scoping
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-23 14:05:59 +02: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
Nikolaj Bjorner
a5ec46b167 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-04-23 08:23:04 +02:00
Nikolaj Bjorner
23a74b3c26 fix assertions reported by Christoph
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-23 08:07:37 +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
Nikolaj Bjorner
d67b5226f0 fix compiler errors reported by Robert White
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-22 16:59:40 +02:00
Nikolaj Bjorner
3003049df8 fix bug in bcd2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-22 15:41:11 +02:00
Nikolaj Bjorner
d118f07e37 fix maximize name in C++ API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-22 14:48:05 +02: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
Nikolaj Bjorner
beaa50e0d8 fixing sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-21 18:07:02 +02: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
1f66e46c67 move sls functionality to solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-19 20:50:44 -07:00
Nikolaj Bjorner
3f5ed8ff11 coallesce common code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-19 20:27:39 -07: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
Nikolaj Bjorner
ff154a09b3 sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-19 12:12:51 -07:00
Nikolaj Bjorner
032e2618f6 refactor
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-19 11:58:57 -07:00
Nikolaj Bjorner
5ead06bcef adding SLS solver layer
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-18 10:29:52 -07:00
Nikolaj Bjorner
e3b346df6f working on bcd2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-18 08:04:18 -07:00