3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 21:38:44 +00:00
Commit graph

103 commits

Author SHA1 Message Date
Nikolaj Bjorner 960e8ea1d5 working on hitting sets
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-08 14:12:54 +01:00
Nikolaj Bjorner 4415df3fcf various fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-02 19:10:20 +05:30
Nikolaj Bjorner 57fc0f3f55 bug fixes to min-max, and experiments with hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-28 15:44:39 -07:00
Nikolaj Bjorner 2071029bb3 hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-27 15:45:33 -07:00
Nikolaj Bjorner e370fbb7ed updated maxhs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-27 11:38:43 -07:00
Nikolaj Bjorner 698705b7fa initial version of HS maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-24 18:39:43 -07:00
Nikolaj Bjorner 61dcdcb9d1 separate inc sat solver for now
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-15 11:25:05 -07:00
Nikolaj Bjorner 33e2f2012d inc sat experiment
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-15 08:46:20 -07:00
Nikolaj Bjorner d849b5c637 experiment with sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-14 19:40:58 -07:00
Nikolaj Bjorner 81c2560854 experimenting with inc-sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-14 15:13:26 -07:00
Nikolaj Bjorner 6d6abb4dde experimenting with inc_sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-14 09:27:47 -07:00
Nikolaj Bjorner 6821d61ac4 working on incremental sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-13 17:19:19 -07:00
Nikolaj Bjorner cad1e5cab3 move to scoped state, change default parameter for sls until bv is debugged
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-11 18:39:36 -07:00
Nikolaj Bjorner 252b9e8819 fix lower/upper bound estimate with respect to offset
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 16:32:17 -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 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
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 23a74b3c26 fix assertions reported by Christoph
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-23 08:07:37 +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 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
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