mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 13:28:47 +00:00
Code Activity
6982 commits 23 branches 48 tags 157 MiB
Commit graph

5674 commits

Author SHA1 Message Date
Christoph M. Wintersteiger a7d5bb7b36 Tabs 2017-05-31 12:18:00 +01:00
Nikolaj Bjorner 546d22e77a Merge branch 'master' of https://github.com/Z3Prover/z3 2017-05-30 11:18:43 -07: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 870017e2ce Merge pull request #1049 from chaserhkj/java-api-update-fix 
`Expr.update()` in java API should not return super class
 2017-05-29 18:14:54 -07:00
KangJing Huang (Chaserhkj) 8092dd5aa3 Fix Expr.update in java API returning superclass 2017-05-29 20:51:42 -04:00
Nikolaj Bjorner 4cbf938cf3 enable get-unsat-assumptions command per request in #1048 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-29 16:26:22 -07:00
Nikolaj Bjorner 2de80b5ce9 add pb built in ops for logic ALL #1045 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-29 10:08:50 -07:00
Nikolaj Bjorner d95ac58bad remove throw in reason-unknown #1043 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-28 12:09:35 -07:00
Nikolaj Bjorner f80a622a8f add colon to assertion stack levels #1046 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-28 11:10:46 -07:00
Nikolaj Bjorner 1654ad7059 adding escape characters to reason-unknown #1043 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-27 14:56:38 -07:00
Nikolaj Bjorner f3a0b7e0cd change command-line experience for pareto fronts. It now requires multiple check-sat calls to loop over the fronts. This allows querying each model in turn. #1008 2017-05-23 20:05:10 -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 3f89c1418b fix test build 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-23 12:51:14 -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 2834fea9b3 fix x64 warnings 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-23 08:58:21 -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 2cbeedec69 accept hereditarily finite sorts in datalog engine 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-22 19:32:43 -07:00
Nikolaj Bjorner 622d8c951c remove redundant data-type function declarations from pretty-printed output. #1034 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-22 14:40:42 -07:00
Nikolaj Bjorner b782ec35cc avoid print statements from assertions when the assertion does not trigger. Stackoverflow question http://stackoverflow.com/questions/44094927/creating-formula-taking-too-much-time-in-z3py 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-21 10:35:59 -07:00
Ken McMillan bf7c6292bd removing FOCI2 interface from interp 2017-05-19 16:21:57 -07:00
Lev Nachmanson 1b62592015 change in a comment 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2017-05-18 13:44:00 -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
Nikolaj Bjorner 4069e76ab0 remove unused column function field, #1021 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-16 21:27:43 -07:00
Nikolaj Bjorner ceec81de0b simplify code, issue #1028 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-16 08:32:08 -07:00
Nikolaj Bjorner 7fab670719 fix regression, issue #1028 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-16 08:21:32 -07:00
Nikolaj Bjorner d2ac59f238 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-05-14 14:10:01 -07:00
Nikolaj Bjorner 3290a933b5 remove spurious include file 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-14 14:09:42 -07:00
Nikolaj Bjorner 22386d3727 Merge pull request #1026 from Owlz/setup_bin_fix 
Fixing z3 binary setup to data_files
 2017-05-14 14:06:16 -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
Owlz aad186f6a5 Fixing z3 binary setup to data_files 2017-05-14 15:25:17 -04: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
Nikolaj Bjorner 07474e4887 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-05-12 07:59:30 -07:00
Nikolaj Bjorner 64f3b3e316 remove lp_main from test branch to ensure test build only builds a single entry point 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-12 07:59:16 -07:00
Lev Nachmanson 07f2fd43bb Merge remote-tracking branch 'upstream/master' 2017-05-11 17:49:33 -07:00
Lev Nachmanson d0d71a0907 allow more failures in d_solver 
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
 2017-05-11 17:49:27 -07:00
Nikolaj Bjorner a9e2a1204e add this qualifier for build 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-11 16:58:29 -07:00
Nikolaj Bjorner 7b35eacf63 add this qualifier for build 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-11 16:52:54 -07:00
Nikolaj Bjorner 2ab0f281f3 add this qualifier for build 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-11 16:50:39 -07:00
Nikolaj Bjorner 29a49f4427 convert static random fields to non-static 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-11 16:46:07 -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 431feab1bf fix build warnings part 8 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-11 09:37:01 -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 49d2b86d35 fix build warnings part 6 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-11 08:57:17 -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
Nikolaj Bjorner b9a695633d fix build issues part 4 2017-05-11 08:18:20 -07:00
Nikolaj Bjorner 6e021781cd fix build issues part 3 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-11 07:49:41 -07:00
Nikolaj Bjorner fcfaedd9ec fix build issues part 2 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-11 07:39:56 -07:00
Nikolaj Bjorner 2a905e02c8 fix build issues part 1 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-11 07:38:52 -07:00
Nikolaj Bjorner 714dfaded3 Merge pull request #1017 from levnach/123 
123
 2017-05-11 07:31:40 -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
