mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-08 18:31:49 +00:00
Code Activity
5898 commits 23 branches 48 tags 156 MiB
Commit graph

448 commits

Author SHA1 Message Date
Nikolaj Bjorner 84d971b69a working on HS 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-06-17 17:05:05 -07:00
Nikolaj Bjorner b64b12cae3 working on HS 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-06-17 12:54:50 -07:00
Nikolaj Bjorner bad03822b4 working on HS 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-06-16 16:55:48 -07:00
Nikolaj Bjorner 63550d8a1a bug fixes in hsmax 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-06-15 05:44:03 -07:00
Nikolaj Bjorner ef62a52fff cleanup 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-06-14 18:45:16 -07:00
Nikolaj Bjorner 7fbe7124f9 bugfixes to hsmax 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-06-14 17:29:53 -07:00
Nikolaj Bjorner 5427964c54 use approximate hitting set implementation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-06-14 14:08:55 -07:00
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 03979fd580 fix up pareto callback mechanism 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-05-13 12:48:17 -07:00
Nikolaj Bjorner 1ea376e310 edits 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-05-13 10:33:09 -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 e9a11bd93b fix emptines check 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-05-10 17:43:42 -07:00
Nikolaj Bjorner fb0305d5ec update timeout logic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-05-09 22:27:35 -07:00
Nikolaj Bjorner cf55854d22 adding scoped state 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-05-09 17:21:16 -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 02b419c939 add logging 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-05-09 11:36:08 -07:00
Nikolaj Bjorner f1194ffeaa add logging 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-05-09 11:34:15 -07:00
Nikolaj Bjorner 4dc71acde0 add logging 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-05-09 11:31:54 -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
Nikolaj Bjorner 20cb8a3092 added pareto utility 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-04-25 03:00:31 +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 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
Nikolaj Bjorner 7b0ffc9108 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-03-18 20:04:33 -07:00
Nikolaj Bjorner e11e1231dc snapshot 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-03-18 20:04:15 -07:00
Nikolaj Bjorner ce2338d4fb working on pb sls 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-03-18 20:04:00 -07:00
Nikolaj Bjorner 94b3a46811 working on pb sls 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-03-18 16:06:04 -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 f82f7f83b9 adding optimization to dense difference logic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-03-14 14:42:01 -07:00
Nikolaj Bjorner 99b4ce037d integrating diff opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-03-05 16:29:26 -08: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 51cb63b6c0 adding simplex 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-02-12 20:20:52 -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 1f7c994e43 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-01-06 16:23:50 -08:00
Nikolaj Bjorner 5adb4a22d1 enable partial results 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-01-06 16:23:37 -08:00
Nikolaj Bjorner f1710e5618 check parameters 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-01-06 16:06:47 -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 a307bd67e0 pareto take 3 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-01-02 01:35:31 -08:00
Nikolaj Bjorner 8883234647 pareto2 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-01-01 22:32:27 -08:00
Nikolaj Bjorner af27efbf4a pareto0 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-01-01 21:13:25 -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 58f8181a74 fixes to dotnet interface 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-26 17:14:29 -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 392b419367 debug min_max 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-18 09:14:10 +02:00
Nikolaj Bjorner 22166d0760 remove print 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-18 05:59:16 +02:00
Nikolaj Bjorner 72130ac7b9 fix lower bound update 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-18 05:49:43 +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
Nikolaj Bjorner ddd0bf875d fix bugs in optimization for integers 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-15 08:46:24 +02:00
Nikolaj Bjorner fe5c42c90f fixes to bugs exposed by regressions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-15 05:23:47 +02:00
Nikolaj Bjorner 50f18a77af disable 'optimization' that led to wrong model' 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-15 02:40:52 +02:00
Nikolaj Bjorner ac893e907f fixes to maxsmt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-14 16:06:03 +02:00
Nikolaj Bjorner 5f72325e99 working on maxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-14 10:00:21 +02:00
Nikolaj Bjorner 04824d86df fixes to model generation of weighted maxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-14 09:37:42 +02:00
Nikolaj Bjorner 5225ea18b7 fix lower/upper bound updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-14 09:04:48 +02:00
Nikolaj Bjorner 8c85ee6b7c fixing lex optimization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-13 23:36:42 +01:00
Nikolaj Bjorner df5c2adc4e debug opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-12 15:39:38 -06:00
Nikolaj Bjorner f41d23bc0f debugging model generation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-12 12:18:34 -06:00
Nikolaj Bjorner eacb48268c fixing bugs exposed by msf unit tests 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-11 19:02:36 -06:00
Anh-Dung Phan a737639790 Skip lower bound assertions for unbounded objectives 2013-12-11 12:56:48 -08:00
Anh-Dung Phan 34c96a8fe0 Simple guard in order to not get model before setting solver 2013-12-10 17:10:23 -08:00
Nikolaj Bjorner 2c577a304d bug fixes to pb; working on model extraction 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-10 15:16:58 -08:00
Nikolaj Bjorner 0f0397b05f hunt bugs exposed by so.smt2 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-08 18:58:48 -08:00
Nikolaj Bjorner 97b2fc9ee7 fix bugs exposed by testSolver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-08 18:34:28 -08:00
Nikolaj Bjorner f0ef339623 fix bug exposed by lia2maxsmt4 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-08 12:30:52 -08:00
Nikolaj Bjorner ddb30c51b5 debugging lia2maxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-08 12:17:33 -08:00
Nikolaj Bjorner 370a4b66de update lower bounds from feasible solutiosn 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-07 22:09:57 -08:00
Nikolaj Bjorner e307c5fdda fix minimize->maxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-07 14:47:47 -08:00
Nikolaj Bjorner da348fe1c0 first pass on normalization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-07 14:38:09 -08:00
Nikolaj Bjorner a617eac010 enable bounding for various domains 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-06 19:36:12 -08:00
Nikolaj Bjorner 437a545c3b fix pretty printer 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-06 13:12:35 -08:00
Nikolaj Bjorner 4d6aa1a0f3 add to_string and get_help methods to optimize API 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-06 11:34:41 -08:00
Anh-Dung Phan d38e2b9b78 Expose objective indices to .NET API 2013-12-05 17:30:40 -08:00
Nikolaj Bjorner 192ce11ca6 change model binding time 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-05 11:42:04 -08:00
Nikolaj Bjorner 56c4fa8f6d expose models, working on network flow 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-04 17:39:54 -08:00
Nikolaj Bjorner b980a15177 fix leak by commenting out probe experiment 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-04 13:02:49 -08:00
Nikolaj Bjorner e3fe80fd4d add .NET interface and finish C interface for optimization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-03 20:20:24 -08:00
Nikolaj Bjorner 9e2908c3f5 exposing lower/upper 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-03 17:46:52 -08:00
Nikolaj Bjorner 838a32206c adjust parsing 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-03 14:10:07 -08:00
Nikolaj Bjorner 18815e3e53 reorganizing input 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-03 13:36:25 -08:00
Nikolaj Bjorner 51704b7b95 tweaking input processing 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-03 08:51:46 -08:00
Nikolaj Bjorner 03f5020d0b Nits 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-02 22:06:15 -08:00
Nikolaj Bjorner af5d989d6c change verbosity level 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-02 21:51:20 -08:00
Nikolaj Bjorner c14c778735 debugging multi-objective interface and pb revisions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-02 14:30:17 -08:00
Nikolaj Bjorner faa59ba7f9 debugging multi-objective interface and pb revisions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-02 14:14:44 -08:00
Nikolaj Bjorner 191efbb72f use expression structure for objectives instead of custom s-expression 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-02 13:00:51 -08:00
Nikolaj Bjorner a016caa5d8 add expression conversion 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-02 09:47:59 -08:00
Anh-Dung Phan 5ed8a48ac2 Add push/pop to box optimization 2013-11-26 14:16:59 -08:00
Anh-Dung Phan 4aa9c742ab Revise optimize commands 2013-11-26 12:54:18 -08:00
Anh-Dung Phan dbc791d385 Reorganize combination of objectives 2013-11-26 09:20:11 +01:00
Anh-Dung Phan 87a2b99091 Clean up 2013-11-25 12:16:34 -08:00
Nikolaj Bjorner 2ff51e9a60 move model_evaluator from pdr to model, call it model_implicant 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-23 21:33:35 +01:00
Nikolaj Bjorner 97dfb6d521 moving to rational coefficients 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-21 15:55:08 -08:00
Nikolaj Bjorner ee0abfbfe9 rename card->pb 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 21:25:02 -08:00
Nikolaj Bjorner 2b2d0e155c debugged new pb solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 18:03:49 -08:00
Nikolaj Bjorner 86e22c1186 add validation option 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 09:44:20 -08:00
Nikolaj Bjorner 9734bab205 pb theory 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-17 21:10:15 -08:00
Anh-Dung Phan 761c95129b Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-15 16:59:01 -08:00
Anh-Dung Phan c837f62863 Use quick explain for unsat core in Fu Malik algorithm by default 2013-11-15 16:58:42 -08:00
Nikolaj Bjorner 314f03c12c started new PB solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-15 16:44:08 -08:00
Anh-Dung Phan 074e851d49 Display Fu Malik statistics 2013-11-15 12:58:11 -08:00
Anh-Dung Phan 0acf331ed1 Merge conflicts 2013-11-14 19:07:23 -08:00
Anh-Dung Phan 4be11f24e1 Instrument fu_malik to use the new SAT solver (WIP) 2013-11-14 19:02:15 -08:00
Nikolaj Bjorner e034331f2e working on pb solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-14 18:04:55 -08:00
Nikolaj Bjorner 06ae0db116 working on pb solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-14 18:04:05 -08:00
Anh-Dung Phan d729e89a7b Fix a minor bug on cardinality solver 2013-11-14 12:36:39 -08:00
Anh-Dung Phan 5921628f53 Dump opt_solver checksat calls for profiling 2013-11-13 18:46:18 -08:00
Nikolaj Bjorner d1937b2032 add PB operators to C-based API 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-13 17:09:10 -08:00
Anh-Dung Phan 64daa2977d Fix termination conditions on core_maxsat 2013-11-12 16:14:21 -08:00
Nikolaj Bjorner 293a97bdfc working on core-maxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-09 15:54:38 -08:00
Nikolaj Bjorner 2349a0fcdd adding core-based max-sat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-09 12:35:20 -08:00
Nikolaj Bjorner dc78da4873 case analysis for commit 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 23:29:31 -08:00
Nikolaj Bjorner ba05f79415 bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 22:40:43 -08:00
Nikolaj Bjorner b573b94f84 nits 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 21:59:38 -08:00
Nikolaj Bjorner 21058c38fd fix bounds for weighted maxsmt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 21:26:05 -08:00
Nikolaj Bjorner 6e1c186017 enable answer generation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 20:55:01 -08:00
Nikolaj Bjorner 816029c862 missing 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 20:04:30 -08:00
Nikolaj Bjorner c6c7093a4c make max-smt solvers generic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 18:22:07 -08:00
Nikolaj Bjorner 9f53a4aa18 working on supporting multiple max-sat objectives 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 16:54:34 -08:00
Nikolaj Bjorner f350efffc7 working on pareto and upper/lower bound facilities 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 13:52:27 -08:00
Nikolaj Bjorner 6caee5e3ca more refactoring 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 13:16:10 -08:00
Nikolaj Bjorner 29cc9025cb renaming to optsmt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 12:41:05 -08:00
Nikolaj Bjorner 33be06c6dc continued re-factoring 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-08 09:00:24 -08:00
Nikolaj Bjorner 401fced400 separate out file for objectives 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-07 18:09:44 -08:00
Anh-Dung Phan 034b33b6da Remove m_final from spanning tree representation 2013-11-06 13:30:29 -08:00
Nikolaj Bjorner 9467806a5c debugging cardinality theory 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-05 09:39:28 -08:00
Nikolaj Bjorner 2853b322ca sketch cardinality plugin module 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-05 01:30:34 -08:00
Nikolaj Bjorner acb26d0cf9 review of network flow 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-04 16:00:50 -08:00
Nikolaj Bjorner 89989627d0 add blast method for ite terms 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-04 13:33:02 -08:00
Nikolaj Bjorner 883018b405 v1 of conflict driven optimization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-03 19:27:06 -08:00
Nikolaj Bjorner a26bd69a5e missing new files 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-03 14:55:48 -08:00
Nikolaj Bjorner c0de1e34ac working on upper bound optimziation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-03 14:54:42 -08:00
Nikolaj Bjorner e5698119d7 debugging infinite upper bound checking 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-01 17:27:24 -07:00
Nikolaj Bjorner 3c6f0c737a debugging infinite upper bound checking 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-01 17:26:27 -07:00
Nikolaj Bjorner 2a907ea52a fix objective value regression in simplex maximation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-01 12:45:26 -07:00
Nikolaj Bjorner 87141f4cb3 fix bugs 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 22:09:52 -07:00
Nikolaj Bjorner 72e82532b2 enabling upper bound test 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 09:43:15 -07:00
Nikolaj Bjorner 637b63cbe1 preparing for inf extension of arithmetic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 02:15:08 -07:00
Nikolaj Bjorner 5106c74b3e preparing for inf extension of arithmetic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 02:13:24 -07:00
Nikolaj Bjorner 0b65aa83e8 preparing for inf extension of arithmetic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 02:02:37 -07:00
Nikolaj Bjorner acc7aa1636 use iterative weighted algorithm 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 00:57:36 -07:00
Nikolaj Bjorner 86151b4d52 dealing with cancel 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-30 13:38:47 -07:00
Nikolaj Bjorner 946b888b32 adding timeout, parameters, statistics 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-30 13:24:21 -07:00
Nikolaj Bjorner 9fc84f1389 adding timeout, parameters, statistics 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-30 13:23:04 -07:00
Nikolaj Bjorner 42cbbe830e working on wmaxsmt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-30 01:28:50 -07:00
Nikolaj Bjorner 6302d1b7db wmax nits 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-30 01:18:10 -07:00
Nikolaj Bjorner f5e6a18015 working on wmaxsmt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-29 21:16:02 -07:00
Nikolaj Bjorner bc44bcad10 push blocking code to optimizer context 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-29 20:26:54 -07:00
Nikolaj Bjorner 96562962fa working on wmaxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-29 17:40:37 -07:00
Nikolaj Bjorner 1878d64b02 working on weighted maxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-28 21:32:41 -07:00
Nikolaj Bjorner d30f183476 working on weighted maxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-28 21:30:57 -07:00
Nikolaj Bjorner d78d22deb6 working on weighted max smt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-28 17:13:23 -07:00
Anh-Dung Phan 6919f335a1 Sketch a skeleton of Difference Logic optimizer 2013-10-22 16:28:03 -07:00
Nikolaj Bjorner 36d7948399 fixing optimizer for multi-objectives and epsilon 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-22 10:36:13 +08:00
Anh-Dung Phan 3441fc2942 A few changes based on previous reviews 
Tested the optimization procedure with:
- unbounded objectives
- bounded with rational solutions
- bounded with irrational solutions
 2013-10-21 17:25:34 -07:00
