3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00
Commit graph

2364 commits

Author SHA1 Message Date
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
Nikolaj Bjorner
ae1656a92c working on bcd2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-17 15:37:03 -07:00
Nikolaj Bjorner
7237be768b fixing bugs in refactored code exposed from White's example
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-17 11:06:43 -07:00
Nikolaj Bjorner
c84ab2fc01 tidy
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-14 22:12:22 -07:00
Nikolaj Bjorner
e32666927b tidy
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-14 21:59:39 -07:00
Nikolaj Bjorner
91dc527635 tidy
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-14 21:18:18 -07:00
Nikolaj Bjorner
ac31e3856e refactor weighted maxsmt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-14 16:25:52 -07:00
Nikolaj Bjorner
00f45579cc refactor weighted maxsmt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-14 16:24:23 -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
Ken McMillan
60ef669fbc removed distinct predicate hack 2014-04-10 17:54:49 -07:00
Ken McMillan
de81db9a3b fixed several interpolation problems 2014-04-10 17:53:17 -07:00
Ken McMillan
f7d589fc49 changed fixedpoint output format for easier parsing in Boogie 2014-04-10 17:53:00 -07:00
Christoph M. Wintersteiger
52b54f395b FPA division bugfix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-10 19:33:34 +01:00
Christoph M. Wintersteiger
64bfbb657c .NET API documentation XML build fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-09 11:39:05 +01:00
Christoph M. Wintersteiger
1572d790cf Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2014-04-09 11:31:52 +01:00
Christoph M. Wintersteiger
aa006fa237 added dotnet generated files to .gitignore
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-09 11:31:44 +01:00
Christoph M. Wintersteiger
a3b89a8af3 .NET API documentation fixes
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-09 11:24:42 +01:00
Christoph M. Wintersteiger
b6c0b8c9ff Compilation fix for FreeBSD 2014-04-07 16:09:22 +01:00
Ken McMillan
58ffffe4d4 hack to filter out Boogie axioms with large "distinct" predicates that cause legacy solver death 2014-04-06 13:01:20 -07:00
Ken McMillan
2b492f04f6 merging duality and interpolation changes 2014-04-04 15:50:59 -07:00
Ken McMillan
bdc7bfde87 duality quantifier simplification fix 2014-04-04 13:10:18 -07:00
Christoph M. Wintersteiger
dee21c6656 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2014-04-04 17:57:57 +01:00
Christoph M. Wintersteiger
9c052f589d C API bugfix (Stackoverflow #22864146)
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-04 17:57:50 +01:00
Ken McMillan
43644fc2cb g++ pedantry 2014-04-04 01:28:09 +01:00
Ken McMillan
588aeff5c3 merged interpolation and duality changes 2014-04-03 17:11:15 -07:00
Ken McMillan
fc62be37b6 getting rid of DOS line endings 2014-04-03 17:09:11 -07:00
Ken McMillan
9a2fe83697 interpolation fix 2014-04-03 13:20:08 -07:00
Christoph M. Wintersteiger
4444eb361c bugfix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-03 13:11:39 +01:00
Christoph M. Wintersteiger
944dfee008 .NET and Java API Bugfix (Codeplex issue 101)
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-02 19:25:05 +01:00
Christoph M. Wintersteiger
7bb1469d71 removed debugging code.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-02 19:10:30 +01:00
Christoph M. Wintersteiger
a833c9ac41 Fixed bug (codeplex issue 102)
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-04-02 17:56:55 +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
Ken McMillan
4671c1be41 duality fix 2014-04-01 17:50:48 -07:00
Ken McMillan
278d619521 set text default to auto to try to avoid crlf disasters 2014-04-01 17:20:37 -07:00
Ken McMillan
6c9483c70a interpolation fix and improving duality quantifier handling 2014-04-01 17:10:14 -07:00
Nikolaj Bjorner
7fd6549a40 another sls example
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-31 23:32:31 +02:00
Nikolaj Bjorner
deb325b8c2 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-03-31 23:31:06 +02:00
Nikolaj Bjorner
f321f19b20 adding bcd2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-31 23:30:59 +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