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

371 commits

Author SHA1 Message Date
Nikolaj Bjorner 74890ca1c8 fixes #1180
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-31 09:37:25 -07:00
Arie Gurfinkel 78467077f6 fixing a build error 2017-07-28 12:18:12 -04:00
Nikolaj Bjorner c8b5be48de unexpressing interpolants #1172
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-27 11:44:52 -07:00
Nikolaj Bjorner 21759e5eb2 fixes #1172
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-27 08:59:12 -07:00
Nikolaj Bjorner bb7b3c510f fix for #1161
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-26 19:52:05 -07:00
Nikolaj Bjorner a0a8bc2a62 fixes to #1155 and partial introduction of SMTLIB 2.6 datatype format
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-24 09:12:43 -07:00
Nikolaj Bjorner ea331ebfbe revert update to #1134
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-07 08:29:16 -07:00
Nikolaj Bjorner d06e48a361 detect overlapping signatures #1134
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-07 08:13:14 -07:00
Nikolaj Bjorner 9d1852343c add separate get-objectives command #1107
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-23 16:34:38 -07:00
Dan Liew 6f48a145aa [CMake] Fix dependencies for generating gparams_register_modules.cpp.
Previously CMake was not aware of which headers files the generation
of `gparams_register_modules.cpp` depended on. Consequently this could result
in broken incremental builds if

* Existing headers that declared module description/parameters change.
* New headers are added that declare module description/parameters.
* `.pyg` files that generate header files that declare module
  description/parameters change

Now the `z3_add_component()` CMake function has been modifed so that

* All header files that are generated from `.pyg` files are added as
dependencies and are scanned from module description/parameter
declarations. This implicit dependency of `gparams_register_modules.cpp`
depending on other generated header files seems unnecessary complex. We
should revisit this design decision once the Python/Makefile build
system is deprecated.

* The function now takes an optional `EXTRA_REGISTER_MODULE_HEADERS`
argument which allows the headers that declare module
description/paramters to be explicitly listed.

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

