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

8929 commits

Author SHA1 Message Date
Nikolaj Bjorner a2dddbd7a5 check pb solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-28 14:28:03 -08:00
Lev Nachmanson 69f03952a7 enable lar_solver::constraint_holds
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2019-02-28 12:11:34 -10:00
Nikolaj Bjorner e76cea4684 Merge branch 'master' of https://github.com/z3prover/z3 2019-02-28 11:44:45 -08:00
Nikolaj Bjorner 6d9b746e70 Merge branch 'master' of https://github.com/z3prover/z3 2019-02-28 11:42:48 -08:00
Nikolaj Bjorner 69d7d8ff87 local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-28 11:42:17 -08:00
Nikolaj Bjorner 5fa5719c6f fix #2159
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-28 08:58:58 -08:00
Nikolaj Bjorner b632c08fe0 Merge branch 'master' of https://github.com/z3prover/z3 2019-02-28 08:35:26 -08:00
Nikolaj Bjorner 4c76d43670 add binary_merge encoding option
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-28 08:35:22 -08:00
Nuno Lopes 6a0c409b0f move a few strings instead of copying 2019-02-28 10:53:27 +00:00
Nikolaj Bjorner e79f7ca1fd
Merge pull request #2150 from Nils-Becker/master
Logging Support for Theory Solvers
2019-02-27 17:06:31 +01:00
Nikolaj Bjorner ea9e2f6642 fix #2158
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-26 15:13:47 -08:00
Nikolaj Bjorner c4ee4ffae4 fix pre-prejection>
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-26 07:12:34 -08:00
Nikolaj Bjorner bef509b02e Yakir!
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-25 19:20:35 -08:00
Nikolaj Bjorner d9b4f237fe remove opt dependency
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-25 18:18:19 -08:00
Nikolaj Bjorner 46f3b7374c Merge branch 'master' of https://github.com/z3prover/z3 2019-02-25 18:15:28 -08:00
Nikolaj Bjorner 4876426866 project
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-25 18:15:24 -08:00
Nikolaj Bjorner 15d5be66b6 Merge branch 'master' of https://github.com/z3prover/z3 2019-02-25 18:14:47 -08:00
Nikolaj Bjorner 4ff940a29e mbi
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-25 18:14:41 -08:00
nilsbecker 17adecff68 fixing ci issues
fixing if condition
2019-02-25 19:10:47 +01:00
Nikolaj Bjorner 6ef3e5e363 integrate some self-contained fixes from #2147
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-24 14:21:34 -08:00
Nikolaj Bjorner 142f3638cf spaces
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-23 22:45:39 +01:00
Nikolaj Bjorner 53b5e1f824
Merge pull request #2148 from danielschemmel/warnings
Fix three Warnings
2019-02-23 22:45:04 +01:00
nilsbecker 960708e99e Merge branch 'master' of https://github.com/Z3Prover/z3 2019-02-23 12:34:40 +01:00
nilsbecker c033fb045f 2 things I prevoiusly overlooked 2019-02-23 12:34:17 +01:00
nilsbecker 6ee3941523 more cleanup 2019-02-23 12:08:08 +01:00
Daniel Schemmel 36643aafd2
fix -Wmisleading-indentation 2019-02-23 11:34:33 +01:00
Nikolaj Bjorner 773c613694 fix #2149
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-23 11:10:01 +01:00
Nikolaj Bjorner c0d20f8ea8 add cr
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-23 10:59:10 +01:00
Daniel Schemmel c2ebbc9210
fix -Wsign-compare (len can never become negative anyway) 2019-02-23 10:57:41 +01:00
Nikolaj Bjorner 28c675f56e
Merge pull request #2146 from danielschemmel/buffer-1
Buffer and Vector Modernization Part 1
2019-02-23 10:55:08 +01:00
nilsbecker a8586746be cleanup for pull request 2019-02-23 02:47:33 +01:00
nilsbecker 6e508d4221 fixing Windows compile issue 2019-02-22 14:09:35 +01:00
Nikolaj Bjorner 72d59ea00a Merge branch 'master' of https://github.com/z3prover/z3 2019-02-22 13:57:18 +01:00
Nikolaj Bjorner 73060ecaec remove debug code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-22 13:57:09 +01:00
Christoph M. Wintersteiger 699834261e
Fix translation of FPA numerals in ast_smt_pp. Fixes #2145. 2019-02-22 12:55:01 +00:00
Nikolaj Bjorner bceff4b3fa Merge branch 'master' of https://github.com/z3prover/z3 2019-02-22 11:17:03 +01:00
Nikolaj Bjorner 4c799c144a fix gc to not remove ternary clauses that are on assignment trail. This addresses issue with drat proofs that don't pass drat-trim due to deletion during gc, but use in conflicts
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-22 11:14:20 +01:00
nilsbecker ec76efedbe synchronizing with main repository 2019-02-22 00:19:43 +01:00
nilsbecker 28c03ed1de logging support for theory axioms 2019-02-21 19:29:35 +01:00
Nuno Lopes bb7aa16223 stopwatch: fix debug build crash in sat solver 2019-02-21 16:38:48 +00:00
Nuno Lopes 6598aedbb2 fix VS build, take 2 2019-02-21 15:52:52 +00:00
Nuno Lopes 3d7878bafc hopefully fix build with VS 2012 2019-02-21 15:25:26 +00:00
Nuno Lopes 2f33bafd5a stopwatches: fix a few places that would call start/stop multiple times 2019-02-21 14:59:31 +00:00
Daniel Schemmel 721ea2a8d3
Move vector.h to old_vector.h and add a shim vector.h
To do so, one instance of the class keyword needs to be removed.
2019-02-21 15:38:08 +01:00
Nuno Lopes 85162d90d1 simplify timer.h 2019-02-21 13:57:38 +00:00
Nuno Lopes 3a7c467822 fix debug build.. 2019-02-21 13:33:52 +00:00
Nuno Lopes 3a5263be95 modernize stopwatch 2019-02-21 13:30:27 +00:00
Daniel Schemmel 2ff2e77739
Move buffer.h to old_buffer.h and add a shim buffer.h 2019-02-21 13:05:58 +01:00
Nuno Lopes a76c0fbbfb simplify timeout mechanism and fix race conditions there 2019-02-21 11:49:41 +00:00
Nuno Lopes f3cd7d646d further simplifications to scoped_timer 2019-02-21 10:42:42 +00:00
Nikolaj Bjorner 598fc810b5 adding FP
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-20 15:34:47 +01:00
Nikolaj Bjorner 3548057bd1 fix detection of arithmetic operations
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-20 14:00:05 +01:00
Nikolaj Bjorner cc216f8cc3 fix regressions breaking build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-19 21:24:44 +01:00
Nikolaj Bjorner c022d47d60 Merge branch 'master' of https://github.com/z3prover/z3 2019-02-19 18:17:17 +01:00
Nikolaj Bjorner caa15ea04d enable cardinality constraints in nla2bv
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-19 18:17:07 +01:00
Nuno Lopes 61272fdc0c remove a few more inc/dec refs 2019-02-19 13:36:39 +00:00
Nuno Lopes edf0df634d simplifications to refs 2019-02-19 13:18:20 +00:00
Nuno Lopes 8e4ef19f45 fix debug build 2019-02-19 10:54:41 +00:00
Nuno Lopes 8c2584bcf7 eliminate a few ref incs/decs plus remove unused variable 2019-02-19 10:52:12 +00:00
Nikolaj Bjorner 2138a5232f fix #2142
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-19 10:16:50 +01:00
Nikolaj Bjorner 7fb2c6a908 turn off model validation unless specified by parameter
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-18 15:55:24 +01:00
Nikolaj Bjorner 0aafa8b7ce optimize binary output
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-18 15:52:42 +01:00
Nikolaj Bjorner 5b57c6b780 unused variable warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-17 01:30:26 -08:00
Nikolaj Bjorner 8c085f1a18 removing unused and fixing suspect optimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-16 21:26:29 -08:00
Nikolaj Bjorner ea778eefb2 skip optimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-16 20:58:30 -08:00
Nikolaj Bjorner c1402ad70f tone down verbosity of integrity checking
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-16 20:39:15 -08:00
Nikolaj Bjorner 7f51cc7931 fix #2140
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-16 09:54:05 -08:00
Nikolaj Bjorner 4f223542ac fix #2129
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-16 09:38:47 -08:00
Nikolaj Bjorner f84de9400e also deal with initializing boolean variables in smt context
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-15 17:58:26 -08:00
Nikolaj Bjorner 39f73fa595 ensure that activity works for sat solver from cold state
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-15 16:56:55 -08:00
Nikolaj Bjorner 89bf2d4368 add API for setting variable activity
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-15 12:05:24 -08:00
Nikolaj Bjorner e4c6dcd84c import csp progress
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-14 17:09:18 -08:00
Nikolaj Bjorner 45aa8dd39a remove more references
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-14 17:06:38 -08:00
Nikolaj Bjorner 96c05b0289 remove reference to deprecated code in cmd_context
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-14 17:00:02 -08:00
Nikolaj Bjorner 5cdfa7cd1c variations on unit-walk
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-13 17:43:15 -08:00
Nikolaj Bjorner 83f0fd5cc2 Merge branch 'master' of https://github.com/z3prover/z3 2019-02-12 15:49:20 -08:00
Nikolaj Bjorner eec1da5a15 move restart test to after propagation, clean up drat generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-12 15:49:12 -08:00
Christoph M. Wintersteiger 64d085c188
Fix bug in fpa2bv_converter, fixes #2136. 2019-02-12 14:02:30 +00:00
Nikolaj Bjorner d9a51f8f8a fix test build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-11 14:44:12 -08:00
Nikolaj Bjorner 72b220e84a import improvements to lookahead
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-11 13:28:13 -08:00
Nikolaj Bjorner 6d893e0599 revise unit walk
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-11 13:16:17 -08:00
Nikolaj Bjorner 5fe40a25dc revise local search
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-11 13:14:20 -08:00
Nikolaj Bjorner 22783a4bcb import more from csp
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-11 13:09:28 -08:00
Nikolaj Bjorner 93ee05648e add shortcuts for unit assertions, conflicts
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-11 10:56:36 -08:00
Nikolaj Bjorner d73b7267e3 Merge branch 'master' of https://github.com/z3prover/z3 2019-02-10 18:11:08 -08:00
Nikolaj Bjorner 6cfe66c3c2 re-enabling model evaluation of as-array after tuning normalization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-10 18:11:01 -08:00
Audrey Dutcher 4e687671a5 Tweak python setup.py clean to properly clean the native build 2019-02-10 14:32:02 -08:00
Audrey Dutcher b702cad81e Append std=c++11 instead of replacing CXXFLAGS; see #2130 2019-02-10 14:12:27 -08:00
Nikolaj Bjorner 81d322b79f fix bug in model compression that skips dependencies in function entries. Exposed in t171.smt2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-10 11:12:26 -08:00
Nikolaj Bjorner c5df6ce96e fix #2131
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-10 10:07:24 -08:00
Nikolaj Bjorner 24dfdfe9bc disable fixes for #2128 and related as it breaks model evaluation time in regressions, set longer delay for inprocessing in sat solver, report stats
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-09 16:06:02 -08:00
Nikolaj Bjorner c7bd985fac remove asserts for ground defs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-09 08:50:02 -08:00
Nikolaj Bjorner 0fd4c4fb06 tidy
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-09 08:24:14 -08:00
Nikolaj Bjorner d2d42f9810 fix #2127 fix #2128
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-09 08:23:22 -08:00
Nikolaj Bjorner b17c946acb fix bug in hoist module, tune num2bits for large bit-vectors
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-08 14:40:06 -08:00
Nikolaj Bjorner d2a3b53d92 fix remaining incorrect uses of new BoolExpr related to #2125
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-07 12:28:17 -08:00
Nikolaj Bjorner 77942a35dc fix #2125
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-07 11:20:53 -08:00
Nikolaj Bjorner d21fc642b4 refactor watch_diseq, disable it completely
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-07 09:57:24 -08:00
Nikolaj Bjorner 6f9082598c tuning relevancy
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-07 08:05:40 -08:00
Nikolaj Bjorner e22f713b19 tune QF_UFBV
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-07 12:02:48 +01:00
Nikolaj Bjorner c9ffe7417c mark destructors virtual
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-07 07:55:17 +01:00
Nikolaj Bjorner 064c9faf11 fix test
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-06 20:13:21 +01:00
Nikolaj Bjorner c6a7dc7b44 formatting
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-06 20:05:45 +01:00
Nikolaj Bjorner 6c10e27bd5 Merge branch 'master' of https://github.com/z3prover/z3 2019-02-06 19:43:56 +01:00
Nikolaj Bjorner 56598037b6 new rewriter
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-06 19:42:40 +01:00
Nikolaj Bjorner d04e72819a abstract solver API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-06 19:42:01 +01:00
Nuno Lopes 904bc34139 remove some debug leftover 2019-02-05 10:02:58 +00:00
Nuno Lopes 73f6806371 rewrite scoped_timer in C++11 way
the code is much smaller and reused across platforms
I see a small speedup on linux as well
2019-02-04 17:42:27 +00:00
Nikolaj Bjorner 9cf99e26a6 fix #2123
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-03 19:54:08 +01:00
Nikolaj Bjorner 0acc042bf7 fix #2120 fix #2122
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-03 17:15:38 +01:00
Nikolaj Bjorner 9fde9fe3a2 fix #2122 for code that isn't exception safe
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-02 19:49:16 +01:00
Nikolaj Bjorner a76107e50d fix build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-01 18:44:52 -08:00
Nikolaj Bjorner 6c464f8aec add assert_and_track to optimize for #2116
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-01 14:59:36 -08:00
Nikolaj Bjorner d1877f58a5 Merge branch 'master' of https://github.com/z3prover/z3 2019-02-01 13:36:02 -08:00
Nikolaj Bjorner e07f0c0284 tune generation of drat files, add helpful binary clause in lookahead simplification
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-01 13:35:54 -08:00
Daniel Selsam df73c58195 array resize must m_size 2019-02-01 09:36:03 -08:00
Daniel Selsam cca280ac47 do not echo dimacs while parsing 2019-02-01 09:36:03 -08:00
Nikolaj Bjorner 7fa9768c36 improving drat output perf
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-01 09:16:46 -08:00
Nikolaj Bjorner 1e90be62bc fix drat for lookahead, fixes for binary drat format
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-31 14:58:51 -08:00
Nikolaj Bjorner cda78d8d0b #2117
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-30 09:34:45 -08:00
Nikolaj Bjorner cb94f82f37 fix #2118
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-30 09:31:05 -08:00
Nikolaj Bjorner e004986e99 fix z3++.h
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-30 09:20:38 -08:00
Nikolaj Bjorner 35eb21bc35 fix extraction of trail
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-30 09:06:41 -08:00
Nikolaj Bjorner 08ce6f7ac1 working on binary drat format
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-30 08:54:59 -08:00
Nikolaj Bjorner 8d20310758 adding trail/levels
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-29 14:45:51 -08:00
Nikolaj Bjorner e22c657811 Merge branch 'master' of https://github.com/z3prover/z3 2019-01-29 10:50:28 -08:00
Nikolaj Bjorner 58f5531cff fix #2114 introduced while working on #2095
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-29 08:18:03 -08:00
Nikolaj Bjorner 4f988595c7 fix #2107
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-27 19:45:19 -08:00
Nikolaj Bjorner 94dae2da3a fix fourth bug produced by repros by Mark Dunlop
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-27 18:11:18 -08:00
Nikolaj Bjorner d0b2f73c0c change opt.maxlen.enable default to true to prefer this over all other heuristics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-26 13:02:25 -08:00
Nikolaj Bjorner 1297eeb817 fix #2104
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-26 11:55:32 -08:00
Nikolaj Bjorner cf6119cdfd fix #2102
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-25 21:02:25 -08:00
Nikolaj Bjorner e7cabf3e44
Merge pull request #2103 from alcides/master
Deepcopy works with Python 3.7
2019-01-25 20:07:40 -08:00
Nikolaj Bjorner 121211a51c maxlexN
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-25 20:01:38 -08:00
Nikolaj Bjorner 1ed68906fa fix debug assertion code, make maxlex optional
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-25 08:23:41 -08:00
Alcides Fonseca 83717a9c86 Merge branch 'master' of https://github.com/Z3Prover/z3 2019-01-25 14:45:22 +00:00
Alcides Fonseca a785ffe0ba Updated deepcopy to the latest Python API 2019-01-25 14:42:22 +00:00
Nikolaj Bjorner d3d392da41 adding maxlex, delay mk_true() calls in goal2sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-24 21:36:40 -08:00
Nikolaj Bjorner b4f4a1f316 adding maxlex, throttle use of asymmetric literal addition
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-24 19:47:50 -08:00
Nikolaj Bjorner ad81fee118 adding maxlex, throttle use of asymmetric literal addition
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-24 19:26:44 -08:00
Nikolaj Bjorner 8da1d6070b throttle big-reductions #2101 #2098
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-24 14:00:56 -08:00
Nikolaj Bjorner 498864c582 adding dump facility for cancelation #2095, easing dimacs in/out
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-24 12:21:23 -08:00
Nikolaj Bjorner f7746e2284 address perf #2098
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-23 16:58:00 -08:00
Nikolaj Bjorner 9c07167ff8 add new pyg file
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-23 16:06:44 -08:00
Nikolaj Bjorner 8e5c1fcfd1 make context_solve configurable and exposed as top-level tactic parameter
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-23 16:06:25 -08:00
Nikolaj Bjorner 412eee0dac throttle number of rounds of ba simplification
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-22 18:12:39 -08:00
Nikolaj Bjorner f9195c77a7 remove not-handled clause from mod with non-numerals
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-22 09:46:04 -08:00
Nikolaj Bjorner 49a51a0757 fix #2096, introduced when fixing #2082
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-22 07:06:40 -08:00
Nikolaj Bjorner 6bd87f837a fix Boolean argument
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-20 14:14:26 -08:00
Nikolaj Bjorner 8566d88b99 remove validation assert
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-20 12:49:04 -08:00
Nikolaj Bjorner 785fe2f6f7 add main remaining updates from #1815
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-20 12:43:05 -08:00
Nikolaj Bjorner 5cdbb1f7be this is still used
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-20 11:25:34 -08:00
Nikolaj Bjorner 9dd41ba554 remove offending assert, disable assembly-info for dotnet core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-20 11:13:03 -08:00
Nikolaj Bjorner cabe0ee447 integrating additional changes from @yatli pull request #1815
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-20 10:51:44 -08:00
Nikolaj Bjorner 1efbc25b3b Merge branch 'master' of https://github.com/z3prover/z3 2019-01-18 18:09:22 -08:00
Nikolaj Bjorner 0b7021d2c8 na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-18 18:09:19 -08:00
Nikolaj Bjorner c45ab6efed add setting to dump intermediary models #2087
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-18 15:12:08 -08:00
Nikolaj Bjorner 947fe2ff9c fix datatype occurs check bug reported by Gerhard Schellhorn
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-17 16:35:07 -08:00
Nikolaj Bjorner 442e47dfce fix datatype occurs check bug reported by Gerhard Schellhorn
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-17 16:34:26 -08:00
Nikolaj Bjorner f2e636c598 record simplified input clauses as lemmas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-16 16:37:21 -08:00
Nikolaj Bjorner 247980c5a2 don't assign already assigned literals
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-16 11:41:32 -08:00
Nikolaj Bjorner 038971c029
Revert "api: dotnet: switch to multi-targeting project and modern cmake-dotnet integration." 2019-01-16 10:21:56 -08:00
Nikolaj Bjorner 16c15d53a9
Merge pull request #1815 from yatli/master
api: dotnet: switch to multi-targeting project and modern cmake-dotnet integration.
2019-01-16 10:16:26 -08:00
Nikolaj Bjorner e01a668da0 coordinate drat with clause removal
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-16 02:29:33 -08:00
Nikolaj Bjorner b33f5f879e fix another bug reported by Mark Dunlop
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-15 17:57:11 -08:00
Nikolaj Bjorner 3298486136 don't reach max conflicts if state is inconsistent
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-15 08:40:38 -08:00
Nikolaj Bjorner 5328454c77 const
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-15 08:37:23 -08:00
Nikolaj Bjorner 161c83795f remember inconsistent states when cloning
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-15 08:34:55 -08:00
Nikolaj Bjorner 65bd427e46 neatify statistics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-14 16:48:48 -08:00
Nikolaj Bjorner f238460597 neatify statistics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-14 16:45:04 -08:00
Nikolaj Bjorner ed7cac8cc0 neatify logging
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-14 16:42:13 -08:00
nilsbecker 279413412d preventing operations during MBQI search from being logged 2019-01-15 01:09:44 +01:00
Nikolaj Bjorner b11ec3bfbf merge sat_tactic from csp
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-14 15:17:42 -08:00
Nikolaj Bjorner ee07008fb9 import files from csp
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-14 15:04:46 -08:00
Nikolaj Bjorner 54a125063b remove produce interpolants
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-14 15:00:25 -08:00
Nikolaj Bjorner e954f59052 ensure that solver objects have timeout/rlimit/ctrl-c exposed as possible parameters
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-14 13:50:17 -08:00
nilsbecker bfb554c0b8 logging sorts of quantified variables
logging proof objects seperately form regular terms
renaming inst-possible -> inst-discovered
2019-01-14 21:28:06 +01:00
Nikolaj Bjorner a686aa7f56 produce binary clauses for DRAT for units produced by probing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-14 10:56:10 -08:00
Yatao Li 43ee345f01 dotnet deps hack for test 2019-01-15 03:06:36 +09:00
Nikolaj Bjorner 0b84c60886 fix another bug uncovered by Dunlop, prepare grounds for equality solving within NNFs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-14 01:25:25 -08:00
Nikolaj Bjorner eaa80d5b02 fix test build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-13 11:33:23 -08:00
Yatao Li 8ebde41f35 dotnet: example: copy to binary dir before build 2019-01-13 22:45:05 +08:00
Nikolaj Bjorner 46bfcbd4f8 fix #2082
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-13 03:46:11 -08:00
Nikolaj Bjorner 4159b987ce purge unused code from theory_pb, fix bug reported by Mark Dunlop
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-13 03:23:57 -08:00
Nikolaj Bjorner 4b35ef29c9 fix #2081
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-13 01:18:03 -08:00
Nikolaj Bjorner dc5e4ca1c5 fix drat generation in asymmetric branch simplification
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-12 13:19:09 -08:00
Nikolaj Bjorner f835a3c2b2 revert assumption tracking choice in unit literals inferred from binary clauses
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-12 11:08:35 -08:00
Nikolaj Bjorner e4d6aa07dc use vectors instead of hash-tables in dimacs serialization to avoid hash-table contention
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-12 11:05:00 -08:00
Yatao Li 5e79dba3d6 dotnet: move example project build to cmake 2019-01-13 00:03:37 +08:00
Yatao Li 55f92f3658 dotnet: remove stale packages before pack; relay cmake config generator expression into msbuild property.. 2019-01-12 21:33:09 +08:00
Yatao Li 4b3189f3e2 dotnet: identifies arch-specific native libraries 2019-01-12 20:04:44 +08:00
Yatao Li e5f65263bb dotnet: reigster local repo for nupkg 2019-01-12 19:22:38 +08:00
Yatao Li 53eaab4709 dotnet: update build scripts 2019-01-12 17:38:24 +08:00
Nikolaj Bjorner e623f1e9c9 restoring clause sizes after deletion
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-12 01:01:49 -08:00
Nikolaj Bjorner 3c96b51e97 lvl -> _lvl
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-12 00:40:36 -08:00
Nikolaj Bjorner 0b8dbf2854 fixing drat proofs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-12 00:30:21 -08:00
Nikolaj Bjorner 836f156d54 fix drat for units learned from binary clause resolution
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-12 00:12:20 -08:00
Yatao Li 17596fcc17 Merge remote-tracking branch 'upstream/master' 2019-01-12 15:01:28 +08:00
Yatao Li ffd26e5a56 .net: remove net35 related build props; drop src/api/dotnet/core 2019-01-12 15:01:05 +08:00
Nikolaj Bjorner 63d480fd92 fix cnf check
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-11 21:17:39 -08:00