mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-10 01:05:47 +00:00
Code Activity
3621 commits 25 branches 48 tags 159 MiB
Commit graph

57 commits

Author SHA1 Message Date
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
64bd62b17e fix gcc compiler warnings 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-05-16 11:56:04 +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
51267f3aba take into account that bound from optimization may create atom that clashes with inequality bound from term 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-03-11 00:26:49 -07:00
Nikolaj Bjorner
e50e02e656 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2015-01-20 16:38:55 -08: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
82f1e81ac2 fix build errors on gcc 
Signed-off-by: Nikolaj Bjorner <nbjorner@z3-mac.local>
 2015-01-19 00:50:08 +00: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
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
ae3d16bc50 fix overflow and integrality bugs reported by Phan 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-12-15 16:18:09 -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
465eafbf45 fix assertion for integrality, lax noprogress bail out code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-07-09 05:04:00 +02: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
ff1543d700 fix APIs, add python API 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-03-23 21:28:11 -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
363af825c0 working on stand-alone simplex 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-01-26 20:25:36 -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
32762b54a7 debug looping behavior 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-27 07:50:25 -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
0d6220f383 revert is_all_int bugfix 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-18 21:53:04 +02: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
392b419367 debug min_max 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-18 09:14:10 +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
909408d6ef fix is_all_int bug 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-15 10:58:23 +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
8c85ee6b7c fixing lex optimization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-13 23:36:42 +01:00
Nikolaj Bjorner
56562a725d fixing bugs 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-12-11 19:24:20 -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
1c0442ea31 Workaround for theory vars without unassigned atoms 2013-12-11 11:49:40 -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
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
883018b405 v1 of conflict driven optimization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-03 19:27:06 -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
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
5106c74b3e preparing for inf extension of arithmetic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 02:13:24 -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