3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-09 10:51:50 +00:00
Commit graph

7286 commits

Author SHA1 Message Date
Nikolaj Bjorner b482dbd589 merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-27 17:02:27 -07:00
Nikolaj Bjorner fe1a07a8ee merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-27 16:17:56 -07:00
Nikolaj Bjorner c8fe91d8c5 add handling for nested terms
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-24 16:12:46 -07:00
Nikolaj Bjorner 30b0d5ba13 Merge branch 'master' of https://github.com/z3prover/z3 2017-07-24 10:49:54 -07:00
Lev Nachmanson bd4fb22665 track the set of integer variables that are not set to integer values
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-21 21:09:51 -07:00
Christoph M. Wintersteiger 0f1583309d Bugfix for fp.fma. One piece of puzzle #872. 2017-07-21 21:12:45 +01:00
Christoph M. Wintersteiger faa19117e4 Fixed inconsistent state upon solver interruption. Partially fixes #951. 2017-07-21 17:42:48 +01:00
Lev Nachmanson 64e542bd70 fix term indices for the time being when exiting from check()
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-20 19:13:13 -07:00
Lev Nachmanson 04824e7372 add a check in gomory cut
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-20 18:12:16 -07:00
Christoph M. Wintersteiger 943dc8118a Improved collect-statistics tactic 2017-07-20 13:44:47 +01:00
Lev Nachmanson 1490b7a15f a cleaner version of subs_term_columns
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-19 22:14:05 -07:00
Lev Nachmanson 4d1b0d8026 gomory cut worked on a toy example
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-19 16:50:23 -07:00
Lev Nachmanson 94b3fee6ac rename a function
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-17 16:41:02 -07:00
Lev Nachmanson 729644a2b6 fix term_is_int
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-17 16:08:20 -07:00
Lev Nachmanson 77171f4af8 the first version of Gomory cut, probably broken
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-17 15:17:46 -07:00
Christoph M. Wintersteiger da34de340d Fixed bug in sat model converter. Fixes #1148. 2017-07-15 20:25:13 +01:00
Nikolaj Bjorner 8a57e081f7 Merge pull request #1138 from delcypher/cmake_serious_warnings
Support serious warnings in CMake and TravisCI
2017-07-14 11:14:35 +02:00
Lev Nachmanson 1931adcb74 add a file
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-13 09:48:29 -07:00
Lev Nachmanson 8750da1da7 progress in gomory cut
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-12 16:43:10 -07:00
Christoph M. Wintersteiger 680f342247 Merge pull request #1145 from delcypher/fix_doc_typo
Fix minor typo in C API documentation
2017-07-12 15:47:44 +01:00
Christoph M. Wintersteiger baedf41c6c Merge pull request #1144 from delcypher/fix_parse_bvsmod_i
Fix typo that prevented uses of `bvsmod_i` being parsed.
2017-07-12 15:47:24 +01:00
Dan Liew 5b511f12b3 Fix minor typo in C API documentation 2017-07-12 13:07:19 +01:00
Dan Liew 89c8f1722f Fix typo that prevented uses of bvsmod_i being parsed. 2017-07-12 12:53:10 +01:00
Lev Nachmanson 2056404ed4 branch on a free variable before trying Gomory cuts
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-11 16:44:04 -07:00
Lev Nachmanson bac16bac85 start gomory cut
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-11 13:46:46 -07:00
Lev Nachmanson fc6a876845 start gomory cut
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-11 13:38:59 -07:00
Christoph M. Wintersteiger bf83b897a1 Merge pull request #1142 from jfeser/master
Add get_num_scopes to python solver api.
2017-07-11 21:29:50 +01:00
Jack Feser 0e45777104 add get_num_scopes to python solver api 2017-07-11 14:42:34 -04:00
Lev Nachmanson 69d6b022b8 speed up in get_model and fix in git_model_do_not_care_...
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-10 22:14:56 -07:00
Lev Nachmanson 2fe846d9fc fix a bug in the lar_solver::m_status update during push/pop
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-10 16:34:23 -07:00
Lev Nachmanson 581098299b change the order of initializations in the constructor of imp in theory_lra
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-10 12:04:58 -07:00
Lev Nachmanson 9dc7ba73eb use a faster version of get_model in debug checks
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-10 11:57:33 -07:00
Lev Nachmanson 86ed01a63b replace clp to clean
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-10 11:30:08 -07:00
Lev Nachmanson cc32e45471 replace lean to lp
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-10 11:06:37 -07:00
Dan Liew 630863619b [TravisCI] Add Z3_WARNINGS_AS_ERRORS environment variable to
control the `WARNINGS_AS_ERRORS` CMake option.
2017-07-09 14:44:20 +01:00
Dan Liew 6e2ca69654 [CMake] Change the WARNINGS_AS_ERRORS option from BOOL to STRING
to allow a new mode `SERIOUS_ONLY`.

Modes:

`ON` - All warnings are treated as errors (same as before)
`OFF` - Warnings are not treated as errors (same as before)
`SERIOUS_ONLY` - A subset of "serious" warnings are treated as errors.

Upgrade code is included to upgrade old CMake cache's to use the new
type of `WARNINGS_AS_ERRORS`. We should remove it eventually. The
user's previous setting is preserved when doing this.

Very few warnings are treated as errors for now. Developers can
add more later as they see fit.
2017-07-09 14:34:30 +01:00
Nikolaj Bjorner 2b0106c199 doc fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-09 11:26:27 +02:00
Nikolaj Bjorner 2af08a378d avoid complaining about division by 0 as unhandled in theory-lra
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-08 18:21:47 -07:00
Nikolaj Bjorner 5714f830b0 fix check for finite sorts #1122
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-08 13:37:24 -07:00
Lev Nachmanson f6a75600c2 solve all smt2 from QF_LIA/calypto with int_solver
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
2017-07-07 22:15:47 -07:00
Nikolaj Bjorner 55f54b4fdc fixing overflow checking
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-07 13:53:26 -07:00
Lev Nachmanson 3abc793876 solve more integer smt problems 2017-07-07 11:47:52 -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 98391883ca Merge branch 'master' of https://github.com/z3prover/z3 2017-07-07 07:45:00 -07:00
Nikolaj Bjorner 49cf3f8008 update documentation according to #1058
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-07 07:44:55 -07:00
Christoph M. Wintersteiger 4b895abec7 Merge pull request #1136 from danpere/guard-cf
Add flag to mk_make.py to optionally enable Control Flow Guard
2017-07-07 11:48:52 +01:00
Nikolaj Bjorner 53c38f02d5 n/a
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-06 22:12:18 -07:00
Lev Nachmanson 2cd81851e7 solve more ilp smt
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2017-07-06 21:29:09 -07:00
Lev Nachmanson 7cd6dc1b5a Merge branch 'master' of https://github.com/levnach/z3 2017-07-06 20:47:19 -07:00