mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-18 06:39:02 +00:00
Code Activity
8795 commits 23 branches 48 tags 157 MiB
Commit graph

1883 commits

Author SHA1 Message Date
Nikolaj Bjorner 2751cbc270 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-23 22:36:36 -05:00
Nikolaj Bjorner edb3569599 updates to sorting networks 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-23 22:36:19 -05:00
Murphy Berzish 317e2b1898 take shortcuts during length testing when length is known from integer theory 2017-09-22 12:32:13 -04:00
Murphy Berzish b2af690c6d enable binary search for theory_str 2017-09-22 12:31:46 -04:00
Nikolaj Bjorner f5db69529a Merge branch 'master' of https://github.com/z3prover/z3 2017-09-20 13:30:58 -07:00
Nikolaj Bjorner 320105c714 removing iterators 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-20 13:30:31 -07:00
Christoph M. Wintersteiger cc9f67267d Eliminated the remaining operator kinds for partially unspecified FP operators. 2017-09-20 20:16:09 +01:00
Nikolaj Bjorner 936c22a00b add pattern match validation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-20 09:44:38 -07:00
Nikolaj Bjorner 2ec3b4090e Merge branch 'master' of https://github.com/z3prover/z3 2017-09-19 19:44:22 -07:00
Nikolaj Bjorner 93e08d9499 fix #1261 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-19 19:43:23 -07:00
Nikolaj Bjorner caa02c3c02 add match expression construct to SMT-LIB2.6 frontend 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-19 19:39:02 -07:00
Nikolaj Bjorner 651587ce01 merge with master branch 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-19 09:39:22 -07:00
Nikolaj Bjorner 6ddc549557 fix #1258 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-18 12:21:01 -07:00
Nikolaj Bjorner 8b506375e4 Merge branch 'master' of https://github.com/z3prover/z3 2017-09-17 15:11:27 -07:00
Nikolaj Bjorner cf86e46229 check for datatype selectors when model validation fails 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-17 15:10:50 -07:00
Christoph M. Wintersteiger b9494fe3c0 Tabs, whitespace 2017-09-17 18:10:06 +01:00
Christoph M. Wintersteiger d61b722b68 Partial cleanup of util/lp/* 2017-09-17 16:00:06 +01:00
Christoph M. Wintersteiger 00651f8f21 Tabs, formatting. 2017-09-17 14:54:09 +01:00
Nikolaj Bjorner da72911062 Merge branch 'master' of https://github.com/z3prover/z3 2017-09-17 01:39:44 +02:00
Nikolaj Bjorner 8ff1e070be add QF_DT 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-17 01:39:39 +02:00
Christoph M. Wintersteiger 31cfca0444 Eliminated unspecified operators for fp.to_*bv, fp.to_real. Also fixes #1191. 2017-09-12 19:43:45 +01:00
Christoph M. Wintersteiger 4ceef09156 Renamed FPA-internal functions now that they are exposed. 2017-09-11 15:04:53 +01:00
Nikolaj Bjorner 04e57e08ba na 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-09 08:37:17 +03:00
Nikolaj Bjorner ed6e23f153 iterator -> for 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-09 05:40:12 +03:00
Nikolaj Bjorner 0c9711aad7 copy declarations 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-08 21:20:54 +03:00
Murphy Berzish 1ce68b3794 rewrite theory_str replace instances 2017-09-07 14:53:34 -04:00
Murphy Berzish 4e4c72580b don't rewrite on every axiom in theory_str 2017-09-07 14:06:37 -04:00
Nikolaj Bjorner 19fa5f8cb3 expand select/store in pre-processor 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-07 06:23:01 -07:00
Nikolaj Bjorner 2ea9bfaa41 remove unstable sequence interpolant from doc test 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-06 13:34:41 -07:00
Nikolaj Bjorner fe02a5f87b fix parse/print of ADTs 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-06 02:16:00 -07:00
Nikolaj Bjorner a1cc21d77b merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-05 16:03:46 -07:00
Nikolaj Bjorner 06087c17be support for legacy datatype test 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-05 10:28:11 -07:00
Nikolaj Bjorner d47b2bae4d Merge branch 'master' of https://github.com/Z3Prover/z3 2017-09-05 07:35:46 -07:00
Nikolaj Bjorner a4cf2726fd fix seg-fault from #1244 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-05 07:35:37 -07:00
Nikolaj Bjorner 5d17e28667 support for smtlib2.6 datatype parsing 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-04 21:12:43 -07:00
Nikolaj Bjorner 5492d0e135 re-introduce eq2ineq name for rewriting parameter 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-04 11:03:57 -07:00
Nikolaj Bjorner a3dba5b2f9 hide new datatype plugin 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-03 20:01:59 -07:00
Nikolaj Bjorner eb6b2813ff build fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-03 16:14:22 -07:00
Nikolaj Bjorner c6722859c2 update rewriting of equalities and monomials for regressions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-03 14:36:03 -07:00
Nikolaj Bjorner fff54d5d08 fix perf regression with negative polynomial normalization, adding new datatype plugin 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-03 03:56:10 -07:00
Murphy Berzish 10cd396ae3 rewriter patch for theory_str 2017-08-31 17:21:44 -04:00
Nikolaj Bjorner 059bad909a prune dead states from automata 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-31 07:33:55 -07:00
Nikolaj Bjorner 62f8cc1289 fix ordering for value propagation to ensure values are preferred 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-31 07:33:38 -07:00
Nikolaj Bjorner 4d8290ebc2 update to theory_seq following examples from PJLJ 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-30 14:04:02 -07:00
Nikolaj Bjorner 009e94d188 update to theory_seq following examples from PJLJ 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-30 14:00:01 -07:00
Nikolaj Bjorner 6969e6024b merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-29 17:42:48 -07:00
Nikolaj Bjorner cf87b6d622 remove simplifier files 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-29 09:22:27 -07:00
Nikolaj Bjorner f20e95184e remove old_simplify dependencies 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-28 13:29:51 -07:00
Nikolaj Bjorner 974eaab01c complement regular expressions when used in negated membership constraints #1224 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-28 01:38:23 -07:00
Nikolaj Bjorner f76815a009 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-27 12:55:55 -07:00
Nikolaj Bjorner 3bfc3437f1 purify 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-27 11:57:13 -07:00
Nikolaj Bjorner d940516df3 fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-27 11:01:45 -07:00
Nikolaj Bjorner 2ede4b2c80 fixes based on regression tests 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-27 09:31:16 -07:00
Nikolaj Bjorner bcf229dcfd removing dependencies on simplifier 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-26 11:23:41 -07:00
Nikolaj Bjorner 82a937d1af enforce arithmetic normalization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-26 10:41:25 -07:00
Nikolaj Bjorner 0d5cfe9292 separate out, add copy constructor 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-26 09:23:15 -07:00
Nikolaj Bjorner 2955b0c2ef removing more dependencies 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-26 03:05:34 -07:00
Nikolaj Bjorner ce3ab6b170 mising files 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-26 02:04:59 -07:00
Nikolaj Bjorner e3e965883f mising files 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-26 01:55:03 -07:00
Nikolaj Bjorner 9b53646a34 mising files 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-26 01:43:06 -07:00
Nikolaj Bjorner c03be16039 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-26 01:33:19 -07:00
Nikolaj Bjorner 881f90d17d remove simplify dependencies 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-26 00:48:49 -07:00
Nikolaj Bjorner 2897b98ed2 remove simplify dependencies 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-26 00:37:22 -07:00
Nikolaj Bjorner ac0bb6a3d0 remove simplify dependencies 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-25 23:56:09 -07:00
Nikolaj Bjorner ebcacaa26d update new assertions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-25 17:44:33 -07:00
Christoph M. Wintersteiger b8a81bcb09 Added unsat core support to the macro-finder. 2017-08-25 20:21:57 +01:00
Christoph M. Wintersteiger 36dd2b6530 Re-enabled macro-related options for the smt_context 2017-08-25 15:01:54 +01:00
Christoph M. Wintersteiger 799fb4a0d1 Revert "Eliminated the dependency of the macro-finder on the simplifier." 
This reverts commit 8310b24c52.
 2017-08-24 21:26:09 +01:00
Christoph M. Wintersteiger 8310b24c52 Eliminated the dependency of the macro-finder on the simplifier. 2017-08-24 20:34:11 +01:00
Christoph M. Wintersteiger ed8c11ff76 Whitespace 2017-08-24 19:59:38 +01:00
Nikolaj Bjorner 23d1c0a9a8 move pull/push files 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-24 11:13:01 -07:00
Nikolaj Bjorner a7bb41fd49 fix build issues 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-24 09:19:35 -07:00
Nikolaj Bjorner 8b2d60e3ca using rewrite in push_app_ite 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-23 17:57:03 -07:00
Nikolaj Bjorner 8ff8470809 Merge branch 'master' of https://github.com/z3prover/z3 2017-08-23 16:33:54 -07:00
Nikolaj Bjorner 7dd28781ab remove simplifier dependencies from cmakelist.txt files 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-23 16:33:36 -07:00
Nikolaj Bjorner 655b3d9c19 removing dependency on simplifier in pattern_inference 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-23 12:17:30 -07:00
Nikolaj Bjorner e5826b957f fix build 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-23 09:01:25 -07:00
Christoph M. Wintersteiger 6f8a954532 added missing addition to smt_params_helper.pyg 2017-08-23 12:37:26 +01:00
Christoph M. Wintersteiger 573dae5f0c Merge branch 'master' of https://github.com/Z3Prover/z3 2017-08-23 12:14:53 +01:00
Christoph M. Wintersteiger 3e960eadd2 (Re-)added option to disable lemma deletion in the smt_context. 2017-08-23 12:14:19 +01:00
Nikolaj Bjorner ce04c18a7a trying to get rid of last simplifier dependency in macros 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-22 22:14:13 -07:00
Nikolaj Bjorner f7ca7409ce fix regressions introduced when modifying macro_util 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-22 17:05:40 -07:00
Nikolaj Bjorner e2b46257d6 reducing dependencies on simplifier 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-22 15:09:34 -07:00
Nikolaj Bjorner ebe9db14d5 fix regression exposed by segfault2.smt2 crash 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-21 14:13:43 -07:00
Nikolaj Bjorner e47cd27c8d compiler warnings 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-20 16:18:25 -07:00
Nikolaj Bjorner 359ee818a5 purge iterators 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-20 15:35:16 -07:00
Nikolaj Bjorner 9fe9587a9b revert local changes to theory_str 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-20 09:14:08 -07:00
Nikolaj Bjorner ff734d6aa9 Merge branch 'master' of https://github.com/z3prover/z3 2017-08-20 08:51:32 -07:00
Nikolaj Bjorner 276fdd0e97 register auxiliary constants from projection operation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-20 08:51:24 -07:00
Nikolaj Bjorner 04084e21c8 Merge pull request #1220 from mtrberzi/regex-fixes 
Small regex fixes in theory_str
 2017-08-20 08:01:59 -07:00
Murphy Berzish adae32f7ef add re.all to NFA in theory_str 2017-08-19 23:25:34 -04:00
Nikolaj Bjorner a8e7974011 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-08-18 14:57:54 -07:00
Murphy Berzish 1e445a62d4 improve error message in theory_str when an invalid term in str.to.re is encountered 
addresses #871
 2017-08-18 17:31:40 -04:00
Nikolaj Bjorner 112fa16bc0 fix #1217 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-18 09:19:38 -07:00
Nikolaj Bjorner 7d8c745c89 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-08-17 15:59:43 -07:00
Nikolaj Bjorner d15f8c52a0 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-17 15:59:40 -07:00
Christoph M. Wintersteiger abd599f48e Fixed ref-counting bug in smt_model_checker. Fixes #1212. 2017-08-17 19:29:53 +01:00
Christoph M. Wintersteiger 320c81e497 Whitespace 2017-08-17 19:18:14 +01:00
Nikolaj Bjorner 4ab0ee75fa mam 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-17 08:49:06 -07:00
Christoph M. Wintersteiger b2d590e0c9 Bugfix for MAM. Fixes #1213. Partially addresses #1212. 2017-08-17 16:00:59 +01:00
Christoph M. Wintersteiger 96d0781c9d Whitespace 2017-08-17 11:39:06 +01:00
Nikolaj Bjorner bb32a83c4f Merge branch 'master' of https://github.com/Z3Prover/z3 2017-08-16 14:33:43 -07:00
Nikolaj Bjorner 370706b2b7 patch 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-16 14:33:37 -07:00
Nikolaj Bjorner 25752dc169 enable QF_UF mode use same parameters whether with or without static featues, #1141, revert some breaking changes that should not have been part of commit 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-15 01:20:30 -07:00
Nikolaj Bjorner 1690febffd enable QF_UF mode use same parameters whether with or without static featues, #1141 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-15 00:26:05 -07:00
Nikolaj Bjorner 086ea7867e another stab at #989 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-14 12:52:25 -07:00
Nikolaj Bjorner ead704f52f handle undefined constant cases for int.to.str 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-13 17:13:10 -07:00
Nikolaj Bjorner 893bcbb585 revert unsound change in integer extraction from expressions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-13 14:39:37 -07:00
Nikolaj Bjorner b6cc24faf3 deal with absence of integer congruence root by querying arithmetic theory directly, #1202 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-13 14:24:56 -07:00
Nikolaj Bjorner 00742566fb address inconsistent states encountered when cancelling, #1197 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-13 13:40:30 -07:00
Nikolaj Bjorner 19bb55e396 recognize theory_i_arith to fix #1200 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-13 10:22:36 -07:00
Nikolaj Bjorner 347ea50b93 fix for #1202 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-13 09:25:46 -07:00
Murphy Berzish b2388464e4 add re.all to theory_str 2017-08-09 22:03:26 -04:00
Murphy Berzish 84abdae5f7 fix indentation 2017-08-09 15:38:56 -04:00
Murphy Berzish fce35fdb61 Revert "fix indentation and add support for re.allchar" 
This reverts commit cadde94017.
 2017-08-09 15:37:52 -04:00
Nikolaj Bjorner 082936bca6 enable overloading resolution on define-fun declarations, fix #1199 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-08 09:21:06 +02:00
Murphy Berzish cadde94017 fix indentation and add support for re.allchar 2017-08-07 23:02:55 -04:00
Murphy Berzish f4c0e0b28d fix regex bug in theory_str for empty string match. need to fix indents 2017-08-06 17:17:04 -04:00
Nikolaj Bjorner 91ee52e549 fix #1195 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-03 13:53:38 -07:00
Nikolaj Bjorner 2b82fd5d0c updated include directives 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-01 10:51:47 -07:00
Christoph M. Wintersteiger e315d063c5 renamed LP bound propagator to avoid linker name clashes 2017-08-01 16:07:51 +01:00
Nikolaj Bjorner 0eb2915e83 Merge pull request #1182 from agurfinkel/spacer-z3 
Spacer
 2017-07-31 17:10:09 -07:00
Nikolaj Bjorner 49cf899207 remove local change 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-31 16:33:48 -07:00
Nikolaj Bjorner 5cda9504f1 remove relative include from API 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-31 16:32:26 -07:00
Arie Gurfinkel 9f9dc5e19f increased verbosity level of smt_context 2017-07-31 17:01:47 -04:00
Arie Gurfinkel ba6594b241 extra smt params used by spacer 2017-07-31 17:01:47 -04:00
Nikolaj Bjorner b19f94ae5b make include paths uniformly use path relative to src. #534 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-31 13:24:11 -07:00
Nikolaj Bjorner 71d80ab47f fix build break based on new assertion in smt-eq-justification 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-31 11:54:11 -07:00
Nikolaj Bjorner 62b8394bdd fixes #1179 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-31 09:52:45 -07:00
Nikolaj Bjorner ceca9fbef0 fixes #1176 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-31 09:23:55 -07:00
Nikolaj Bjorner 8bd0407adf fix #1177 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-31 09:13:50 -07:00
Nikolaj Bjorner 6dbfdf3e9c Merge branch 'master' of https://github.com/z3prover/z3 into opt 2017-07-27 17:03:04 -07:00
Nikolaj Bjorner b482dbd589 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-27 17:02:27 -07:00
Nikolaj Bjorner ca67274519 another round of fix for #989 to avoid problems with doxygen generation (TravisCI build failure) 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-27 12:59:34 -07:00
Nikolaj Bjorner 9f9c575451 fix bug exposed when running test-z3.exe /a in debug mode, #1159. Add assertions to heap interaction 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-25 16:26:45 -07:00
Nikolaj Bjorner 3865c45382 Merge pull request #1147 from mtrberzi/fix-get-arith-value 
Improved theory_arith integration in theory_str::get_arith_value()
 2017-07-24 21:21:45 -07:00
Nikolaj Bjorner c8fe91d8c5 add handling for nested terms 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-24 16:12:46 -07:00
Nikolaj Bjorner 30b0d5ba13 Merge branch 'master' of https://github.com/z3prover/z3 2017-07-24 10:49:54 -07:00
Christoph M. Wintersteiger faa19117e4 Fixed inconsistent state upon solver interruption. Partially fixes #951. 2017-07-21 17:42:48 +01:00
Lev Nachmanson 64e542bd70 fix term indices for the time being when exiting from check() 
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
 2017-07-20 19:13:13 -07:00
Murphy Berzish 7ddb940f77 add e_internalized() check in theory_str::get_arith_value() 2017-07-19 10:15:38 -04:00
Murphy Berzish 69f0ed9b1f remove disabled code block in get_arith_value() 2017-07-18 13:13:12 -04:00
Murphy Berzish c6707688ba improved get_arith_value() in theory_str 
Since the root of the eqc of an integer term should be a constant
if there is a constant in that eqc, we can ask for it directly
without either iterating over the entire eqc or
asking the arithmetic solver (and receiving potentially stale info).
 2017-07-18 13:11:03 -04:00
Lev Nachmanson 8750da1da7 progress in gomory cut 
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
 2017-07-12 16:43:10 -07:00
Lev Nachmanson 2056404ed4 branch on a free variable before trying Gomory cuts 
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
 2017-07-11 16:44:04 -07:00
Lev Nachmanson bac16bac85 start gomory cut 
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
 2017-07-11 13:46:46 -07:00
Lev Nachmanson fc6a876845 start gomory cut 
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
 2017-07-11 13:38:59 -07:00
Murphy Berzish 86e7f83e06 proper theory_arith integration in theory_str::get_arith_value() 2017-07-11 13:24:48 -04:00
Lev Nachmanson 2fe846d9fc fix a bug in the lar_solver::m_status update during push/pop 
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
 2017-07-10 16:34:23 -07:00
Lev Nachmanson 581098299b change the order of initializations in the constructor of imp in theory_lra 
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
 2017-07-10 12:04:58 -07:00
Lev Nachmanson cc32e45471 replace lean to lp 
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
 2017-07-10 11:06:37 -07:00
Nikolaj Bjorner 2af08a378d avoid complaining about division by 0 as unhandled in theory-lra 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-08 18:21:47 -07:00
Lev Nachmanson 0e0e9c7041 correct handling of integer vars by NB 
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
 2017-07-06 14:06:33 -07:00
Nikolaj Bjorner 4c23527974 Dev (#63) 
* introduce int_solver.h

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* add int_solver class

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* track which var is an integer

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add queries for integrality of vars

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* resurrect lp_tst in its own director lp

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add file

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add_constraint has got a body

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* fix add_constraint and substitute_terms_in_linear_expression

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* after merge with Z3Prover

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* adding stub check_int_feasibility()

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Dev (#50)

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* small fix in lar_solver.cpp

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* adding some content to the new check_int_feasibility()

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Dev (#51)

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding more nlsat

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* nlsat integration

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding constraints

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* add missing initialization

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* test

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* Dev (#53)

* change in a comment

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Disabled debug output

* removing FOCI2 interface from interp

* remove foci reference from cmakelist.txt

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding more nlsat

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* nlsat integration

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding constraints

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* add missing initialization

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* debugging nra

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* updates to nra_solver integration to call it directly from theory_lra instead of over lar_solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* n/a

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* integrate nlsat

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* tidy

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* preserve is_int flag

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* remove a debug printout

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Dev (#54)

* change in a comment

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Disabled debug output

* removing FOCI2 interface from interp

* remove foci reference from cmakelist.txt

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding more nlsat

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* nlsat integration

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding constraints

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* add missing initialization

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* debugging nra

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* updates to nra_solver integration to call it directly from theory_lra instead of over lar_solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* n/a

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* integrate nlsat

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* tidy

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* use integer test from lra solver, updated it to work on term variables

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix equality check in assume-eq

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix model_is_int_feasible

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* untested gcd_test()

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* call fill_explanation_from_fixed_columns()

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add the call to pivot_fixed_vars_from_basis() to int_solver.cpp::check()

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* port more of theory_arith_int.h

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* use statistics of lar_solver by theory_lra.cpp

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* port more code to int_solver.cpp

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add an assert

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* more int porting

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* fix a bug in pivot_fixed_vars_from_basis

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* small change

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* implement find_inf_int_base_column()

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* catch unregistered vars in add_var_bound

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add a file

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* compile for vs2012

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* fix asserts in add_var_bound

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* fix the lp_solver init when workig on an mps file

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* towards int_solver::check()

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* change in int_solver::check() signature

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add handlers for lia moves

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* spacing

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* return branch from int_solver::check()

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add a stub for mk_gomory_cut

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* Dev (#59)

* add handlers for lia moves

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* spacing

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* loops

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* Dev (#60)

* add handlers for lia moves

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* spacing

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* loops

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* loops

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* Dev (#61)

* add handlers for lia moves

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* spacing

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* loops

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* loops

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* more TRACE(arith_int)

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* fix the build

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* loops

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* Dev (#62)

* add handlers for lia moves

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* spacing

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* loops

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* loops

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* loops

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* build fix

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
 2017-07-06 08:53:08 -07:00
Murphy Berzish b14364a117 fix theory_str warnings: rename get_value() to get_arith_value() 2017-07-05 11:06:40 -04:00
Nikolaj Bjorner 41803ec1cf fix trace/debug build for unreferenced variables 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-04 19:55:38 -07:00
Murphy Berzish 03fe3d74f8 clean up warnings in theory_str 2017-07-04 13:28:18 -04:00
Nikolaj Bjorner 480296ed96 updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-02 11:27:02 -07:00
Nikolaj Bjorner 031d7e1b59 use iterators, update build icon for osx 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-01 16:58:40 -07:00
Nikolaj Bjorner 08524a2d90 cleanup for warning message 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-01 11:47:17 -07:00
Nikolaj Bjorner be4b0ffe69 fix unsoundness bug instroduced when fixing #1125 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-30 19:36:38 -07:00
Nikolaj Bjorner c44c8284bd use worklist algorithm to avoid stack overflow #1125 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-30 18:10:36 -07:00
Nikolaj Bjorner a28a8304b7 Dev (#56) 
* introduce int_solver.h

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* add int_solver class

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* track which var is an integer

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add queries for integrality of vars

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* resurrect lp_tst in its own director lp

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add file

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add_constraint has got a body

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* fix add_constraint and substitute_terms_in_linear_expression

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* after merge with Z3Prover

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* adding stub check_int_feasibility()

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Dev (#50)

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* small fix in lar_solver.cpp

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* adding some content to the new check_int_feasibility()

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Dev (#51)

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding more nlsat

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* nlsat integration

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding constraints

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* add missing initialization

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* test

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* Dev (#53)

* change in a comment

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Disabled debug output

* removing FOCI2 interface from interp

* remove foci reference from cmakelist.txt

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding more nlsat

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* nlsat integration

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding constraints

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* add missing initialization

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* debugging nra

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* updates to nra_solver integration to call it directly from theory_lra instead of over lar_solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* n/a

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* integrate nlsat

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* tidy

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* preserve is_int flag

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* remove a debug printout

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Dev (#54)

* change in a comment

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* Disabled debug output

* removing FOCI2 interface from interp

* remove foci reference from cmakelist.txt

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* initial skeletons for nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding more nlsat

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* nlsat integration

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding constraints

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* add missing initialization

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* adding nra

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* debugging nra

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* updates to nra_solver integration to call it directly from theory_lra instead of over lar_solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* n/a

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* integrate nlsat

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* tidy

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* use integer test from lra solver, updated it to work on term variables

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix equality check in assume-eq

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix model_is_int_feasible

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* untested gcd_test()

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* call fill_explanation_from_fixed_columns()

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add the call to pivot_fixed_vars_from_basis() to int_solver.cpp::check()

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* port more of theory_arith_int.h

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* use statistics of lar_solver by theory_lra.cpp

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* port more code to int_solver.cpp

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add an assert

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* more int porting

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* fix a bug in pivot_fixed_vars_from_basis

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* small change

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

* implement find_inf_int_base_column()

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* catch unregistered vars in add_var_bound

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add a file

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* compile for vs2012

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* fix asserts in add_var_bound

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* fix the lp_solver init when workig on an mps file

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* towards int_solver::check()

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* change in int_solver::check() signature

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

* add handlers for lia moves

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* spacing

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 13:12:12 -07:00
Christoph M. Wintersteiger 1a59123819 Fixed x86/x64 issues in theory_str 2017-06-28 12:49:10 +01:00
Christoph M. Wintersteiger 2fceac04d4 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-06-25 22:19:54 +01:00
Christoph M. Wintersteiger c395516058 Adjusted rlimit increments in theory_arith to avoid non-termination issues 2017-06-25 22:19:42 +01:00
Christoph M. Wintersteiger ffbf19d944 Merge branch 'master' of https://github.com/wintersteiger/z3 2017-06-25 20:46:14 +01:00
Christoph M. Wintersteiger ad7aff2334 Added rlimit increments in theory_arith to avoid non-termination issues via F*. 2017-06-25 20:45:56 +01:00
Nikolaj Bjorner 1631a68981 make the option soup dependencies more user-friendly, #1109 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-23 16:57:50 -07:00
Nikolaj Bjorner 1681419052 adding change notes to release notes for a future release 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-23 16:50:33 -07:00
Nikolaj Bjorner cd4bb5beaf another fix for #1101 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-23 11:34:10 -07:00
Dan Liew 229fd3dc3e [CMake] Fix dependencies for generating install_tactic.cpp. 
Previously CMake was not aware of which headers files the generation
of `install_tactic.cpp` depended on. Consequently this could result
in broken incremental builds if

* Existing headers that declared tactics/probes changed.
* New tactics/probes were added to new header files.

Now the `z3_add_component()` CMake function has been modifed to take an
optional `TACTIC_HEADERS` argument which allows the headers that declare
tactics/probes to be explicitly listed. The necessary component
declarations have been modified to declare their tactic/probe header
files.

With this information CMake will now regenerate `install_tactic.cpp`
correctly.

This required the `mk_install_tactic_cpp_internal()` function to be
changed to take a list of header files rather than a list of component
source directories. The two consumers (CMake and Python/Makefile build
systems) of this function have been modified to work with this change.

This partially fixes #1030.
 2017-06-21 23:03:48 +01:00
Nikolaj Bjorner e48e7ef7be fix assertion, start addressing #1087 by using size_t 2017-06-20 14:38:58 -07:00
Nikolaj Bjorner 0ef14acf2e fix build break 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-20 14:25:56 -07:00
Nikolaj Bjorner 0fa6274a65 Fix bug #1079, integrality testing seems to have been wrong 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-20 14:18:43 -07:00
Nikolaj Bjorner f375016a11 disable tweak to seq until there are cycles to test further 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-19 18:23:27 -05:00
Nikolaj Bjorner 894c60bdf9 fix bug in qe-lite reported in #1086: bookkeeping of unconstrained variables only works for quantifier-free formulas 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-19 18:22:30 -05:00
Nikolaj Bjorner 02161f2ff7 revert internalize logic for re until debugged 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-15 21:13:25 -07:00
Nikolaj Bjorner e67572ffa6 address issues raised in #998 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-15 20:47:59 -07:00
Nikolaj Bjorner 5be3e959ab address issues raised in #998 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-15 20:46:47 -07:00
Nikolaj Bjorner 7023af4528 Merge branch 'master' of https://github.com/z3prover/z3 2017-06-13 19:03:45 -07:00
Nikolaj Bjorner a59ee8032c fix unsoundness bug in axiomatization of str.at. #1067 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-13 19:02:59 -07:00
Nikolaj Bjorner ce592d7716 add facility to add lemmas 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-12 19:44:02 -07:00
Dan Liew 4b517b96df [CMake] Move CMake files into their intended location so the 
`contrib/cmake/bootstrap.py` script no longer needs to be executed.

The previous location of the CMake files was a compromise proposed
by @agurfinkel in #461. While this has served us well (allowing progress
to be made) over time limitations of this approach have appeared.

The main problem is that doing many git operations (e.g. pull, rebase)
means the CMake files don't get updated unless the user remembers to
run the script. This can lead to broken and confusing build system
behaviour.

This commit only does the file moving and necessary changes to
`.gitignore`. Other changes will be done in subsequent commits.
 2017-06-12 11:59:00 +01:00
Nikolaj Bjorner af6ebbcd92 init search before returning 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-11 13:08:05 -07:00
Nikolaj Bjorner c870b77366 fixes to lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-08 17:25:06 -07:00
Nikolaj Bjorner 19d4b0a97a resolve conflicts 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-02 10:38:37 -07:00
Nikolaj Bjorner 3ce82ea8ce merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-02 10:37:22 -07:00
Nikolaj Bjorner 2908ab4069 fix reference count issue with pinning to expr_ref 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-01 09:56:25 -07:00
Nikolaj Bjorner e9ed3af455 fix regression in str 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-01 09:35:35 -07:00
Nikolaj Bjorner 1fa60f4893 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-06-01 09:11:09 -07:00
Nikolaj Bjorner 52e0f3b539 add string accessors to managed APIs #1051 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-01 09:10:49 -07:00
Christoph M. Wintersteiger 596652ed36 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-05-31 18:35:52 +01:00
Christoph M. Wintersteiger 4f0a87299c Fixed signed/unsigned comparison warnings 2017-05-31 18:35:06 +01:00
Christoph M. Wintersteiger a7d5bb7b36 Tabs 2017-05-31 12:18:00 +01:00
Nikolaj Bjorner 415824b600 put temporaries on trail 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-30 11:18:33 -07:00
Nikolaj Bjorner e0a86ccc1a add lrb/chb and experiment with them 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-28 10:48:31 -07:00
Nikolaj Bjorner e306287d7b updates to nra_solver integration to call it directly from theory_lra instead of over lar_solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-25 14:04:48 -07:00
Nikolaj Bjorner 1086eaaa1f debugging nra 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-24 21:46:19 -07:00
Nikolaj Bjorner b18dc7d052 adding nra 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-24 17:24:36 -07:00
Nikolaj Bjorner 7a809fe4f0 adding nra solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-24 14:56:59 -07:00
Nikolaj Bjorner fc53c5b638 adding nra solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-24 14:41:02 -07:00
Nikolaj Bjorner 49faaaa8f1 allowing non-literal assumptions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-23 15:01:00 -07:00
Nikolaj Bjorner 6f2cd4817b ensure arith.reflect has default true 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-23 14:09:45 -07:00
Nikolaj Bjorner 23ff580a67 get rid of timeb dependencies, pull request #1040 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-23 12:16:43 -07:00
Nikolaj Bjorner edb164587f get rid of a simplifier dependency 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-23 10:12:32 -07:00
Nikolaj Bjorner af4346f16a expose arith reflection, get rid of long m_manager attribute in asserted fromulas 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-23 10:04:29 -07:00
Nikolaj Bjorner 90af406338 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-05-23 08:51:38 -07:00
Nikolaj Bjorner 8e9739d3b0 work around crash #1039 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-23 08:51:26 -07:00
Nikolaj Bjorner f698efa403 Merge branch 'master' of https://github.com/z3prover/z3 into opt 2017-05-22 12:59:36 -07:00
Nikolaj Bjorner f90ae40480 Merge branch 'master' of https://github.com/NikolajBjorner/z3 into opt 2017-05-22 12:53:19 -07:00
Lev Nachmanson 942f8f8c49 merge 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2017-05-18 13:18:16 -07:00
Nikolaj Bjorner 79a8e9aab0 fix build break #1029 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-18 12:09:51 -07:00
Lev Nachmanson 7b433bee2b track which var is an integer 
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
 2017-05-16 17:36:32 -07:00
Nikolaj Bjorner a0efdc21c3 add missing locks around mpz operations that access object allocator. Use internal skolem constant for theory assumption to hide it from models 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-14 14:04:00 -07:00
Murphy Berzish 3c692a37eb fix consistency check involving strings with escape characters 2017-05-13 16:13:32 -04:00
Murphy Berzish 14355a15c8 use correct operator for lower bound assignment 
fixes #1022
 2017-05-13 16:02:41 -04:00
Murphy Berzish bf147556a6 add counter to theory_str::mk_fresh_const() 2017-05-13 14:18:05 -04:00
Nikolaj Bjorner 169295c9ba fix build warnings for theory_str 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-12 08:06:24 -07:00
Lev Nachmanson cf8b35a6f3 fix init reorder warning 
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
 2017-05-11 10:54:18 -07:00
Nikolaj Bjorner eb8da3fb9d fixing setup for LRA, re-enable LRA 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-11 09:34:07 -07:00
Nikolaj Bjorner 7e004fe331 fix build warnings part 7, disable LRA for regression t201.smt2 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-11 09:28:59 -07:00
Nikolaj Bjorner 9b3e2a9afe re-enable LRA after fixing dispatch for LRA in smt-setup 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-11 09:16:07 -07:00
Nikolaj Bjorner f176e1e5e5 disable LRA until unit tests are fixed 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-11 08:40:20 -07:00
Nikolaj Bjorner e9a085a0e2 enable LRA 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-11 08:23:43 -07:00
Lev Nachmanson 1d5fafd558 disable lev's solver 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2017-05-10 21:18:20 -07:00
Lev Nachmanson b08f094620 merging with the lp fork 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2017-05-10 16:53:25 -07:00
Lev Nachmanson cf695ab876 taking changes from the fork 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2017-05-10 10:43:01 -07:00
Nikolaj Bjorner 74ac58de2b enable generic parameters with smt-tactic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-10 10:18:50 -07:00
Christoph M. Wintersteiger 284436aa5a Merge branch 'master' of https://github.com/Z3Prover/Z3 2017-05-10 12:47:15 +01:00
Christoph M. Wintersteiger 248dd601ae Whitespace, newlines 2017-05-10 12:44:25 +01:00
Nikolaj Bjorner f4544eb060 disambiguating arguments to unordered map erase and dealing with unused and uninitialized variables 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-09 15:35:00 -07:00
Nikolaj Bjorner f12f83af83 fix warnings, avoid class qualification in static function 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-09 14:56:38 -07:00
Nikolaj Bjorner c5f1f8ba59 missing files 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-09 14:14:58 -07:00
Nikolaj Bjorner 2a63c56ae0 A faster and more scalable LRA solver by Lev Nachmanson. It is disabled in the initial merge pending a few bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-09 14:03:30 -07:00
Nikolaj Bjorner 911b24784a merge LRA 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-09 10:46:11 -07:00
Nikolaj Bjorner d8c3b273d3 adding benign initialization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-08 10:50:06 -07:00
Nikolaj Bjorner b915f78281 merge with master 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-07 17:05:57 -07:00
Murphy Berzish 6b2a800c7f fix warnings: unused variables, string constants 2017-05-07 18:23:47 -04:00
Nikolaj Bjorner 3ae722025f relaxing condition for assumptions, add theory-assumption to skolem functions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-07 14:54:47 -07:00
Nikolaj Bjorner e02392c0e3 use skolem function to avoid exposing temporary variables in models 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-07 14:03:24 -07:00
Nikolaj Bjorner 82bdd26817 clean up some warnings 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-06 13:40:53 -04:00
Murphy Berzish f904b033ad formatting theory_str.h 2017-05-05 19:29:53 -04:00
Murphy Berzish 21c8f4aae0 formatting theory_str.cpp 2017-05-05 19:26:15 -04:00
Murphy Berzish 7ddd43e16d first-class re.range support in theory_str 2017-05-05 15:29:58 -04:00
Murphy Berzish 75ba4d5a4d remove unneeded include 2017-05-05 14:54:36 -04:00
Murphy Berzish 8029b6b889 Merge branch 'upstream-master' into develop 2017-05-05 14:44:29 -04:00
Nikolaj Bjorner 7e1fae418a fix #1005, disable expansion of regular expression range to union as it degrades performance significantly 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-05 10:59:47 -04:00
Murphy Berzish c2b5e8cfda fix overlap detection internalization 2017-05-03 17:46:06 -04:00
Murphy Berzish ab4fbe40b6 cleanup 2017-05-03 17:45:56 -04:00