3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-18 14:49:01 +00:00
Commit graph

6199 commits

Author SHA1 Message Date
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 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 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 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 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