Nikolaj Bjorner d1cfc53495 fix for #1015 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-10 19:40:00 -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
Nikolaj Bjorner f03f471f02 fix for #1016 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-10 15:13:04 -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 f572c79cdb add instances 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-09 19:55:24 -07: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 d43c12413d add disambiguation, avoid uninitialzed variable passing in debug mode 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-09 15:27:42 -07:00
Nikolaj Bjorner 445a2280d3 missing file 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-09 15:18:15 -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 561522f882 missing file 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-09 14:20:13 -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 905cf08e5d missing files 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-09 14:11:33 -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 085d31dca2 mpq/mpz features from LRA 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-09 09:18:59 -07:00
Nikolaj Bjorner 60725f5384 use vector fixes from LRA branch 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-09 09:13:27 -07:00
Nikolaj Bjorner 42ea2d1ea5 LRA changes to rational 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-09 09:06:41 -07:00
Nikolaj Bjorner d8c3b273d3 adding benign initialization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-08 10:50:06 -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
Murphy Berzish 41a242fab1 Merge branch 'upstream-master' into develop 
Conflicts:
	src/smt/params/smt_params.h
	src/smt/params/smt_params_helper.pyg
	src/smt/smt_case_split_queue.cpp
	src/smt/smt_context.h
	src/smt/smt_setup.cpp
	src/smt/smt_setup.h
 2017-05-03 17:03:13 -04:00
Murphy Berzish ede6d7bb2b add iterator accessors to obj_pair_set 2017-05-03 14:55:22 -04:00
Nikolaj Bjorner 1177be6391 add common utility to set up seq 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 20:52:39 -07:00
Nikolaj Bjorner 52dfdedb9b Merge pull request #1000 from mtrberzi/theory_str-smt-setup 
smt_setup for strings/sequences
 2017-05-02 20:44:23 -07:00
Nikolaj Bjorner cc7a176c89 update to retain original behavior 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 19:32:03 -07:00
Nikolaj Bjorner eeb79e1c3c update to retain original behavior 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 19:30:54 -07:00
Nikolaj Bjorner 561a4331a8 add back use of all variables for tracking 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 16:36:05 -07:00
Nikolaj Bjorner cec6ced457 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-05-02 15:57:41 -07:00
Nikolaj Bjorner 21cda27f5e fix quadratic behavior of extract_assumptions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 15:57:31 -07:00
Nikolaj Bjorner 5b0286001b Merge pull request #999 from mtrberzi/theory-aware-branching 
Theory-aware branching heuristic
 2017-05-02 15:32:37 -07:00
Murphy Berzish 92755b0185 smt_setup framework, all hooks to theory_str are redirected to theory_seq 2017-05-02 17:16:35 -04:00
Nikolaj Bjorner ed0b2be618 fix bug in tracking levels of variables: levels are not cleared, only truth assignment 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 14:10:07 -07:00
Murphy Berzish a418f0c30b fix spacing 2017-05-02 15:52:35 -04:00
Murphy Berzish e6d527c5d5 remove trace code from theory_arith 2017-05-02 15:39:15 -04:00
Murphy Berzish 15cb2d7dba cleanup 2017-05-02 14:08:48 -04:00
Murphy Berzish a8d069ba46 refactor: add asserts, use case split strategy param 2017-05-02 13:06:08 -04:00
Murphy Berzish 5b4792955d theory-aware branching heuristic 2017-05-02 10:43:40 -04:00
Murphy Berzish 6cd1f877b8 params for theory aware branching 2017-05-02 10:39:32 -04:00
Murphy Berzish 0862949e66 Merge branch 'upstream-master' into develop 
Conflicts:
	src/smt/params/smt_params.cpp
	src/smt/params/smt_params.h
	src/smt/smt_context.cpp
	src/smt/smt_context.h
 2017-05-01 21:33:23 -04:00
Nikolaj Bjorner 48e37b0e16 pass qhead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-01 16:54:22 -07:00
Nikolaj Bjorner 8ba78081ec fix build break 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-01 16:41:17 -07:00
Nikolaj Bjorner 61e0fc9099 Merge pull request #995 from mtrberzi/theory-case-split 
Theory case split heuristic (for theory_str)
 2017-05-01 15:27:45 -07:00