Nikolaj Bjorner 3dd72f8f16 more updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-19 17:43:59 -07:00
Nikolaj Bjorner 3996f58a8e tidy & todo notes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-19 12:22:56 -07:00
Phan Anh Dung 53f78f7d19 Replace the use of optional<rational> by inf_eps_rational<rational> 
Also handle composite objectives correctly.
 2013-10-19 06:03:21 +02:00
Anh-Dung Phan a44044fb15 A rudimentary version of MathSAT optimization 
Remarks:
(1) The core procedure accepts maximization only
(2) Add lazy initialization to min_maximize_cmd
(3) The procedure isn't working with composite objective yet.
 2013-10-18 18:00:24 -07:00
Nikolaj Bjorner 898609a3ef cleanup macro usage 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-17 20:50:33 -07:00
Nikolaj Bjorner cfedbe3dfd add opt_solver layer 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-17 17:33:43 -07:00
Anh-Dung Phan f4e2b23238 Create placeholders to optimization methods 2013-10-16 17:56:35 -07:00
Anh-Dung Phan 3da47a280e Complete Fu & Malik MAXSAT implementation 
Mistakes:
(1) ast_manager shouldn't be replicated.
(2) assumptions should be used to compare with unsat cores
 2013-10-16 17:55:53 -07:00
Nikolaj Bjorner 8ae0b06912 fill in details on max sat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-16 02:07:30 -07:00
Nikolaj Bjorner 45eda6c6ad Fu&Malik v1 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-15 17:03:52 -07:00
Anh-Dung Phan ac97a12bb8 Create callbacks for min_maximize_cmd 
Enable VS_PROJ = true for temporary use
 2013-10-15 11:52:27 -07:00
Nikolaj Bjorner 726f66a77c initial opt commands 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-14 17:08:24 -07:00