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

6249 commits

Author SHA1 Message Date
Nikolaj Bjorner
c205b59a21 updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-27 21:13:52 -08:00
Nikolaj Bjorner
475101e932 updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-27 20:49:37 -08:00
Nikolaj Bjorner
1c7cb87900 updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-27 20:41:47 -08:00
Nikolaj Bjorner
ba0ec79375 adapt to vectors
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-27 19:03:32 -08:00
Nikolaj Bjorner
4792229c2b Merge pull request #922 from mtrberzi/regex-unroll
add _re.unroll internal operator to seq_decl_plugin
2017-02-27 18:37:37 -08:00
Nikolaj Bjorner
c22359820d latest updates from Cliff
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-27 16:37:31 -08:00
Nikolaj Bjorner
88e7c240b7 working on lookahead
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-27 10:59:59 -08:00
Nikolaj Bjorner
f8a3a46d44 Merge pull request #921 from cheshire/obj_value_as_vector_java
Obj value as vector java
2017-02-27 09:53:23 -08:00
George Karpenkov
be1e9918f0 Class Optimize#Handle should be static,
as it already includes an explicit reference to the Optimize class.
2017-02-27 18:49:02 +01:00
George Karpenkov
b3be83e7c5 Sane indentation + removing extra spaces for Optimize.java 2017-02-27 18:48:44 +01:00
George Karpenkov
d6c79facc7 Java API for getting the objective value as a triple
See #911 for the motivation,
and e02160c674 for the relevant change
in C API.
2017-02-27 18:42:44 +01:00
Nikolaj Bjorner
899843b7cd fix unhandled finite domain sort rewrite case. Issue #918
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-26 17:20:54 -08:00
Nikolaj Bjorner
388b025d9e expose xor solver separate from cardinality solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-25 16:29:46 -08:00
Nikolaj Bjorner
4e85a6e8fd merge with master
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-25 16:25:06 -08:00
Nikolaj Bjorner
e9b49644b2 Merge branch 'master' of https://github.com/z3prover/z3 into opt 2017-02-25 16:20:33 -08:00
Nikolaj Bjorner
54920783dc Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-02-25 16:19:59 -08:00
Nikolaj Bjorner
52d2d63623 working on lookahead
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-25 16:19:45 -08:00
Nikolaj Bjorner
996c0f0666 fix type on exception message
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-25 16:14:50 -08:00
Nikolaj Bjorner
61920503bd hackvector!
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-24 18:13:02 -08:00
Nikolaj Bjorner
e407b81f70 update for layout
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-24 15:56:04 -08:00
Nikolaj Bjorner
c7591e3c99 remove unreferenced label
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-24 11:13:08 -08:00
Nikolaj Bjorner
183ee7e37d expose bounds as vector expressions instead of containing ad-hoc expressions. Issue #911
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-24 11:10:18 -08:00
Nikolaj Bjorner
e02160c674 expose bounds as vector expressions instead of containing ad-hoc expressions. Issue #911
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-24 11:07:40 -08:00
Nikolaj Bjorner
8437cb7132 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-02-24 07:54:25 -08:00
Murphy Berzish
0ebd93c8b5 add _re.unroll internal operator to seq_decl_plugin 2017-02-23 20:57:19 -05:00
Nikolaj Bjorner
411dcc8925 working on pre-selection
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-23 17:05:08 -08:00
Nikolaj Bjorner
e744d0f271 Merge pull request #910 from mtrberzi/octal-escape
Add C-style octal escape sequences to seq_decl_plugin
2017-02-23 16:02:21 -08:00
Nikolaj Bjorner
db9e8d96d4 working on lookahead solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-23 16:00:20 -08:00
Murphy Berzish
eb0ba26f90 C-style octal escapes, including 1- and 2-digit escapes 2017-02-23 18:33:10 -05:00
Murphy Berzish
61bbf8ba7e add octal escape to seq_decl_plugin 2017-02-23 18:24:08 -05:00
Nikolaj Bjorner
54f145b364 initialize
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-22 15:11:18 -08:00
Nikolaj Bjorner
43ddad0ecd initial pass
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-22 14:57:25 -08:00
Nikolaj Bjorner
748ada2acc adding unit test entry point
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-22 11:46:47 -08:00
Nikolaj Bjorner
d8bb10d37f porting more code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-21 22:43:23 -08:00
Nikolaj Bjorner
eec10c6e32 porting more code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-21 21:33:18 -08:00
Nikolaj Bjorner
eec1d9ef84 porting more code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-21 21:19:13 -08:00
Nikolaj Bjorner
747ff19aba adding skeleton for local search
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-21 20:34:39 -08:00
Nikolaj Bjorner
77aac8d96f fix handling of global parameters, exceptions when optimization call gets cancelled
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-21 17:04:10 -08:00
Nikolaj Bjorner
122a12c980 fix build on downlevel compilers
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-21 09:12:10 -08:00
Nikolaj Bjorner
98c5a779b4 add xor parity solver feature
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-20 16:55:00 -08:00
Nikolaj Bjorner
cb050998e5 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-02-19 11:35:46 -08:00
Nikolaj Bjorner
2885ca7714 tune cardinalities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-19 11:35:31 -08:00
Nikolaj Bjorner
0cf5af121a Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-02-19 11:32:18 -08:00
Nikolaj Bjorner
dc588b54f7 add sorting-based pb encoding in the style of minisat+
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-19 11:31:34 -08:00
Nikolaj Bjorner
b0dd3f3238 add recursive function graphs to model, adapt rewriter to bypass branches whose evaluation is redundant
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-16 13:58:12 -08:00
Nikolaj Bjorner
7e391a8a57 add option to disable cardinality solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-16 08:38:38 -08:00
Nikolaj Bjorner
2bcb875559 add option to disable cardinality solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-16 08:36:16 -08:00
Nikolaj Bjorner
c67cf1653c use non _ method from z3printer module so to be resilient against how _ is handled as indicator of private functions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-15 08:46:58 -08:00
Nikolaj Bjorner
216e17e5e2 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-02-13 08:16:43 -08:00
Nikolaj Bjorner
e7a21dfac2 add par_and_then
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-13 08:16:39 -08:00