3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Commit graph

148 commits

Author SHA1 Message Date
Anh-Dung Phan
ebed5fa037 WIP on min cost flow problem
Remarks:
1. Follow the template structure of diff_logic.h
2. Try to reuse dl_graph<Ext> with some ready-to-use graph algorithms
3. Need to add 'explanation' to 'GExt' in order to instantiate
dl_graph<_>
2013-10-24 17:58:15 -07:00
Phan Anh Dung
be81e77c70 Some progress on Network Simplex 2013-10-24 09:50:12 +02:00
Phan Anh Dung
1ff373072d Add objective functions to difference logic solver 2013-10-24 08:57:21 +02: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
6919f335a1 Sketch a skeleton of Difference Logic optimizer 2013-10-22 16:28:03 -07: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
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
Christoph M. Wintersteiger
3d910028bf fixed potential performance problem with fully interpreted sorts in the quantifier instantiation.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-09-27 16:55:05 +01:00
Nikolaj Bjorner
2e7f5303eb address incompleteness bug in axiomatization of int2bv
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-09-23 04:56:38 +03:00
Nikolaj Bjorner
fd1f4b9191 fix bugs reported by Anvesh
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-09-23 04:07:08 +03:00
Nikolaj Bjorner
5be4365b47 redo edit
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-09-15 16:53:52 -07:00
Nikolaj Bjorner
c54929e59f cycle through domain size before giving up
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-09-15 04:52:21 -07:00
Nikolaj Bjorner
21b27cd2d1 patching crash in data-type factory when fresh values are not produced
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-09-15 04:37:05 -07:00
Nikolaj Bjorner
419f99c329 fix bug found by Ethan: fresh values for bit-vectors loops if the domain of bit-vectors is truly small
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-09-13 15:30:56 -07:00
Nikolaj Bjorner
9e61820125 re-organizing muz
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-08-28 21:49:53 -07:00
Nikolaj Bjorner
6c5f7741b2 more on polynorm
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-08-14 11:55:23 -07:00
Nikolaj Bjorner
d9e3881560 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-06-27 12:00:09 -05:00
Nikolaj Bjorner
619bd91ddb fix bug in ctx-solver-simplify reported @ http://z3.codeplex.com/workitem/51
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-06-27 11:59:40 -05:00
Leonardo de Moura
544dfde454 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-06-27 09:30:33 -07:00
Leonardo de Moura
5b7201a911 Fix minor problem
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-06-27 09:30:25 -07:00
Nikolaj Bjorner
324dc5869d fix substitution bug in qe, working on boogie trace
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-06-25 13:07:28 -05:00
Leonardo de Moura
185f125f7a Fix problem reported at http://stackoverflow.com/questions/17215640/getting-concrete-values-from-a-model-containing-array-ext
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-06-20 17:48:43 -07:00
Nikolaj Bjorner
56bfc06c4f fix reference count bugs in overflow/underflow APIs for bit-vectors
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-06-02 20:55:15 -07:00
Nikolaj Bjorner
d569027e36 fix reference count bugs in overflow/underflow APIs for bit-vectors
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-06-02 20:54:01 -07:00
Nikolaj Bjorner
76a269c85a clean up parity computation
Signed-off-by: unknown <nbjorner@NIKOLAJ-ZEN.redmond.corp.microsoft.com>
2013-06-01 17:14:18 -07:00
Nikolaj Bjorner
c0895e5548 remove hassel table from unstable: does not compile under other plantforms
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-31 17:48:19 -07:00
Nikolaj Bjorner
56dedec740 fix build break include uint_set.h
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-18 10:02:53 -07:00
Nikolaj Bjorner
ef2a9994a9 fix UTVPI model generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-16 19:58:14 -07:00
Nikolaj Bjorner
69b7c3ede7 fixing parity bug in model generation for UTVPI
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-16 15:36:27 -07:00
Nikolaj Bjorner
5eed106ffe fix parameters in utvpi and make Karr invariants use backward propagation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-12 17:02:25 -07:00
Nuno Lopes
78db1d0f86 fix build of unit tests
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-05-01 16:13:24 -07:00
Nikolaj Bjorner
717f131942 fix warnings and errors from the mint64 build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-01 19:54:40 +01:00
Nikolaj Bjorner
7cb9e7381d fix build errors on ubuntu and gcc
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-01 02:35:57 -07:00
Nikolaj Bjorner
5098089ee1 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-30 13:07:38 -07:00
Nikolaj Bjorner
b4d0216728 try to fix gcc build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-30 13:06:59 -07:00
Nikolaj Bjorner
21b0a4fcbb testing utvpi
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-30 11:53:10 -07:00
Nikolaj Bjorner
be64e4b238 add special procedures for UTVPI and horn arithmetic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-28 13:37:03 -07:00
Nikolaj Bjorner
9158fb17c1 add special procedures for UTVPI and horn arithmetic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-28 12:47:55 -07:00
Nikolaj Bjorner
6250a29602 resolved conflicts
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-23 10:02:37 -07:00
Nikolaj Bjorner
a1277a57ae resolved conflicts
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-23 10:01:50 -07:00
Nikolaj Bjorner
e1d5f484f1 simplify result from tactics, remove unused features from difference logic solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-23 08:46:46 -07:00
Nikolaj Bjorner
4ceb228583 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-21 18:17:56 -07:00
Nikolaj Bjorner
0fbdd37e89 working on horn difference logic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-21 18:17:49 -07:00
Nuno Lopes
7ce88d4da9 fix a few compilation warnings
- remove unused variables and class fields
 - add support for gcc 4.5 & clang's __builtin_unreachable
 - fix 2 bugs related to strict aliasing
 - remove a few unused function parameters

Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-21 14:36:39 -07:00
Leonardo de Moura
1c96a7d52f Add option smt.bv.enable_int2bv in the new parameter setting framework. This is the new name for the old parameter :bv-enable-int2bv-propagation. This modification addresses an issue reported at http://stackoverflow.com/questions/15798984/bv-enable-int2bv-propagation-option.
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-04-03 15:51:09 -07:00