3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-18 22:59:02 +00:00
Commit graph

106 commits

Author SHA1 Message Date
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