Murphy Berzish 16a5e944d7 use reference for case split sets 2017-05-01 18:25:54 -04:00
Nikolaj Bjorner f9105edb14 revert to native chunker 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-01 15:22:52 -07:00
Murphy Berzish b86d472eaf simplify theory case split handling 2017-05-01 18:22:49 -04:00
Nikolaj Bjorner d14f2af5ae deal with subtraction that manages to sneak in. Issue #996 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-01 15:22:06 -07:00
Murphy Berzish 3bce61e0d4 fix warning 2017-05-01 10:43:33 -04:00
Murphy Berzish 2f56d128b0 add theory case split support to smt_context 2017-05-01 10:34:43 -04:00
Murphy Berzish f655e1976e add params for theory case split 2017-05-01 10:18:38 -04:00
Nikolaj Bjorner aceee3fac8 renmae to opt_stream_buffer to avoid clash with dimacs stream buffer. #994 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-30 12:54:29 -07:00
Nikolaj Bjorner 0693a413b6 augment #955 to handle hyphen 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-30 12:50:56 -07:00
Nikolaj Bjorner 86f3526110 update get-value to also respect parameter model_index, #955 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-30 11:48:06 -07:00
Nikolaj Bjorner d6e2e1f28f Merge branch 'master' of https://github.com/Z3Prover/z3 2017-04-30 11:28:26 -07:00
Nikolaj Bjorner aff02ca905 include 'stopwatch.h' to avoid ODR warnings, #994 2017-04-30 11:28:11 -07:00
Nikolaj Bjorner bd1b930d7a swap argument order of chunk with file 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-30 11:00:03 -07:00
Nikolaj Bjorner 5fcbf55216 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-04-30 10:23:05 -07:00
Nikolaj Bjorner 2c208e1d10 Sat update 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-30 10:23:00 -07:00
Nikolaj Bjorner 4468816d32 fix unused variables 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-29 19:00:15 -07:00
Nikolaj Bjorner b3f720c2bf fix unused variables 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-29 18:58:34 -07:00
Nikolaj Bjorner 3152833893 fix unused variables 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-29 18:55:47 -07:00
Nikolaj Bjorner 944dfbc6ef Merge branch 'master' of https://github.com/Z3Prover/z3 2017-04-29 17:39:20 -07:00
Nikolaj Bjorner fa868e058e fix bound bug #991 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-29 17:39:02 -07:00
Murphy Berzish 88147f7047 theory_str static features and cmd_context 2017-04-28 14:14:28 -04:00
Murphy Berzish d51ebac10a remove references to str_fid 2017-04-28 14:01:44 -04:00
Murphy Berzish f1cee803e8 fixup 2017-04-28 13:44:48 -04:00
Murphy Berzish d2ae94935e Merge branch 'upstream-master' into develop 
Conflicts:
	src/ast/rewriter/seq_rewriter.cpp
	src/ast/seq_decl_plugin.h
 2017-04-28 13:43:14 -04:00
Nikolaj Bjorner 62a36189d5 Merge pull request #988 from mtrberzi/theory_str-frontend 
Frontend changes for theory_str
 2017-04-28 08:21:18 -07:00
Murphy Berzish 05958193ab revert change to String sort declaration 2017-04-27 22:30:02 -04:00
Murphy Berzish 12dd6d786b remove redundant is_seq() check 2017-04-27 21:24:40 -04:00
Murphy Berzish 7811a91bad fix is_string_term() 2017-04-27 13:59:02 -04:00
Murphy Berzish 334677a7eb fix is_string_term() 2017-04-27 13:58:36 -04:00
Nikolaj Bjorner 69aa5ca877 Merge pull request #984 from delcypher/cmake_doxygen 
[CMake][Doxygen] Support building/installing API documentation and fix lots of bugs
 2017-04-27 06:58:32 -07:00
Nikolaj Bjorner d3b30968fa added chunk based backbone utility 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-26 16:55:56 -07:00
Murphy Berzish 46ac718790 theory_str frontend changes 2017-04-26 17:24:05 -04:00
Murphy Berzish d16b20d62b Merge branch 'upstream-master' into develop 2017-04-26 17:21:10 -04:00
Nikolaj Bjorner a048d74bae adding interval designator to output of non-optimal objectives, fix python doc test 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-26 14:05:33 -07:00
Nikolaj Bjorner 8032217fd1 tuning and fixing consequence finding, adding dimacs evaluation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-26 13:53:37 -07:00