3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-12 23:46:39 +00:00
Commit graph

148 commits

Author SHA1 Message Date
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
c6a9dae00a use external stack instead to manage memory
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-15 20:26:48 -08:00
Nikolaj Bjorner
ff54b3d92b fix memory leak for scoped_numeral over trail objects
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-15 17:00:07 -08:00
Nikolaj Bjorner
39dcc653df fix normalization regression
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-13 20:20:26 -08:00
Nikolaj Bjorner
236b2d2ff3 working on incremtal PB theory
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-13 10:12:45 -08:00
Nikolaj Bjorner
1f7c994e43 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-01-06 16:23:50 -08:00
Nikolaj Bjorner
5adb4a22d1 enable partial results
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-06 16:23:37 -08:00
Nikolaj Bjorner
f1710e5618 check parameters
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-06 16:06:47 -08:00
Nikolaj Bjorner
23e811d136 merge with unstable
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-05 20:44:56 -08:00
Nikolaj Bjorner
3fa0e6f3fb testing decomposition during pre-processing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-02 16:05:26 -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
af27efbf4a pareto0
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-01 21:13:25 -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
eb4def108f reinit logic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-27 17:45:14 -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
0641c4f694 working on pre-processing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-26 09:53:33 -08:00
Nikolaj Bjorner
24f2fd380c adding pre-processing of BP constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-23 01:33:24 -08:00
Nikolaj Bjorner
670f56e5e4 adjust benchmark generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-21 07:09:39 -08:00
Nikolaj Bjorner
6aa0086969 adding wpm2 algorithm
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-20 16:46:23 -08:00
Nikolaj Bjorner
0deb951873 different strategies for weighted
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-20 12:04:17 +01:00
Nikolaj Bjorner
26237a3727 debug benchmarks, theory_pb
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-19 07:40:18 +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
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
02f74f1028 trying Cezary's example
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-17 05:03:20 +02:00
Nikolaj Bjorner
56b9c4c8a2 fix bugs reported by phan
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-17 04:20:24 +02:00
Nikolaj Bjorner
1bcf5b8b5f remove auxiliary variables from weighted maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-16 11:42:28 +02:00
Nikolaj Bjorner
15b64261dd fix wmaxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-16 04:55:56 +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
fe5c42c90f fixes to bugs exposed by regressions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-15 05:23:47 +02:00
Nikolaj Bjorner
50f18a77af disable 'optimization' that led to wrong model'
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-15 02:40:52 +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
5f72325e99 working on maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-14 10:00:21 +02:00
Nikolaj Bjorner
04824d86df fixes to model generation of weighted maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-14 09:37:42 +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
df5c2adc4e debug opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-12 15:39:38 -06: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
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