3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Commit graph

211 commits

Author SHA1 Message Date
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
23a74b3c26 fix assertions reported by Christoph
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-23 08:07:37 +02: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
beaa50e0d8 fixing sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-21 18:07:02 +02: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
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
3bc31b6603 bvsls integration with opt::wmaxsmt
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-03-31 17:41:34 +01:00
Nikolaj Bjorner
d67f1f36c4 refactor weighted theory solver into own file
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-29 16:54:12 -07:00
Nikolaj Bjorner
efe2a70f6f integrating SLS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-28 14:30:36 -07:00
Nikolaj Bjorner
3d7f208ce6 add bvsls module as backend to weighted maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-28 13:32:31 -07:00
Christoph M. Wintersteiger
a26e299390 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-03-28 17:46:32 +00:00
Christoph M. Wintersteiger
c068db16e8 first attempts at getting to the bvsls from opt_context. 2014-03-28 17:46:26 +00:00
Nikolaj Bjorner
ac7fffa9cb fix bug exposed by example by Robert White
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-28 08:34:31 -07:00
Nikolaj Bjorner
fdf150d762 adding bcp2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-25 17:08:58 -07:00
Nikolaj Bjorner
ede9549818 fix compilation errors
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-25 13:43:45 -07:00
Nikolaj Bjorner
5f245de36d new test file
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-24 10:47:00 -07:00
Nikolaj Bjorner
ff1543d700 fix APIs, add python API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-23 21:28:11 -07:00
Nikolaj Bjorner
0181f0f9df add bvmax tactic, add proviso for non-0 lower bounds in elim01
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-23 18:03:20 -07:00
Nikolaj Bjorner
ea261c930d fix memory leak in scoped_numeral_vector
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-22 20:34:34 -07:00
Nikolaj Bjorner
92145f2bfa integrate opt with push/pop/check-sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-22 16:31:48 -07:00
Nikolaj Bjorner
fdaeb9bb73 integrate opt with push/pop/check-sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-22 16:15:50 -07:00
Nikolaj Bjorner
7c4bd23b3d check types
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-22 01:07:38 -07:00
Nikolaj Bjorner
9556a223f3 check types
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-22 00:54:14 -07:00
Nikolaj Bjorner
2c69aa0df1 fix duplicate class
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-22 00:06:34 -07:00
Nikolaj Bjorner
8cbe257434 improved SLS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-21 14:33:29 -07:00
Nikolaj Bjorner
25383796c6 improved SLS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-20 22:22:46 -07:00
Nikolaj Bjorner
d9796ec030 improved SLS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-20 22:19:30 -07:00
Nikolaj Bjorner
39ac22c37e sls testing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-20 17:34:01 -07:00
Nikolaj Bjorner
8a63ae0cdf patch bounds normalization bug found by dvitek
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-19 17:59:20 -07:00
Nikolaj Bjorner
e3a854743b working on SLS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-19 15:55:16 -07:00
Nikolaj Bjorner
2909e8cd9e working on SLS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-19 15:53:28 -07:00
Nikolaj Bjorner
3b3498c4b5 initial sls experiment
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-19 15:39:11 -07:00
Nikolaj Bjorner
78975827b2 add sls test to wmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-18 21:30:45 -07:00