3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-14 11:14:43 +00:00
Commit graph

57 commits

Author SHA1 Message Date
Nikolaj Bjorner
9c7e5c37d1 add equality propagation based on partial length information to sequence theory. Fix issue #429
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-02-04 08:12:46 -08:00
Nikolaj Bjorner
9a6fe93e6c re-enable feature that lets Z3 solver mixed integer/real constraints with additional information tha texpressions with sort real can only take integer values. Fixes regression on epsilon.smt2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-12 12:42:18 -08:00
Nikolaj Bjorner
20cfbcd66b dealing with issues #402 #399 #258
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-09 13:29:44 -08:00
Nikolaj Bjorner
af758dea4a tuning for seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-05 08:23:44 -08:00
Nikolaj Bjorner
071a654a9a seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-27 04:41:25 -08:00
Nikolaj Bjorner
3d993a4ee1 Merge branch 'master' of https://github.com/Z3Prover/z3 into nsb/master 2015-11-06 17:29:53 -08:00
Nikolaj Bjorner
b4cb51cdb3 working on Forking/Serializing a z3 Solver #209
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-06 17:29:24 -08:00
Nikolaj Bjorner
fc592fc856 fix for #291. The root issue is that the set of antecedents is recycled as a fixed object between routines. Antecedents that were already allocated for a Gomory cut got reset by the internalizer. This causes unsound bounds axioms to be created
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-05 15:08:42 -08:00
Nikolaj Bjorner
4bc044c982 update header guards to be C++ style. Fixes issue #9
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-07-08 23:18:40 -07:00
Nikolaj Bjorner
d9522cfd07 fix mixed integer/real bugs for maximization exposed by non-termination in slow.smt. partially fixes issue #56
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-06-23 12:05:19 +02:00
Nikolaj Bjorner
9734407cde disable throttle on unbounded objectives in shared theories. It may violate an interface equality, to fix issue #120
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-06-02 11:14:59 -07:00
Nikolaj Bjorner
534271db08 adding parameters to gomory cut axioms
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-05-27 14:48:51 -07:00
Nikolaj Bjorner
e8811748d3 fix regressions in nl/smt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-16 19:08:37 +01:00
Nikolaj Bjorner
ffc3a36dcb checked ite-expressions as shared for bounds detection
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-23 19:59:33 +02: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
4bb5302def template args
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-01-18 15:54:18 -08:00
Nikolaj Bjorner
d45c7ce082 prepare revised primal phase
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-01-18 04:11:40 +05:30
Nikolaj Bjorner
05b7aa3ebb flush cache when proof mode changes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-01-15 14:32:18 +05:30
Nikolaj Bjorner
e28701a64c add assertions to simplifier
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-01-14 22:09:48 +05:30
Nikolaj Bjorner
52c6f7c3b1 refine the safety check for leaving basis. As long as all base variables are unbounded in compatible directions as the non-basic variable we can detect unbounded variables. This partial check fixes integer divergence in a case exposed by Karpenov. Establishing or converting this to a check that always identifies unbounded integer variables is left for further analysis.
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-01-06 15:22:40 -08: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
ce18421a7a fix box
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-15 14:29:39 -07:00
Nikolaj Bjorner
e6725b2344 merge unstable into opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-26 12:12:24 -07:00
Nikolaj Bjorner
d01ca11001 reduce asymptotic overhead of asserting bounds
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-16 17:13:09 -07:00
Nikolaj Bjorner
c09903288f have free variable utility use a class for more efficient re-use
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-15 16:14:22 -07:00
Nikolaj Bjorner
f151879c0b enable neat vs. less neat pretty priting as an option
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-09 16:25:41 -07:00
Nikolaj Bjorner
89f0319043 tune assertions of bounds
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-01 11:19:05 -07:00
Nikolaj Bjorner
3cbcd19a9b bounds axiom tuning
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-31 12:40:13 -07:00
Nikolaj Bjorner
3d995648ee partial fix to model generation bug for non-linear constraints: avoid epsilon refinment for non-shared variables
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-07 20:39:20 +09:00
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
99b4ce037d integrating diff opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-05 16:29:26 -08:00
Nikolaj Bjorner
32762b54a7 debug looping behavior
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-27 07:50:25 -08:00
Nikolaj Bjorner
cff0e0fc6c debug min_max
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-18 09:18:06 +02:00
Nikolaj Bjorner
eb1b578bfb fixing optimizaiton bug
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-18 08:43:07 +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
a617eac010 enable bounding for various domains
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-06 19:36:12 -08:00
Anh-Dung Phan
87a2b99091 Clean up 2013-11-25 12:16:34 -08:00
Anh-Dung Phan
cc3d65e544 Add facilities to get optimal assignments 2013-11-24 22:31:52 +01: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
3c6f0c737a debugging infinite upper bound checking
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-01 17:26:27 -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
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
Anh-Dung Phan
a6e103dd36 Make a few variables private 2013-10-30 06:30:51 +01: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
Anh-Dung Phan
b67d333cf9 First complete version of Network Simplex 2013-10-29 18:32:10 -07:00
Nikolaj Bjorner
7c8fbbb06a fixing bug with optimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-24 12:03:05 +08:00
Nikolaj Bjorner
11010086be fixing bug with optimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-24 11:57:30 +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
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