Nikolaj Bjorner
5068d2083d
tidy
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-22 11:36:03 -07:00
Murphy Berzish
367cc4b77f
check result of unsat core validation
2017-04-22 13:36:09 -04:00
Murphy Berzish
06cd07e3c2
Merge branch 'theory-assumptions' into develop
...
Conflicts:
src/smt/smt_context.cpp
src/smt/smt_context.h
src/smt/smt_theory.h
2017-04-22 13:31:43 -04:00
Murphy Berzish
a1bb1f2a13
pre-init assumptions and unsat core validation for smt theories
2017-04-22 13:15:00 -04:00
Murphy Berzish
5cfe5e15ac
unsat core validation for smt theories
2017-04-21 17:51:14 -04:00
Christoph M. Wintersteiger
0a0b17540f
Added rlimit.inc() for expensive interval exponentiation in the non-linear arithmetic theory.
2017-04-19 13:07:04 +01:00
Christoph M. Wintersteiger
a02a7f4443
Whitespace
2017-04-19 13:04:04 +01:00
Murphy Berzish
bef64961ae
add pre-init assumptions for smt theories
2017-04-18 13:12:03 -04:00
Christoph M. Wintersteiger
71da36f85c
Added core.extend_nonlocal_patterns parameter to improve unsat cores.
2017-04-18 15:13:11 +01:00
Nikolaj Bjorner
66e61b8a31
issues #963 #912
2017-04-17 03:06:38 -07:00
Nikolaj Bjorner
8b5627e361
additional API per #977
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-16 12:13:30 +09:00
Nikolaj Bjorner
9933c36050
replace long by int
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-15 17:06:03 +08:00
Nikolaj Bjorner
ab6abe901f
replace long by int
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-15 15:57:30 +08:00
Nikolaj Bjorner
87c3b5ee51
replace uint by long
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-15 15:29:02 +08:00
Nikolaj Bjorner
e4b9080165
include timeout/rlimit parameters in optmize
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-15 15:04:13 +08:00
Nikolaj Bjorner
48638c6f1e
fix for #975 , add mask to ensure character encoding is unique within range of bits used for encoding
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-15 09:34:13 +07:00
Nikolaj Bjorner
7bb5e72e07
add missing string/re operations #977 and adding Pseudo-Boolean operations to Java API
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-15 09:09:30 +07:00
Murphy Berzish
a7f72bf4ef
add overlap assumption to other cases in theory_str
2017-04-13 13:46:23 -04:00
Murphy Berzish
7207cabc97
experimental new unsat core based overlap detection
2017-04-12 17:09:35 -04:00
Nikolaj Bjorner
4140afa4cb
add regular expression membership for range of int.to.str functions. Issue #957
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-11 10:49:42 +08:00
Nikolaj Bjorner
be3cc91323
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-04-11 07:40:30 +08:00
Nikolaj Bjorner
67513a2cf5
fix detection of bounds under conjunctions. Issue #971
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-11 07:40:09 +08:00
Christoph M. Wintersteiger
b67c1c5501
Fixed valgrind warning. Fixes #972
2017-04-10 16:28:41 +01:00
Nikolaj Bjorner
80c10d5833
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-04-07 21:22:48 -07:00
Nikolaj Bjorner
ec29a03c8f
add facility to dispense with cancellation (not activated at this point). Address #961 by expanding recurisve function definitions that are not tautologies if the current model does not validate
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-07 21:22:38 -07:00
Christoph M. Wintersteiger
27a1758857
Added rewriter.ignore_patterns_on_ground_qbody option to disable simplification of quantifiers that have their universals appear only in patterns, but otherwise have a ground body.
2017-04-07 21:19:20 +01:00
Christoph M. Wintersteiger
7d35fcb17e
Avoid null pointer warnings in justifications.
2017-04-05 19:42:02 +01:00
Murphy Berzish
eef2bbadad
remove obsolete PARAM_STRING from ast
2017-04-04 20:29:48 -04:00
Murphy Berzish
f881e85470
remove old theory_str enums from api
2017-04-04 17:54:18 -04:00
Murphy Berzish
19de682b58
remove references to m_str_fid in api
2017-04-04 17:22:55 -04:00
Murphy Berzish
a8935e99bc
Merge branch 'upstream-master' into develop
2017-04-04 16:47:30 -04:00
Nikolaj Bjorner
c4b26cd691
add bypass to allow recursive functions from API
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-31 16:38:15 -07:00
Nikolaj Bjorner
582880346e
add index option to 'eval' command for box objectives. Issue #955
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-31 09:22:56 -07:00
Nikolaj Bjorner
8f798fef1a
fix python interface for string extract to take symbolic indices per bug report from Kun Wei
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-31 08:24:12 -07:00
Nikolaj Bjorner
c99205fa7e
return box model based on index. Issue #955
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-31 08:12:53 -07:00
Christoph M. Wintersteiger
0fb3161113
Updated declarations in decl_collector
2017-03-31 12:10:51 +01:00
Christoph M. Wintersteiger
ef3d340c85
Improved decl_collector for uninterpreted sorts in :print_benchmark output
2017-03-31 12:04:46 +01:00
Christoph M. Wintersteiger
041520f727
SMT2 compliancy fix; NRA includes conversion of Int numerals
2017-03-28 18:17:22 +01:00
Nikolaj Bjorner
0c4b792dac
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-03-25 19:32:17 +01:00
Nikolaj Bjorner
3a9857940e
add missing axioms for str.at. Issue #953
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-25 19:31:01 +01:00
Nikolaj Bjorner
723b507a88
properly handle recursive function definitions #898
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-24 10:11:39 -07:00
Nikolaj Bjorner
e05cee757b
properly handle recursive function definitions #898
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-24 10:10:42 -07:00
Christoph M. Wintersteiger
f8d022a180
Non-windows build fix
2017-03-24 15:25:18 +00:00
Christoph M. Wintersteiger
fb105afac2
Windows build fix
2017-03-24 15:22:33 +00:00
Christoph M. Wintersteiger
0399e5e2d3
Fixed variable initialization warning
2017-03-24 14:49:24 +00:00
Christoph M. Wintersteiger
d10dec2218
Removed unused variable
2017-03-24 14:31:06 +00:00
Christoph M. Wintersteiger
7f9c37e19d
VS2017 SSE4 intrinsics build fix
2017-03-24 14:23:39 +00:00
Christoph M. Wintersteiger
e9cd4d1057
Build fix for systems that don't come with SSE4.1 support by default
2017-03-24 11:51:36 +00:00
Christoph M. Wintersteiger
46ff4ae40d
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-03-24 09:40:23 +00:00
Christoph M. Wintersteiger
866035d786
Disabled debug output
2017-03-24 09:40:18 +00:00
Nikolaj Bjorner
ec47706226
fix constant offset and handling of ite in difference logic optimizer code-path. Issue #946
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-24 02:23:50 -07:00
Nikolaj Bjorner
5d11a1cdb2
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-03-24 01:31:16 -07:00
Nikolaj Bjorner
c56c7fd649
add handlers for dense difference logic
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-24 01:31:00 -07:00
Christoph M. Wintersteiger
37167a8dd6
Fixed excessive trace output
2017-03-23 19:53:23 +00:00
Nikolaj Bjorner
0313f52cf2
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-03-23 11:10:32 -07:00
Nikolaj Bjorner
62e87d6474
fix double ownership of enode marking causing crash during tracing. Issue #952
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-23 11:10:19 -07:00
Nikolaj Bjorner
1ab7ab9d74
fix double ownership of enode marking causing crash during tracing. Issue #952
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-23 11:09:36 -07:00
Murphy Berzish
82d472a227
Merge remote-tracking branch 'upstream/master' into develop
2017-03-23 13:35:58 -04:00
Nikolaj Bjorner
26ae3a5abb
making simplifier code exception friendlier. Towards getting a handle on #939
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-22 19:06:59 -07:00
Nikolaj Bjorner
e47e8c67c0
introducing scoped detacth/attach of clauses to enforce basic sat solver invariants. Part of investigating #939 :
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-22 14:12:47 -07:00
Nikolaj Bjorner
25d839ed10
fix bug in simplifier of bv2int over concatentations exposed by #948
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-22 10:55:55 -07:00
Nikolaj Bjorner
e342b87921
Merge pull request #942 from mtrberzi/str-extract-semantics
...
alternate str.extract semantics in seq_rewriter
2017-03-21 10:48:06 -07:00
Murphy Berzish
6804c88b66
make seq.extract rewrite type-generic
2017-03-21 12:54:06 -04:00
Nikolaj Bjorner
6be4c9a5bb
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-03-21 07:40:40 -06:00
Nikolaj Bjorner
ca4ae171ea
remove unsound simplification in prefix #949
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-21 07:40:35 -06:00
Nuno Lopes
8ac060c549
fix build with VS 2017
2017-03-20 09:12:41 +00:00
Nikolaj Bjorner
d58018841e
remove code that causes infinite loop. Stackoverflow question from Dominik Wojtaszek
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-17 10:52:16 -07:00
Murphy Berzish
43f9a0a2bd
fix unterminated char*
2017-03-17 13:48:30 -04:00
Nikolaj Bjorner
d754aa2dc4
disable ackerman reduction when head contains a non-constant/non-variable. #947
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-17 10:12:32 -07:00
Nikolaj Bjorner
a0237ed2a6
fix crash reported in #946
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-16 18:56:43 -07:00
Murphy Berzish
8021d63539
remove legacy str_decl_plugin and str_rewriter classes; these have been unified with sequence-compatible equivalents
2017-03-15 15:25:48 -04:00
Nikolaj Bjorner
72651e2e98
fixing sources for double frees of clauses. #940
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-14 19:35:11 -07:00
Nikolaj Bjorner
05c267b8d8
make seq.at operations generic
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-14 15:37:47 -07:00
Murphy Berzish
5917a34226
Merge branch 'upstream-master' into develop
2017-03-14 15:04:17 -04:00
Murphy Berzish
9659f08322
Merge branch 'str-extract-semantics' into develop
2017-03-14 14:14:53 -04:00
Murphy Berzish
34717a7b6e
str.extract semantics fix
2017-03-14 14:14:46 -04:00
Nikolaj Bjorner
0668ba5f6c
add pb shorthands to C++. Issue #694
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-14 07:58:39 -07:00
Nikolaj Bjorner
7634f8b93e
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-03-14 07:47:51 -07:00
Nikolaj Bjorner
1dd2de61ec
add sum shorthand to C++. Issue #694
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-14 07:43:26 -07:00
hume
0b1d564509
added no exception support to z3++.h
2017-03-14 18:11:00 +08:00
Murphy Berzish
24df976f95
fixup startswith/endswith to prefixof/suffixof
2017-03-13 17:03:36 -04:00
Murphy Berzish
94d5f242b8
Merge branch 'str-at-semantics' into develop
2017-03-13 14:40:40 -04:00
Murphy Berzish
5c9d7538a0
add alternate str.at semantics check in seq_rewriter
...
this rewrites to empty string if the index is negative or beyond the length of the string,
which is consistent with CVC4's semantics for this term
2017-03-13 14:39:12 -04:00
Dan Liew
2cb4223979
[CMake] Support including Git hash and description into the build.
...
CMake will automatically pick up changes in git's HEAD so that
the necessary code is rebuilt when the build system is invoked.
Two new options `INCLUDE_GIT_HASH` and `INCLUDE_GIT_DESCRIBE` have been
added that enable/disable including the git hash and the output of `git
describe` respectively. By default if the source tree is a git
repository both options are on, otherwise they are false by default.
To support the `Z3GITHASH` macro a different implementation is used from
the old build system. In that build system the define is passed on the
command line. This would not work well for CMake because CMake
conservatively (and correctly) rebuilds *everything* if the flags given
to the compiler change. This would result in the entire project being
rebuilt everytime git's `HEAD` changed. Instead in this implementation
a CMake specific version of `version.h.in` (named `version.h.cmake.in`)
is added that uses the `#cmakedefine` feature of CMake's
`configure_file()` command to define `Z3GITHASH` if it is available and
not define it otherwise. This way only object files that depend on
`version.h` get re-built rather than the whole project.
It is unfortunate that the build systems now have different `version.h`
file templates. However they are very simple and I don't want to
modify how templates are handled in the python/Makefile build system.
2017-03-12 22:11:59 +00:00
Nikolaj Bjorner
1f4f4514bf
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-03-12 09:40:58 +01:00
Nikolaj Bjorner
8bec1e25a8
move restore relevancy until after literals have been replayed
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-12 08:32:06 +01:00
James Bornholt
559c5e5ae6
z3py: With tactical should not try to use context as a parameter
2017-03-11 16:09:25 -08:00
Nikolaj Bjorner
228111511c
fixing build break, addressing #935
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-11 18:41:36 +01:00
Nikolaj Bjorner
509f7409ba
adding fixedpoint object to C++ API
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-10 23:01:43 +01:00
Nikolaj Bjorner
338193548b
fixing build break, adding fixedpoint object to C++ API
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-10 22:52:55 +01:00
Murphy Berzish
b459d17624
fix int-to-str terms in theory_str not being picked up
2017-03-10 13:53:55 -05:00
Murphy Berzish
c198bc5863
fix re.range rewrite for theory_str
2017-03-10 13:13:45 -05:00
Nikolaj Bjorner
fbf81c88a2
remove print breaking build
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-09 11:13:38 +01:00
Nikolaj Bjorner
854bb2197f
include recursive functions to models. Issue #898
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-08 21:41:24 -08:00
Nikolaj Bjorner
6f68355fbc
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-03-08 21:33:43 -08:00
Nikolaj Bjorner
29969648ba
check that formulas are in lira before invoking qsat. Issue #919
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-09 05:52:46 +01:00
Nikolaj Bjorner
fcda4cee9f
ensure evaluation of array equalities is enabled for external facing evaluator. Issue #917
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-09 05:29:56 +01:00
Nikolaj Bjorner
829519b837
fix bug for bit-vector optimization. Issue #928
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-08 10:19:35 +01:00
Nikolaj Bjorner
202ac0d1ee
Merge branch 'master' of https://github.com/Z3Prover/z3
...
:wi
2017-03-08 10:08:54 +01:00
Nikolaj Bjorner
41e6fafc58
fix bug for bit-vector optimization. Issue #919
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-08 10:07:31 +01:00
Christoph M. Wintersteiger
b57764800c
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-03-07 18:10:31 +00:00
Christoph M. Wintersteiger
8f14cfadd2
Tabs, whitespace
2017-03-07 18:10:03 +00:00
Murphy Berzish
4d5c1dcfb6
fix model gen for regex terms in theory_str
2017-03-06 17:04:07 -05:00
Murphy Berzish
577cb19745
experimental rewrite of bitvector unit sequences to string constants
2017-03-06 13:58:03 -05:00
Murphy Berzish
82b1a61b25
fix string operator names
2017-03-04 16:30:36 -05:00
Murphy Berzish
ad0766898c
add boolean operators to zstring and fix ostream
2017-03-04 15:20:57 -05:00
Murphy Berzish
9f79015ee6
patches to theory_str for theory_seq compat
2017-03-01 22:18:18 -05:00
Murphy Berzish
d00723e7ea
add String name for string sort, SMTLIB2.5 compat
2017-03-01 18:23:48 -05:00
Murphy Berzish
ab71dea82d
theory_str refactoring
2017-02-28 17:47:55 -05:00
Murphy Berzish
8b077ebbe7
re-add regex NFA
2017-02-28 14:06:13 -05:00
Murphy Berzish
9ac0d098ac
Merge remote-tracking branch 'upstream/master' into release-1.0
2017-02-28 12:45:04 -05:00
Nikolaj Bjorner
4792229c2b
Merge pull request #922 from mtrberzi/regex-unroll
...
add _re.unroll internal operator to seq_decl_plugin
2017-02-27 18:37:37 -08:00
Murphy Berzish
11000efbfe
fix zstring
2017-02-27 21:16:15 -05:00
Murphy Berzish
c62b55f9b1
fix npos semantics
2017-02-27 20:51:30 -05:00
Murphy Berzish
3f1ceedcb1
theory_str refactor pass 2
2017-02-27 20:48:55 -05:00
Murphy Berzish
725352234d
refactoring theory_str
2017-02-27 13:22:56 -05:00
George Karpenkov
be1e9918f0
Class Optimize#Handle should be static,
...
as it already includes an explicit reference to the Optimize class.
2017-02-27 18:49:02 +01:00
George Karpenkov
b3be83e7c5
Sane indentation + removing extra spaces for Optimize.java
2017-02-27 18:48:44 +01:00
George Karpenkov
d6c79facc7
Java API for getting the objective value as a triple
...
See #911 for the motivation,
and e02160c674
for the relevant change
in C API.
2017-02-27 18:42:44 +01:00
Nikolaj Bjorner
899843b7cd
fix unhandled finite domain sort rewrite case. Issue #918
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-26 17:20:54 -08:00
Nikolaj Bjorner
996c0f0666
fix type on exception message
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-25 16:14:50 -08:00
Nikolaj Bjorner
c7591e3c99
remove unreferenced label
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-24 11:13:08 -08:00
Nikolaj Bjorner
183ee7e37d
expose bounds as vector expressions instead of containing ad-hoc expressions. Issue #911
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-24 11:10:18 -08:00
Nikolaj Bjorner
e02160c674
expose bounds as vector expressions instead of containing ad-hoc expressions. Issue #911
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-24 11:07:40 -08:00
Nikolaj Bjorner
8437cb7132
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-02-24 07:54:25 -08:00
Murphy Berzish
0ebd93c8b5
add _re.unroll internal operator to seq_decl_plugin
2017-02-23 20:57:19 -05:00
Murphy Berzish
7e3e434147
Merge branch 'upstream-master' into release-1.0
2017-02-23 19:18:58 -05:00
Murphy Berzish
eb0ba26f90
C-style octal escapes, including 1- and 2-digit escapes
2017-02-23 18:33:10 -05:00
Murphy Berzish
61bbf8ba7e
add octal escape to seq_decl_plugin
2017-02-23 18:24:08 -05:00
Murphy Berzish
a7b21dc5d5
refactor: aligned external/internal names for str.strong_arrangements option
2017-02-23 16:00:05 -05:00
Murphy Berzish
3816779ba1
fix indent
2017-02-23 15:25:20 -05:00
Murphy Berzish
6387d59f5c
refactor: remove commented-out code
2017-02-23 15:08:05 -05:00
Murphy Berzish
858c754b15
refactor: remove unused variable in smt_case_split_queue
2017-02-23 15:05:43 -05:00
Murphy Berzish
5107e5cafc
refactor: remove t_str_refcount_hack traces
2017-02-23 15:01:55 -05:00
Murphy Berzish
cff7c450c3
refactor: uint_set
2017-02-23 14:57:48 -05:00
Murphy Berzish
179b0f7630
clean up todos theory_str
2017-02-21 19:52:27 -05:00
Murphy Berzish
15e3d3ec3c
octal escape theory_str
2017-02-21 15:51:08 -05:00
Murphy Berzish
fe1a976c21
fix merge remnant
2017-02-18 15:25:04 -05:00
Murphy Berzish
235ea79043
Merge branch 'upstream-master' into release-1.0
...
Conflicts:
src/cmd_context/check_logic.cpp
src/cmd_context/cmd_context.cpp
src/cmd_context/cmd_context.h
src/smt/params/smt_params_helper.pyg
src/smt/smt_context.cpp
2017-02-18 15:04:44 -05:00
Murphy Berzish
90705cfd5f
remove todo from str api
2017-02-17 13:28:52 -05:00
Nikolaj Bjorner
b0dd3f3238
add recursive function graphs to model, adapt rewriter to bypass branches whose evaluation is redundant
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-16 13:58:12 -08:00
Murphy Berzish
2e27e1cd36
fix obj_map insertions theory_str
2017-02-15 16:08:54 -05:00
Murphy Berzish
d67f732c7c
theory_str data structure refactoring
2017-02-15 13:39:55 -05:00
Nikolaj Bjorner
c67cf1653c
use non _ method from z3printer module so to be resilient against how _ is handled as indicator of private functions
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-15 08:46:58 -08:00
Murphy Berzish
f9b3c47bf5
remove commented-out old worklists
2017-02-14 18:45:09 -05:00
Murphy Berzish
d5b1e4b015
refactor theory_str: all library-aware/high-level terms are in one worklist
2017-02-14 18:44:40 -05:00
Murphy Berzish
3e714075c4
theory_str refactor: check_contain_by_substr uses contain_pair_idx_map
2017-02-14 16:09:45 -05:00
Murphy Berzish
52eaae9da0
theory_str refactor: check_contain_by_eqc_val uses contain_pair_idx_map
2017-02-14 15:19:03 -05:00
Murphy Berzish
5ca4f2a1c8
theory_str cleanup
2017-02-13 17:15:13 -05:00
Murphy Berzish
e699f25889
theory_str cleanup
2017-02-13 16:24:32 -05:00
Nikolaj Bjorner
216e17e5e2
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-02-13 08:16:43 -08:00
Nikolaj Bjorner
e7a21dfac2
add par_and_then
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-13 08:16:39 -08:00
Nikolaj Bjorner
6fcba26ea6
make parameters accessible from expressions. Issue #896
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-12 09:56:49 -08:00
Murphy Berzish
3670fa64e6
add hex escape support theory_str
2017-02-11 16:59:06 -05:00
Nikolaj Bjorner
b3dabc7ccf
add missing mod/rem/is_int functionality to C++ API
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-11 16:28:15 -05:00
Nikolaj Bjorner
4c6efbbc8b
expose numerator/denominators for Martin and Giles
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-11 16:02:51 -05:00
Nikolaj Bjorner
b42973152f
fix model generation for non-linear expressions, reported by Martin Suda and Giles Reger
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-11 12:02:32 -05:00
Nikolaj Bjorner
3a0e9e8f53
add itos/stoi conversion to API. Issue #895
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-11 11:31:13 -05:00
Murphy Berzish
c456795acd
temporarily remove finite model finding from theory_str
2017-02-07 17:14:11 -05:00
Murphy Berzish
55cb440aae
add cut var info for theory_str processtype2
2017-02-07 14:41:16 -05:00
Christoph M. Wintersteiger
e4411265ea
Fixed model-converter segfault in ::check_sat. Relates to #881
2017-02-05 17:53:44 +00:00
Christoph M. Wintersteiger
54280b6cc5
Fixed model-converter segfault in ::check_sat. Relates to #881
2017-02-05 17:20:45 +00:00
Christoph M. Wintersteiger
d6b4e99489
Fixed signed/unsigned warnings
2017-02-05 16:03:00 +00:00
Christoph M. Wintersteiger
5682c43604
Merge pull request #881 from dwoos/tactic-labels
...
Thread labels through tactic system
2017-02-04 20:37:11 +00:00
Christoph M. Wintersteiger
c56edc63d2
Merge pull request #882 from dwoos/sine-filter
...
Add basic Sine Qua Non filtering
2017-02-04 20:24:09 +00:00
Nikolaj Bjorner
999d17e29b
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-02-02 11:29:19 -08:00
Nikolaj Bjorner
bd0bd6052a
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-02-02 10:19:21 -08:00
Nikolaj Bjorner
9ca52a3361
fix bug in lexicographic handling in maxres: previous assumptions were not committed in corner cases
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-02 10:19:11 -08:00
Nikolaj Bjorner
2e89c2de3d
add par_or tactic to C++ API. #873
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-02 09:35:04 -08:00
Doug Woos
d6fbfe401e
add and use new is_pattern recognizer
2017-02-01 16:21:15 -08:00
Doug Woos
44c417904b
correctly pretty-print
2017-02-01 16:21:01 -08:00
Doug Woos
a147e2bc35
use is_uninterp
2017-02-01 16:20:40 -08:00
Nikolaj Bjorner
9cfd412cd0
enable pb theory always as pb terms can be introduced during transformations. Issue #884
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-01 15:28:29 -08:00
Nikolaj Bjorner
256a0e2d82
move exchange par
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-01 12:12:26 -08:00
Nikolaj Bjorner
40177f7bac
bypass combined solver when logic is set to QF_FD
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-01 08:05:04 -08:00
Nikolaj Bjorner
4d8d705b3f
bypass combined solver when logic is set to QF_BV or QF_FD
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-01 08:02:24 -08:00
Nikolaj Bjorner
f015e3e4cc
fix bug in propagation of parameters to combined solvers
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-31 17:17:58 -08:00
Nikolaj Bjorner
bdfa84c6fe
fix issues with running parallel solver: random strategy should not be a default on all solvers. Also reuse base solver
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-31 13:22:03 -08:00
Doug Woos
d9e43f0e6d
use insert_if_not_there
2017-01-31 11:48:52 -08:00
Doug Woos
89ba99918e
reindent
2017-01-31 11:48:52 -08:00
Doug Woos
c0bb6dd2be
delete unused args
2017-01-31 11:48:51 -08:00
Doug Woos
da63f6b0ff
delete comment
2017-01-31 11:48:51 -08:00
Doug Woos
b00c4d2e64
add name
2017-01-31 11:48:51 -08:00
Murphy Berzish
19779f1a9b
fix string operators in theory_str, this breaks theory_seq temporarily
2017-01-31 11:49:10 -05:00
Nikolaj Bjorner
1d1949e395
ensure that parallel threads are only invoked when thread count > 1
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 18:30:06 -08:00
Doug Woos
8196173e29
Introduce and use labels_vec
2017-01-30 15:50:34 -08:00
Doug Woos
3791810920
add const &
2017-01-30 15:09:57 -08:00
Murphy Berzish
ebcfa966c7
data structure refactor in theory_str
2017-01-30 16:07:32 -05:00
Nikolaj Bjorner
76bc4f0b38
refine parsat
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 11:30:42 -08:00
Nikolaj Bjorner
dadcc6e8ff
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-01-30 02:09:26 -08:00
Nikolaj Bjorner
37ee4c95c3
adding parallel threads
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 02:09:08 -08:00
Murphy Berzish
fa1ec0b80f
smtlib25 draft standard in theory_str
2017-01-27 16:49:40 -05:00
Murphy Berzish
a879b24011
add str.prefixof, str.suffixof in theory_str
2017-01-27 16:26:30 -05:00
Doug Woos
a9d61d48ae
Add basic Sine Qua Non filtering
2017-01-27 11:22:39 -08:00
Doug Woos
5796e15088
Thread labels through tactic system
2017-01-27 11:07:13 -08:00
Nikolaj Bjorner
b70f1f0319
fix overflow exposed in #880
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-27 09:47:18 -08:00
Nikolaj Bjorner
962979b09c
rework sat.mus to use restart count for bounded minimization
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-26 13:28:40 -08:00
Nikolaj Bjorner
7386e2f3e9
add warning for scearios of #876
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-25 18:29:30 -08:00
Nikolaj Bjorner
6e6c5935d7
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-01-25 18:09:37 -08:00
Nikolaj Bjorner
777091e653
fix part 1 of #875
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-25 18:09:27 -08:00
Nikolaj Bjorner
4782e19086
fix bug in sat-simplifier decreasing heap values of variables that are not in the heap
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-25 16:21:51 -08:00
Nikolaj Bjorner
60783e5696
fix regression for z3num
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-25 13:26:58 -08:00
Nikolaj Bjorner
4ec4abd7e3
fix test for int-value
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-23 13:31:43 -08:00
Murphy Berzish
09ac5645e4
parameterize theory-aware activity of overlap
2017-01-22 23:21:20 -05:00
Christoph M. Wintersteiger
adf8072eaa
Added option to limit the distance of unsat core extension through patterns.
2017-01-21 12:28:37 +00:00
Murphy Berzish
50e2273dbd
substr bugfix
2017-01-20 17:39:32 -05:00
Nikolaj Bjorner
1bfd09e16b
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-01-19 19:31:24 -08:00
Nikolaj Bjorner
e23509797a
access parameters from Python API
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-19 19:28:20 -08:00
Christoph M. Wintersteiger
5c1ffe13d1
x64 build fix for .NET 3.5 API
2017-01-18 13:06:28 +00:00
Christoph M. Wintersteiger
81c3a7dabd
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-01-18 12:32:10 +00:00
Christoph M. Wintersteiger
a334020f2c
Added .NET 3.5 solution/project files
2017-01-18 12:32:02 +00:00
Nikolaj Bjorner
16552d32cb
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-01-17 14:19:32 -08:00
Nikolaj Bjorner
0aa912371b
Another fix for #847 . Reset wmax theory solver state between lex calls, otherwise it uses stale constraints
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-17 14:19:24 -08:00
Nikolaj Bjorner
735998c386
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-01-17 13:41:25 -08:00
Nikolaj Bjorner
873d975c77
fix bug in consequence extraction: the order of bcp is not fixed between restarts, so the order of unit literals may not be preserved. This is relatively rare, so we optimize for the case where we assume bcp preserves order (and maybe miss some consequences)
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-17 13:41:15 -08:00
Murphy Berzish
a570149b57
finite overlap models with binary search
2017-01-17 14:49:57 -05:00
Christoph M. Wintersteiger
6d34899c46
Bugfix for macro finder. Fixes #832 .
2017-01-17 15:44:03 +00:00
Murphy Berzish
794e210958
finite model fix
2017-01-16 21:42:11 -05:00
Murphy Berzish
0af834421f
finite model finding for other concat cases in theory_str
2017-01-16 18:24:47 -05:00
Murphy Berzish
e459617c39
experimental finite model finding WIP, first successful run
2017-01-16 18:04:03 -05:00
Murphy Berzish
4e2847dea4
Revert "scale theory-aware priority by bvar_inc"
...
This reverts commit aa8bf2668f
.
2017-01-16 15:46:28 -05:00
Murphy Berzish
4b6582b8f3
Revert "experimental z3str2 search order"
...
This reverts commit 0dfaa30ae8
.
2017-01-16 15:46:17 -05:00
Murphy Berzish
0dfaa30ae8
experimental z3str2 search order
2017-01-16 14:46:04 -05:00
Christoph M. Wintersteiger
e472a8d4cf
Enabled filenames in error messages during inclusion of files.
2017-01-16 15:46:58 +00:00
Christoph M. Wintersteiger
090a331d79
Added filenames to error messages for when we have more than one file.
2017-01-16 15:43:13 +00:00
Christoph M. Wintersteiger
00a50eea7f
Added (include ...) SMT2 command.
2017-01-16 15:05:58 +00:00
Nikolaj Bjorner
dc543a7ee7
update macro_util logging to uniform format
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-15 21:13:22 -08:00
Nikolaj Bjorner
c4c9de0838
fix memory leaks from cancellations
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-15 20:09:27 -08:00
Nikolaj Bjorner
24eae3f6e0
fix crash with unary xor #870
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-15 12:06:56 -08:00
Nikolaj Bjorner
ee36662435
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-01-15 11:56:01 -08:00
Nikolaj Bjorner
7df803c131
Fix unsound handling of upper bounds in wmax, thanks to Patrick Trentin for report and careful repros #847
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-15 11:52:48 -08:00
Murphy Berzish
aa8bf2668f
scale theory-aware priority by bvar_inc
2017-01-14 15:28:58 -05:00
Murphy Berzish
a9ec8666f0
add phase selection to theory-aware branching queue
2017-01-14 14:43:57 -05:00
Nikolaj Bjorner
bc6b3007de
remove unused features related to weighted check-sat
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-13 20:53:22 -08:00
Murphy Berzish
dd03632f3d
Merge branch 'develop' of github.com:mtrberzi/z3 into develop
2017-01-13 12:57:50 -05:00
Murphy Berzish
f033a77fae
modify theory-aware branching to manipulate activity instead of giving absolute priority
2017-01-13 12:57:48 -05:00
Murphy Berzish
677fcdcb41
concat overlap avoid in theory_str
2017-01-12 18:41:30 -05:00
Christoph M. Wintersteiger
f1a4a48491
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-01-12 12:49:35 +00:00
Christoph M. Wintersteiger
2458db30cf
Corner-case fix for smt::solver::pop_core
2017-01-12 12:49:26 +00:00
Murphy Berzish
6576dabd58
add tracing info to theory_str cut var map
2017-01-12 00:20:34 -05:00
Daniel Perelman
3370adcdff
Mark void DummyContracts as Conditional to avoid compiling their arguments.
2017-01-11 17:02:26 -08:00
Christoph M. Wintersteiger
650ea7b9cc
Bugfix for smt.core.extend_patterns
2017-01-11 18:40:11 +00:00
Murphy Berzish
20a8ad9b21
correctly reserve entries in theory aware branching queue heap
2017-01-10 22:15:46 -05:00
Murphy Berzish
bc5af58734
additional theory-aware branches in theory_str
2017-01-10 20:08:35 -05:00
Murphy Berzish
1363f50e4f
demonstration of theory-aware branching in theory_str, WIP
2017-01-10 19:50:46 -05:00
Christoph M. Wintersteiger
9f49905582
Formatting, whitespace, and Z3_API annotations.
2017-01-10 21:05:27 +00:00
Christoph M. Wintersteiger
d8d869822f
Cleaned up #include<iostream> in api* objects.
2017-01-10 21:04:44 +00:00
Murphy Berzish
3459c1993e
experimental theory-aware branching code
2017-01-10 15:38:33 -05:00
Christoph M. Wintersteiger
384468bc99
Added option to extend unsat cores with literals that (potentially) provide quantifier instances.
2017-01-10 20:22:20 +00:00
Christoph M. Wintersteiger
ba9d36605b
Formatting, whitespace
2017-01-10 20:22:20 +00:00
Murphy Berzish
9004e1b23e
disable length test/theory case split integration theory_str
2017-01-10 12:34:44 -05:00
Christoph M. Wintersteiger
8047f0d91a
GCC compilation/keyword fix. Relates to #864
2017-01-10 14:06:56 +00:00
Christoph M. Wintersteiger
8f95ee01e1
Removed polynomial factorization test cases. Relates to #852 and fixes #865 .
2017-01-10 14:02:59 +00:00
Nikolaj Bjorner
331658f208
remove polynomial factorization as suggested by issue #852
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-09 21:30:54 -08:00
Nikolaj Bjorner
8d09b6e4a8
add at-least and pbge to API, fix for issue #864
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-09 21:23:00 -08:00
Murphy Berzish
5f854c6689
experimental linear search theory case split in theory_str
2017-01-09 15:11:56 -05:00
Murphy Berzish
6f5c1942f0
theory_str length propagation
2017-01-08 20:15:45 -05:00
Nikolaj Bjorner
c69a86e647
fix bug in antecedent collection for consequence finding: once an antecedent is set, it should not be cleared
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-06 19:34:50 -05:00
Nikolaj Bjorner
e9edcdc6e6
moderate exception behavior for issue #861
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-05 16:09:16 -05:00
Nikolaj Bjorner
f443bfed87
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-01-04 19:05:52 -08:00
Nikolaj Bjorner
ddf4bc548f
allow disabling exceptions from C++. Issue #861
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-04 19:04:43 -08:00
Murphy Berzish
c190d45859
fix binary search string length axiom
2017-01-04 15:56:16 -05:00
Nikolaj Bjorner
ae9a3bfc24
add operator for issue #860
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-04 09:14:09 -08:00
Murphy Berzish
f9d7981c1e
add theory case split to theory_str binary search
2017-01-03 15:45:04 -05:00
Christoph M. Wintersteiger
cb75a55095
Fixed initialization order warning.
2017-01-03 13:41:08 +00:00
Nikolaj Bjorner
74d3de01b3
enable incremental consequence finding with restart timeout
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-02 10:07:02 -08:00
Murphy Berzish
f3e064cb07
theory_str binary search crash avoidance when a negative length is reached
2016-12-31 13:28:32 -05:00
Nikolaj Bjorner
a4d5c4a00a
make get_consequence call skip check-sat if a model is already there
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-30 18:05:19 -08:00
Nikolaj Bjorner
8dde60f634
initialize watch in assign_eh
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-26 10:18:55 -08:00
Nikolaj Bjorner
aaf6e67ec8
add restart.max parameter to control cancellation based on restart count
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-25 17:43:47 -08:00
Nikolaj Bjorner
2bd29548da
improve parser error message over API, streamline names of statistics for arithmetic solver
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-25 17:27:56 -08:00
Nikolaj Bjorner
c44dd01292
fix missing else reported in #855
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-22 20:56:14 -08:00
Nikolaj Bjorner
46df31babf
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-12-22 20:54:14 -08:00
Nikolaj Bjorner
1787fa8296
remove redundant disjunction in compilation of at-most-1 constraints, log mutexes
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-22 20:54:09 -08:00
Nikolaj Bjorner
a444a33c30
updated encodings
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-22 17:45:21 -08:00
Murphy Berzish
0a6c23148f
fix empty vector edge case in binary search
2016-12-22 19:33:38 -05:00
Murphy Berzish
2dc9b486d3
theory_str binary search heuristic WIP
2016-12-22 19:17:42 -05:00
Nikolaj Bjorner
f52baf1e17
fix build again
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-21 10:48:43 -08:00
Nikolaj Bjorner
4bcf1bf2f6
fix debug build, unused variable warnings
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-21 10:44:49 -08:00
Nikolaj Bjorner
df492e200f
merge
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-21 10:04:02 -08:00
Nikolaj Bjorner
8d18fd075e
remove sources for unused variable warnings
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-21 09:54:45 -08:00
Murphy Berzish
df63b62763
fix vector manip bug in theory case split
2016-12-20 17:32:51 -05:00
Murphy Berzish
ab0fcc42f9
theory case split heuristic
2016-12-20 16:21:07 -05:00
Murphy Berzish
a04bc9974b
theory case split WIP
2016-12-20 11:14:42 -05:00
Dan Liew
b5aa6d5eb5
Fix issue with bd1f07f864
pointed out by
...
@nunolopes .
If `pthread_cond_signal()` is called while `m_mutex` is held then the
timing thread might be woken up twice due to waking up from
`pthread_cond_timeout()` (due to being signaled) but then being forced
to sleep again because the thread calling `~imp()` is still holding
`m_mutex` (which the timing thread needs to acquire).
2016-12-19 22:36:42 +00:00
Nikolaj Bjorner
0c6c104f9a
Merge pull request #841 from delcypher/scope_timer_spurious_wakes
...
Make `scoped_timer` robust to spurious wakes under Linux.
2016-12-19 08:22:03 -08:00
Murphy Berzish
94762d276d
add string constant cache to theory_str and associated param
2016-12-18 18:47:38 -05:00
Nikolaj Bjorner
189d449cff
fix generation of wcnf
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-18 14:49:45 -08:00
Murphy Berzish
e5d3e425f1
theory_str caching of all string constants
2016-12-18 15:23:05 -05:00
Nikolaj Bjorner
5083b1adee
Merge branch 'master' of https://github.com/Z3Prover/z3
2016-12-17 16:03:02 -08:00
Nikolaj Bjorner
5cb21924ad
ensure that FD logic understands pb from command context
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-17 16:02:54 -08:00
Murphy Berzish
e85f9d33c4
add "legacy" support for theory case splits
...
this replicates what was done in theory_str to add axioms excluding each
pair of literals from being assigned True at the same time;
no new heuristics are being used in smt_context (yet)
2016-12-16 15:50:03 -05:00
Christoph M. Wintersteiger
6ce903b1d6
Style, whitespace.
2016-12-16 20:04:29 +00:00
Murphy Berzish
dd8cd8199b
theory_str refcount debug messages and beginning theory case split
2016-12-16 14:37:34 -05:00
Murphy Berzish
67e7307777
add cut var debug info, wip
2016-12-14 15:00:17 -05:00
Murphy Berzish
27a2c20c1c
add more parameters for theory_str
2016-12-13 19:38:40 -05:00
Murphy Berzish
bced5828f7
theory_str parameters
2016-12-13 17:20:58 -05:00
Murphy Berzish
f5bc17b864
theory_str params module, WIP
2016-12-13 16:12:57 -05:00
Nikolaj Bjorner
c1480b4389
handle model generation from issue #748 . Deal with warnings from #836
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-12 00:40:52 +01:00
Dan Liew
bd1f07f864
Fix implementation of scoped_timer
under Linux where it was
...
incorrectly assumed that `pthread_cond_timedwait()` would exit
due to a condition variable being signaled or a timeout occuring.
According to the documentation `pthread_cond_timedwait()` might
spuriously wake so we introduce a new variable `m_signal_sent` (that is
guarded by an existing mutex) that is used as the variable to check that
the thread wake was not spurious.
This is intended to partially fix #839 .
2016-12-11 23:12:36 +00:00