This required the `mk_gparams_register_modules_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:56:46 +01:00
Christoph M. Wintersteiger a0b25147d9 Fix for the fix for #1062. 2017-06-20 14:48:03 +01:00
Christoph M. Wintersteiger ab21caf55f Reverted fix for quoted echo strings when smtlib2_compliant=false. Kindly reported by Armael Gueneau. Fixes #1062. 2017-06-20 14:39:22 +01:00
Christoph M. Wintersteiger 7b97688302 Whitespace, typo. 2017-06-20 14:36:40 +01:00
Nikolaj Bjorner b978f78c21 add sequence recognizers
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-13 20:35:35 -07:00
Nikolaj Bjorner 8b12cc0bdf fix build warning
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-13 19:58:55 -07:00
Nikolaj Bjorner 5066bd01f7 Merge pull request #1070 from delcypher/cmake_file_move
[CMake] Move CMake files into their intended location
2017-06-13 13:27:25 -07:00
Nikolaj Bjorner 6bce173248 properly quote symbols #1061
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-12 18:35: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 f0fa439c48 escaping names in get-assignment #1061
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-11 17:17:47 -07:00
Nikolaj Bjorner f44a3e1bbc print_core as a function
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-10 10:18:07 -07:00
Nikolaj Bjorner d5f646929e print success #1068
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-10 09:16:36 -07:00
Nikolaj Bjorner 668bad6121 print success after reset assertions #1057
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-04 11:04:54 -07: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 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 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 88147f7047 theory_str static features and cmd_context 2017-04-28 14:14:28 -04: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
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 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
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
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 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
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
Doug Woos 8196173e29 Introduce and use labels_vec 2017-01-30 15:50:34 -08:00
Doug Woos 5796e15088 Thread labels through tactic system 2017-01-27 11:07:13 -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
Nikolaj Bjorner 32c63ce4cd address other warnings per input from delcypher
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-10 17:23:59 +01:00
Nikolaj Bjorner ef9230d8f8 detect quantifiers in model expressions to quiet down failing model validation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-07 06:56:36 -08:00
Nikolaj Bjorner 51a4085910 check for logic in solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-04 15:19:11 +00:00
Nikolaj Bjorner f61600d1d8 fixing unsat core extraction for tactics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-02 14:14:55 +00:00
Nikolaj Bjorner 24fc19ed58 speed up consequence finding by avoiding local search whenver assumption level is reached during the initial phase
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-27 08:15:39 -07:00
Christoph M. Wintersteiger df2a569d25 Replaced antiquated header with modern equivalent. 2016-10-24 13:29:17 +01:00
Nikolaj Bjorner 3778048eb4 add bounded-int and pb2bv solvers to fd_solver, use sorting networks for pb2bv rewriter when applicable, hoist to pb2bv_rewriter module and remove it from the pb2bv_tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-23 20:31:59 -07:00
Nikolaj Bjorner d060359f01 add fd solver for finite domain queries
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-18 22:34:34 -04:00
Nikolaj Bjorner 9f77759cd6 ensure that status is displayed in SMT-LIB2 compliant way. Issue #734
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-09-13 10:34:34 -07:00
Nikolaj Bjorner 439e8e6b04 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-08-20 03:53:55 -07:00
Nikolaj Bjorner f2b5c11d1c add option for prettier proof printing, Issue #706
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-08-20 03:52:45 -07:00
Christoph M. Wintersteiger b74bff7fb7 logic detection fix 2016-08-10 11:39:47 +01:00
Christoph M. Wintersteiger 03aa6914a3 Fixed sub-logic detection for the ALL logic. 2016-08-09 13:20:45 +01:00
Nikolaj Bjorner 7562efbe84 add consequence command
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-07-30 12:59:29 -07:00
Nikolaj Bjorner b7de813c63 set solver on simplify command
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-07-27 15:35:44 -07:00
Nikolaj Bjorner b56837e09b fix build break: throw only on invalid model
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-07-20 13:11:22 -07:00
Nikolaj Bjorner 60711bb0cd deal with model construction, issue #684. fix model construction for ite #678. WIth this version, issue #686 does not repro
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-07-20 12:18:07 -07:00
Nikolaj Bjorner 73cdf809fe Merge branch 'master' of https://github.com/Z3Prover/z3 2016-07-09 12:36:22 -07:00
Nikolaj Bjorner 0a6b03808c fix core extraction for QF_BV theory/inc_sat_solver based on regressions pointed out by Matthias Heizmann and Tjark Weber
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-07-09 12:35:54 -07:00
Nikolaj Bjorner 8f862f8fed fix core extraction for QF_BV theory/inc_sat_solver based on regressions pointed out by Matthias Heizmann and Tjark Weber
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-07-09 12:35:11 -07:00
Christoph M. Wintersteiger 7cf80845fd Merge pull request #675 from FabianWolff/master
Fix spelling errors
2016-07-09 17:32:10 +01:00
Nikolaj Bjorner 3d73fe55c7 track assumptions when calling check-sat. regression detected by Tjark Weber running core extraction
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-07-09 05:31:49 -07:00
Nikolaj Bjorner 53b3edc8cc add cases for recognizing ALL. Issue #674
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-07-09 05:18:26 -07:00
Fabian Wolff 6eaab00e83 Fix spelling errors 2016-07-09 11:46:43 +02:00
Nikolaj Bjorner 39acd3594a test variants for seq_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-05-30 18:15:10 -07:00
Nikolaj Bjorner c3f498a640 strengthen support for int.to.str and length reasoning. Issue #589
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-05-28 12:26:47 -07:00
Nikolaj Bjorner 09b8c0e7fa removing warnings for unused variables, #579
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-05-17 15:59:06 -07:00
Nikolaj Bjorner e29adbf304 fix issues #581: nested timeouts canceled each-other
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-04-30 11:18:34 -07:00
Nikolaj Bjorner 4ebf392da7 Fixes #564: use std::vector on std::strings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-04-16 09:26:13 -07:00
Nikolaj Bjorner f175f864ec merge useful utilities from qsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-19 12:01:44 -07:00
Nikolaj Bjorner 5994c5a948 fix partial model tracking over cancellation/exceptions, reported by August Shi. Fix regression test for fp-to-real, reset the pre-processor in inc_sat_solver on exceptions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-07 16:42:29 -08:00
Nikolaj Bjorner 7c6540e18f recursive function definitions; combine model-building functionality
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-03 07:59:03 -08:00
Nikolaj Bjorner a25336a899 fix test build, working on rec-functions and automata complementation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-01 22:31:44 -08:00
Nikolaj Bjorner 67397bf71e enable logic parameter update to configure SMTLIB logic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-01 09:48:24 -08:00
Mikolas Janota 470f8bca73 Merge remote-tracking branch 'upstream/master' into lackr 2016-01-26 16:51:57 +00:00
Mikolas Janota c2edf2c5bf Merge remote-tracking branch 'upstream/master' into lackr 2016-01-25 13:04:46 +00:00
Nikolaj Bjorner 924f03c6de fixing bugs in seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-23 10:38:49 -05:00
Nikolaj Bjorner 85d44c5d66 fix axioms for extract, add extensionality checking for shared variables, convert exceptions to unknown status per #419
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-18 11:09:41 +05:30
Nikolaj Bjorner a295dd48dc add seq_rewriter to model_evaluator, remove th_rewriter additional step in validator
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-15 04:02:48 +05:30
Nikolaj Bjorner 7cbd59bf06 enhance model validation to invoke rewriter if result isn't true using the simplify-based model evaluator
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-15 03:40:33 +05:30
Mikolas Janota 5706df30c6 Fixing soft timeout for check-sat-using. 2016-01-08 16:17:34 +00:00
Nikolaj Bjorner 521271e559 moving to resource managed cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 17:46:22 -08:00
Nikolaj Bjorner 96d1066c6a reworking cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 16:43:48 -08:00
Nikolaj Bjorner baee4225a7 reworking cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 16:21:24 -08:00
Nikolaj Bjorner 981f8226fe moving to resource managed cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 13:36:47 -08:00
Nikolaj Bjorner 32b6b2da44 moving to resource managed cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 13:13:11 -08:00
Nikolaj Bjorner 58411f64e8 seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-10 20:25:12 -08:00
Nikolaj Bjorner 5eb23e1e7a seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-10 19:20:16 -08:00
Nikolaj Bjorner 75359c580e add basic rewriting to strings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-05 12:02:33 -08:00
Nikolaj Bjorner 3f02beb820 reset-assertions resets everything (also declarations, and we take scopes) when global-declarations is false. v2.5
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-03 10:18:40 -08:00
Nikolaj Bjorner 5d61c871b0 add some of the SMT2.5 features
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-02 19:14:47 -08:00
Nikolaj Bjorner e2565d8d82 add some of the SMT2.5 features
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-02 18:41:10 -08:00
Nuno Lopes b26735a887 fix build with gcc
Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-11-22 11:24:30 +00:00
Nikolaj Bjorner c1a6163bda disable aig tactic in inc_sat_solver (it can blow up the size of formulas significantly without sharing) and fix configuration update bug for optimization context exposed in example by Corina
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-20 14:34:31 -08:00
Nikolaj Bjorner 1575dd06a7 expose labels from optimization. Move printing of objectives to after sat/unsat. Cahnge format to something that is somewhat related to how other output is created. Issue #325.
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-18 09:42:12 -08:00
Christoph M. Wintersteiger 6b5e49c4a1 Added checks for uint parameter values in context_params 2015-11-14 17:25:18 +00:00
Christoph M. Wintersteiger c2aee86e4e Added new SMT logic names 2015-11-06 16:24:44 +00:00
Christoph M. Wintersteiger 20715bbf3b Fixed initialization of interpolation context so it is properly disabled when solving SMT v1 benchmarks. 2015-11-03 12:29:02 +00:00
Christoph M. Wintersteiger 949ad4d2fc Trailing whitespace removed. 2015-11-03 12:28:10 +00:00
Nikolaj Bjorner ac3edbbaaa add line/position information to unsupported command reports per zeph pull request
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-30 19:23:31 -07:00
Christoph M. Wintersteiger cab42d2c66 Clarified documentation of par-or tactic.
Relates to #269.
2015-10-28 18:50:22 +00:00
martin-neuhaeusser 99e4b321bd Fixed typo that accidentally prints warning message if a Z3 context is created with the 'timeout' parameter 2015-10-07 17:27:05 +02:00
Nikolaj Bjorner 9b3e242990 adding rlimit resource limit facility to provide platform and architecture independent method for canceling activities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-09-28 13:37:59 -07:00
Nikolaj Bjorner ef945fbf77 add joinability type checking
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-07-30 15:15:55 -03:00
Christoph M. Wintersteiger 9d31b64273 Enforced well_sorted_check/type_check by default (to match default parameter settings and to produce better error messages).
Fixes #180

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-07-30 09:32:14 +01:00
Nikolaj Bjorner fc3e1af4a9 add dump_models option per suggestion from Pankaj Chauhan
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-07-24 09:45:17 -07:00
Ken McMillan e6516f549d fail gracefully on interpolation errors 2015-07-10 14:39:11 -07:00
Nikolaj Bjorner 4bc044c982 update header guards to be C++ style. Fixes issue #9
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-07-08 23:18:40 -07:00
Nikolaj Bjorner 940fed16e1 enforce stringstream formatting to avoid default format routine. fixes issue #149
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-07-06 09:11:52 -07:00
Nikolaj Bjorner 564da787fb add count of memory allocations and way to limit allocations globally. Fix purification in nlsat_smt to fix regressions on QF_UFNRA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-06-22 07:45:40 +02:00
Alex Horn e6ffa5d2a5 Enable datalog plugin for AST extensions
Signed-off-by: Alex Horn <t-alexh@microsoft.com>
2015-06-10 19:59:57 +01:00
Nikolaj Bjorner 137b8c8e04 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-29 08:55:53 -07:00
Nikolaj Bjorner a2448be0cd print pareto model in check-sat too
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-05-29 08:55:44 -07:00
Christoph M. Wintersteiger f2f6fc1994 Added QF_BVFP logic alias for QF_FPBV 2015-05-29 13:58:23 +01:00
Christoph M. Wintersteiger 8f86542f26 Added QF_ALIA to supported logics.
Fixes #90
2015-05-19 13:38:26 +01:00
Christoph M. Wintersteiger db411eef25 Improved supported logics checks for FPA logics. 2015-05-19 13:35:19 +01:00
Christoph M. Wintersteiger 32fb679066 tabs 2015-05-19 11:01:15 +01:00
Nikolaj Bjorner 9377779e58 merge with unstable
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-30 10:40:03 -07:00
Ken McMillan af444beb2e re-indenting interp and duality 2015-04-15 12:22:50 -07:00
Nikolaj Bjorner 52619b9dbb pull unstable
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-01 14:57:11 -07:00
Nikolaj Bjorner 755a259ea0 fix codeplex issue 188
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-03-11 00:44:56 -07:00
Nikolaj Bjorner b8fbc32689 fix crash in explanation generation. Codeplex issue 181
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-02-24 17:03:34 -08:00
Nikolaj Bjorner 8ea7a1905f reset scope on reset, codeplex issue 183
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-02-22 10:16:38 -08:00
Christoph M. Wintersteiger 71912830f1 Formatting, mostly tabs
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-08 17:54:44 +00:00
Christoph M. Wintersteiger 5e5758bb25 More float -> fpa renaming
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-08 13:37:18 +00:00
Christoph M. Wintersteiger dd17f3c7d6 Renaming floats, float, Floats, Float -> FPA, fpa
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-08 13:18:56 +00:00
Christoph M. Wintersteiger afae49b9ed More renaming QF_FPA -> QF_FP
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2014-12-31 16:15:40 +00:00
Nikolaj Bjorner c61e9f27db local changes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-12-22 09:27:33 -08:00
Nikolaj Bjorner 08cb8b8de8 address divergence in the case of shared theory symbols. Codeplex issue 147, thanks to George Karpenkov
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-12-09 16:04:25 +01:00
Nikolaj Bjorner ce7303b5e2 fix reset logic and load only logics admitted by context
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-11-07 15:44:21 +01:00
Nikolaj Bjorner 23bc982ad2 move initialization to support more sort usage scenarios
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-11-06 16:53:51 +01:00
Nikolaj Bjorner adeae18471 delay initializing internal manager so that parser does not choke on proper SMT-LIB logics. Reported by Venkateshan
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-11-06 13:09:25 +01:00
Ken McMillan 5454e38935 replaced check_interpolants option with interp.check 2014-10-22 10:43:04 -07:00
Nikolaj Bjorner 0e83a2b1af merge with latest unstable
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-22 09:45:04 -07:00
Nikolaj Bjorner 3ecffaa1e5 remove unused and always failing get_param_value function
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-21 11:12:50 -07:00
Nikolaj Bjorner 7767a23626 improve error messages on incorrect parameter passing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-15 21:37:37 -07:00
Nikolaj Bjorner 9d75babcda add more information to error messages
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-15 21:33:29 -07:00
Nikolaj Bjorner ce18421a7a fix box
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-15 14:29:39 -07:00
Nikolaj Bjorner c739d803ab include model/proof/unsat_core as part of model parameters
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-15 13:42:56 -07:00
Nikolaj Bjorner bcd2d935a9 enable modular parameters from the parser
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-09 10:18:46 -07:00
Nikolaj Bjorner e6725b2344 merge unstable into opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-26 12:12:24 -07:00
Nikolaj Bjorner c1580fb85a follow logic annotation/enable diff logic when configured
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-07 11:52:14 -07:00
Nikolaj Bjorner 904ab4bf9e address race condition in cleanup methods
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-05 11:18:34 -07:00
Ken McMillan 9b3ef92813 merge with push/pop fixes 2014-08-26 13:50:51 -07:00
Ken McMillan 51aa10821e fixed pop issue and interpolation proof mode issue 2014-08-26 13:46:53 -07:00
Ken McMillan c007a5e5bd merged with unstable 2014-08-06 11:16:06 -07:00
Nikolaj Bjorner 960e8ea1d5 working on hitting sets
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-08 14:12:54 +01:00
Nikolaj Bjorner 4415df3fcf various fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-02 19:10:20 +05:30
Nikolaj Bjorner 2ca14b49fe fix AV in debug assertion, address warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-16 09:45:32 -07:00
Nikolaj Bjorner 03979fd580 fix up pareto callback mechanism
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-13 12:48:17 -07:00
Nikolaj Bjorner 0181f0f9df add bvmax tactic, add proviso for non-0 lower bounds in elim01
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-23 18:03:20 -07:00
Nikolaj Bjorner fdaeb9bb73 integrate opt with push/pop/check-sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-22 16:15:50 -07:00
Nikolaj Bjorner 88df909a6c merge with unstable
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-20 14:09:18 -07:00
Nikolaj Bjorner b1b349f496 modify offset check to accept linear expressions over numerals. Codeplex issue 81
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-02 17:50:29 -08:00
Nikolaj Bjorner a00a9fbdfd generate error on duplicated data-type accessors. Issue 85
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-02 17:10:48 -08:00
Nikolaj Bjorner c42ee3bb01 Merge branch 'unstable' of https://git01.codeplex.com/z3 into opt 2014-02-11 15:44:12 -08:00
Ken McMillan f45ad4bdc0 disable silly warnings and add needed header for VS 2014-02-10 12:56:39 -08:00
Ken McMillan 19830bcd33 fix a few warnings 2014-01-28 11:43:00 -08:00
Nikolaj Bjorner 23e811d136 merge with unstable
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-05 20:44:56 -08:00
Nikolaj Bjorner faa59ba7f9 debugging multi-objective interface and pb revisions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-02 14:14:44 -08:00
Nikolaj Bjorner 191efbb72f use expression structure for objectives instead of custom s-expression
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-02 13:00:51 -08:00
Nikolaj Bjorner ee0abfbfe9 rename card->pb
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-18 21:25:02 -08:00
Nikolaj Bjorner 9467806a5c debugging cardinality theory
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-05 09:39:28 -08:00
Ken McMillan ac212ec54c fixing interpolation bugs 2013-11-01 11:03:55 -07:00
Nikolaj Bjorner 9fc84f1389 adding timeout, parameters, statistics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-30 13:23:04 -07:00
Ken McMillan 3a0947b3ba merged with unstable 2013-10-18 17:26:41 -07:00
Nikolaj Bjorner 726f66a77c initial opt commands
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-14 17:08:24 -07:00
Nikolaj Bjorner c0895e5548 remove hassel table from unstable: does not compile under other plantforms
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-31 17:48:19 -07:00
Ken McMillan 71275652a7 added simp of interpolants before print 2013-04-15 14:37:08 -07:00
Ken McMillan 6495d7b88c fixed so produce-interpolants option is not needed for compute-interpolant 2013-04-15 12:22:04 -07:00
Ken McMillan e651f45bc0 added sequences to get-interpolant and compute-interpolant 2013-04-09 15:52:30 -07:00
Leonardo de Moura d5a14c0b51 Fix problem reported at http://stackoverflow.com/questions/15882140/z3-smt2-in-get-z3-version/15882868#comment22637420_15882868
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-04-09 08:49:04 -07:00
U-REDMOND\kenmcmil 28266786f3 porting to windows 2013-03-27 12:17:52 -07:00
Ken McMillan 78848f3ddd working on smt2 and api 2013-03-26 17:25:54 -07:00
Leonardo de Moura 97bf9418f7 Add new probes for arithmetic. Check for LIA and LRA (and activate qe if applicable). Modify echo tactic to send results to the regular stream.
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-02-20 13:41:08 -08:00
Leonardo de Moura 3a15db5244 Fix uninterpreted sort definition. There was a mismatch in the behavior of the API and SMT front-ends. The SMT front-ends were using user_sorts to be able to support parametric uninterpreted sorts. After this fix, the API also creates user_sorts.
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-02-12 14:34:31 -08:00
Leonardo de Moura 62c841c320 Change unknown set-logic behavior in SMTLIB2 compliant mode (Thanks to David Cok)
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-02-03 15:41:11 -08:00
Leonardo de Moura 2292761a81 Fix typo (Thanks to David Cok)
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-02-03 14:49:38 -08:00
Leonardo de Moura 8480b27311 Set :print-success to true, when SMTLIB2_COMPLIANT mode is set.
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-02-02 08:58:59 -08:00
Leonardo de Moura c482ede7ff Fix bug introduced last week, and detected in nightly regression tests
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-01-28 09:09:29 -08:00
Leonardo de Moura 7eaa5562d8 Fix http://z3.codeplex.com/workitem/19
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-01-24 12:51:03 -08:00
Leonardo de Moura d92efeb0c5 Make ast_manager::get_family_id(symbol const &) side-effect free. The version with side-effects is now called ast_manager::mk_family_id
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-18 17:14:25 -08:00
Leonardo de Moura 607fab486c Fix incorrect uses of set_cancel()
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-17 18:48:10 -08:00
Leonardo de Moura 8198e62cbd solver factories, cleanup solver API, simplified strategic solver, added combined solver
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-11 17:47:27 -08:00
Leonardo de Moura 7f210d55be fixed warnings on Win64
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-10 07:52:33 -08:00
Leonardo de Moura 9b7946e52d added method for creating ast_manager based on context_params configuration
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-09 14:24:37 -08:00
Leonardo de Moura cba449b75e more parameter issues
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-07 15:16:46 -08:00
Leonardo de Moura ac03c9eff7 chasing parameter setting bug
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-07 08:27:17 -08:00
Leonardo de Moura 9754ccf8a1 fixing problems with the new parameter framework
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-04 11:16:42 -08:00
Leonardo de Moura 6d7d205e13 fixed more problems in the new param framework
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-03 15:02:34 -08:00
Leonardo de Moura d634c945bf renamed validate_model --> model_validate
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-03 13:44:39 -08:00
Leonardo de Moura b219b875b1 fixed bug in using-params combinator in the SMT 2.0 front-end
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-03 09:37:15 -08:00
Leonardo de Moura ffb7e26c75 removed front-end-params
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-02 10:05:29 -08:00
Leonardo de Moura 288a96610f ported VCC trace streams
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-02 09:08:47 -08:00
Leonardo de Moura f15de18c4a context params
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-01 22:53:55 -08:00
Leonardo de Moura 02e763bb6b env params
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-01 20:56:40 -08:00
Leonardo de Moura 92acd6d4ee removed front_end_params from cmd_context
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-01 18:19:02 -08:00
Leonardo de Moura 29cf179364 more reorg
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-01 17:03:14 -08:00
Leonardo de Moura 32791204e7 merged
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2012-12-01 16:36:24 -08:00