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

5061 commits

Author SHA1 Message Date
Nikolaj Bjorner
51951a3683 add logging to lookahead
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-13 16:40:00 -07:00
Nikolaj Bjorner
0c7603e925 fix build of tests
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-13 14:39:12 -07:00
Nikolaj Bjorner
05c5b3b07b merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-09 22:45:52 +01:00
Nikolaj Bjorner
5f5819f029 fix xor handling, and defaults for cardinality
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-09 22:44:41 +01:00
Nikolaj Bjorner
fbf81c88a2 remove print breaking build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-09 11:13:38 +01:00
Nikolaj Bjorner
854bb2197f include recursive functions to models. Issue #898
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-08 21:41:24 -08:00
Nikolaj Bjorner
6f68355fbc Merge branch 'master' of https://github.com/Z3Prover/z3 2017-03-08 21:33:43 -08:00
Nikolaj Bjorner
29969648ba check that formulas are in lira before invoking qsat. Issue #919
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-09 05:52:46 +01:00
Nikolaj Bjorner
fcda4cee9f ensure evaluation of array equalities is enabled for external facing evaluator. Issue #917
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-09 05:29:56 +01:00
Nikolaj Bjorner
829519b837 fix bug for bit-vector optimization. Issue #928
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-08 10:19:35 +01:00
Nikolaj Bjorner
202ac0d1ee Merge branch 'master' of https://github.com/Z3Prover/z3
:wi
2017-03-08 10:08:54 +01:00
Nikolaj Bjorner
41e6fafc58 fix bug for bit-vector optimization. Issue #919
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-08 10:07:31 +01:00
Christoph M. Wintersteiger
b57764800c Merge branch 'master' of https://github.com/Z3Prover/z3 2017-03-07 18:10:31 +00:00
Christoph M. Wintersteiger
8f14cfadd2 Tabs, whitespace 2017-03-07 18:10:03 +00:00
Nikolaj Bjorner
ac59e7b6d3 enable multiple local search threads
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-06 11:48:23 -08:00
Nikolaj Bjorner
cd4a2701db adding ability to ahve multiple local search threads
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-06 10:48:58 -08:00
Nikolaj Bjorner
fda5809c89 local search updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-05 14:40:58 -08:00
Murphy Berzish
ad0766898c add boolean operators to zstring and fix ostream 2017-03-04 15:20:57 -05:00
Nikolaj Bjorner
a7db118ebc use iterators
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-03 19:30:44 -08:00
Nikolaj Bjorner
f16dcef7e2 updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-03 18:09:41 -08:00
Nikolaj Bjorner
b5ace71bb8 current updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-03 17:37:55 -08:00
Nikolaj Bjorner
d819784500 walk/gsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-03 16:10:18 -08:00
Nikolaj Bjorner
1e32f1fbb5 parameter example
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-02 13:36:05 -08:00
Nikolaj Bjorner
9777f43e75 fiddle with phase
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-02 13:28:17 -08:00
Nikolaj Bjorner
c6f943e4d6 updates to local search integration
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-02 11:23:06 -08:00
Nikolaj Bjorner
40df1949f5 tweaking local search
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-02 10:18:12 -08:00
Nikolaj Bjorner
a37dfd3ab9 refine logging for local search, add handling of <= for opb front-end
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-02 09:25:05 -08:00
Nikolaj Bjorner
b0a47ca897 disable pb sorting
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-02 08:11:38 -08:00
Nikolaj Bjorner
2c7a978c16 debugging local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-01 20:37:07 -08:00
Nikolaj Bjorner
59baaea219 integrating local search, supporting top-level inequalities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-01 19:49:59 -08:00
Nikolaj Bjorner
5c11d7f2b3 Sixue's updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-01 10:22:07 -08:00
Nikolaj Bjorner
fb4f6d654a add local search parameters and co-processor mode
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-27 23:35:50 -08:00
Nikolaj Bjorner
31c68b6e23 updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-27 23:19:58 -08:00
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
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