3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-17 18:06:40 +00:00
Commit graph

73 commits

Author SHA1 Message Date
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
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
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
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
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
Nikolaj Bjorner
9811054e72 adding pb sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-18 14:17:21 -07:00
Nikolaj Bjorner
4effa7f0c0 debug opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-17 21:13:31 -07:00
Nikolaj Bjorner
af55088b78 debugging opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-17 10:34:32 -07:00
Nikolaj Bjorner
eb6d39ba46 fix memory smash
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-02-27 11:49:25 -08:00
Nikolaj Bjorner
11845a1ce4 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-01-27 11:19:07 -08:00
Nikolaj Bjorner
fb86cf980b local change
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-27 11:18:48 -08:00
Nikolaj Bjorner
c14c65465a working on stand-alone simplex
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-26 19:46:42 -08:00
Nikolaj Bjorner
c6a9dae00a use external stack instead to manage memory
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-15 20:26:48 -08:00
Nikolaj Bjorner
ff54b3d92b fix memory leak for scoped_numeral over trail objects
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-15 17:00:07 -08:00
Nikolaj Bjorner
39dcc653df fix normalization regression
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-13 20:20:26 -08:00
Nikolaj Bjorner
236b2d2ff3 working on incremtal PB theory
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-13 10:12:45 -08:00
Nikolaj Bjorner
23e811d136 merge with unstable
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-05 20:44:56 -08:00
Nikolaj Bjorner
3fa0e6f3fb testing decomposition during pre-processing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-02 16:05:26 -08:00
Nikolaj Bjorner
c5b82796ca moving parameters to theory_pb
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-01 20:00:10 -08:00
Nikolaj Bjorner
eb4def108f reinit logic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-27 17:45:14 -08:00
Nikolaj Bjorner
0641c4f694 working on pre-processing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-26 09:53:33 -08:00
Nikolaj Bjorner
24f2fd380c adding pre-processing of BP constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-23 01:33:24 -08:00
Nikolaj Bjorner
670f56e5e4 adjust benchmark generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-21 07:09:39 -08:00
Nikolaj Bjorner
6aa0086969 adding wpm2 algorithm
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-20 16:46:23 -08:00
Nikolaj Bjorner
0deb951873 different strategies for weighted
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-20 12:04:17 +01:00
Nikolaj Bjorner
26237a3727 debug benchmarks, theory_pb
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-19 07:40:18 +02:00
Nikolaj Bjorner
02f74f1028 trying Cezary's example
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-17 05:03:20 +02:00
Nikolaj Bjorner
56b9c4c8a2 fix bugs reported by phan
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-17 04:20:24 +02:00
Nikolaj Bjorner
1bcf5b8b5f remove auxiliary variables from weighted maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-16 11:42:28 +02:00
Nikolaj Bjorner
15b64261dd fix wmaxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-16 04:55:56 +02:00