3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-16 20:24:45 +00:00
Commit graph

51 commits

Author SHA1 Message Date
Nikolaj Bjorner
5994c5a948 fix partial model tracking over cancellation/exceptions, reported by August Shi. Fix regression test for fp-to-real, reset the pre-processor in inc_sat_solver on exceptions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-07 16:42:29 -08:00
Nikolaj Bjorner
32b6b2da44 moving to resource managed cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 13:13:11 -08:00
Nikolaj Bjorner
c58e640563 extract labels for optimal model. Fix to #325
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-18 14:53:08 -08:00
Nikolaj Bjorner
d06207f072 remove ite terms from objectives to synchronize values in tableau with objective value. Fixes part of (three repros) from issue #120
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-06-02 10:38:22 -07:00
Nikolaj Bjorner
a0f0b53686 fixes to #52, #53
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-28 14:48:59 -07:00
Nikolaj Bjorner
f8d04118d8 switch models for multiple box objectives. Feature request at codeplex issue 194, George Karpenov. Usage model is same as Pareto fronts you call check-sat multiple times until retrieving unsat
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-01 16:21:56 -07:00
Nikolaj Bjorner
e24db56650 integrating new integer primal loop
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-01-20 16:38:45 -08:00
Nikolaj Bjorner
f4dfb9ac82 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-12-09 20:57:34 +01:00
Nikolaj Bjorner
08cb8b8de8 address divergence in the case of shared theory symbols. Codeplex issue 147, thanks to George Karpenkov
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-12-09 16:04:25 +01:00
Nikolaj Bjorner
e9baaa0900 rename 'or' to 'fml' toe mae gcc happy, reported by Geroge Karpenkov
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-11-25 10:23:41 -08:00
Nikolaj Bjorner
630a3d6ea8 integrate bounds from original model
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-15 15:11:31 -07:00
Nikolaj Bjorner
ce18421a7a fix box
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-15 14:29:39 -07:00
Nikolaj Bjorner
ff69ee049b fix non-termination
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-14 16:45:54 -07:00
Nikolaj Bjorner
69a5634e7e adding symba designated strategy (back?) to optsmt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-14 16:33:55 -07:00
Nikolaj Bjorner
72f09e4729 better verbose pretty printing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-09 16:57:43 -07:00
Nikolaj Bjorner
c1580fb85a follow logic annotation/enable diff logic when configured
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-07 11:52:14 -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
20cb8a3092 added pareto utility
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-25 03:00:31 +02: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
ff1543d700 fix APIs, add python API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-23 21:28:11 -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
99b4ce037d integrating diff opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-05 16:29:26 -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
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
c5b82796ca moving parameters to theory_pb
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-01 20:00:10 -08: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
ac893e907f fixes to maxsmt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-14 16:06:03 +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
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
97b2fc9ee7 fix bugs exposed by testSolver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-08 18:34:28 -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
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
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
6e1c186017 enable answer generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 20:55:01 -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