mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-09-02 16:20:41 +00:00
Code Activity
7324 commits 65 branches 52 tags 179 MiB
Commit graph

404 commits

Author SHA1 Message Date
Nikolaj Bjorner
d1a227493a n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-19 08:31:31 -07:00
Nikolaj Bjorner
b1090f4399 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-31 09:49:11 -07:00
Nikolaj Bjorner
1946441e17 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-07-27 18:42:16 -07:00
Nikolaj Bjorner
b482dbd589 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-27 17:02:27 -07:00
Nikolaj Bjorner
30b0d5ba13 Merge branch 'master' of https://github.com/z3prover/z3 2017-07-24 10:49:54 -07:00
Nikolaj Bjorner
8c67e958ff n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-16 18:51:01 +02:00
Christoph M. Wintersteiger
da34de340d Fixed bug in sat model converter. Fixes #1148. 2017-07-15 20:25:13 +01:00
Nikolaj Bjorner
55f54b4fdc fixing overflow checking 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-07 13:53:26 -07:00
Nikolaj Bjorner
53c38f02d5 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-06 22:12:18 -07:00
Nikolaj Bjorner
da263601e6 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-05 19:19:36 -07:00
Nikolaj Bjorner
b419a0e4a4 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-05 14:32:13 -07:00
Nikolaj Bjorner
5262248823 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-04 11:13:05 -07:00
Nikolaj Bjorner
4132c44f8d update to avoid difference in debug/release builds 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-02 16:24:59 -07:00
Nikolaj Bjorner
480296ed96 updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-02 11:27:02 -07:00
Nikolaj Bjorner
9b631f982b n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-30 17:48:04 -07:00
Nikolaj Bjorner
bcf0ee7709 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-29 18:53:58 -07:00
Nikolaj Bjorner
7580644d15 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-29 08:11:27 -07:00
Nikolaj Bjorner
085c18a92a add pb to local search 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 20:29:13 -07:00
Nikolaj Bjorner
5c83dfee06 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 18:04:08 -07:00
Nikolaj Bjorner
e176c4ba9a rename to ba_solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 17:54:16 -07:00
Nikolaj Bjorner
6fad478a18 reorg 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 17:46:29 -07:00
Nikolaj Bjorner
a28a8304b7 Dev (#56) 
* introduce int_solver.h

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

* add int_solver class

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

* track which var is an integer

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

* add queries for integrality of vars

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

* resurrect lp_tst in its own director lp

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

* add file

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

* add_constraint has got a body

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

* fix add_constraint and substitute_terms_in_linear_expression

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

* after merge with Z3Prover

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

* adding stub check_int_feasibility()

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

* Dev (#50)

* initial skeletons for nra solver

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

* initial skeletons for nra solver

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

* small fix in lar_solver.cpp

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

* adding some content to the new check_int_feasibility()

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

* Dev (#51)

* initial skeletons for nra solver

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

* initial skeletons for nra solver

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

* adding more nlsat

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

* nlsat integration

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

* adding constraints

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

* adding nra solver

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

* add missing initialization

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

* adding nra solver

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

* test

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

* Dev (#53)

* change in a comment

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

* Disabled debug output

* removing FOCI2 interface from interp

* remove foci reference from cmakelist.txt

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

* initial skeletons for nra solver

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

* initial skeletons for nra solver

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

* adding more nlsat

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

* nlsat integration

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

* adding constraints

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

* adding nra solver

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

* add missing initialization

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

* adding nra solver

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

* adding nra

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

* debugging nra

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

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

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

* n/a

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

* integrate nlsat

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

* tidy

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

* preserve is_int flag

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

* remove a debug printout

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

* Dev (#54)

* change in a comment

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

* Disabled debug output

* removing FOCI2 interface from interp

* remove foci reference from cmakelist.txt

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

* initial skeletons for nra solver

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

* initial skeletons for nra solver

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

* adding more nlsat

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

* nlsat integration

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

* adding constraints

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

* adding nra solver

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

* add missing initialization

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

* adding nra solver

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

* adding nra

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

* debugging nra

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

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

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

* n/a

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

* integrate nlsat

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

* tidy

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

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

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

* fix equality check in assume-eq

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

* fix model_is_int_feasible

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

* untested gcd_test()

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

* call fill_explanation_from_fixed_columns()

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

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

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

* port more of theory_arith_int.h

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

* use statistics of lar_solver by theory_lra.cpp

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

* port more code to int_solver.cpp

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

* add an assert

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

* more int porting

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

* fix a bug in pivot_fixed_vars_from_basis

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

* small change

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

* implement find_inf_int_base_column()

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

* catch unregistered vars in add_var_bound

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

* add a file

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

* compile for vs2012

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

* fix asserts in add_var_bound

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

* fix the lp_solver init when workig on an mps file

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

* towards int_solver::check()

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

* change in int_solver::check() signature

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

* add handlers for lia moves

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

* spacing

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-28 13:12:12 -07:00
Nikolaj Bjorner
6f4c873b29 debugging 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-27 13:18:20 -07:00
Nikolaj Bjorner
94416bea52 fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-27 09:07:55 -07:00
Nikolaj Bjorner
66f0de6785 added in-processing features to card/pb 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-25 16:26:47 -07:00
Nikolaj Bjorner
c3d29e75ef adding in-processing 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-24 18:27:32 -07:00
Nikolaj Bjorner
fb84ba8c34 updates and fixes to copying and cardinalities 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-23 14:00:33 -07:00
Nikolaj Bjorner
5752830f71 bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-22 15:01:12 -07:00
Nikolaj Bjorner
9ebe980b44 cleaning up lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-22 07:42:44 -07:00
Nikolaj Bjorner
5e2f7f7177 fixes top lookahead simplification 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-21 20:22:31 -07:00
Dan Liew
229fd3dc3e [CMake] Fix dependencies for generating install_tactic.cpp. 
Previously CMake was not aware of which headers files the generation
of `install_tactic.cpp` depended on. Consequently this could result
in broken incremental builds if

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

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

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

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

This partially fixes #1030.
 2017-06-21 23:03:48 +01:00
Nikolaj Bjorner
5f93b9a081 add N-ary clause reward heuristic based on discussions with Heule 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-21 10:30:30 -07:00
Nikolaj Bjorner
c6fbe38f78 disable anti-exploration by default 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-19 23:56:50 -05:00
Nikolaj Bjorner
ce592d7716 add facility to add lemmas 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-12 19:44:02 -07:00
Dan Liew
4b517b96df [CMake] Move CMake files into their intended location so the 
`contrib/cmake/bootstrap.py` script no longer needs to be executed.

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

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

This commit only does the file moving and necessary changes to
`.gitignore`. Other changes will be done in subsequent commits.
 2017-06-12 11:59:00 +01:00
Nikolaj Bjorner
af6ebbcd92 init search before returning 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-11 13:08:05 -07:00
Nikolaj Bjorner
bc54197fb3 64 bit clause offset fix 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-10 10:46:51 -07:00
Nikolaj Bjorner
8acb37e734 revert change to 1065 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-10 09:45:18 -07:00
Nikolaj Bjorner
b8e8e090ad filter assumptions by membership in initial list #1065 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-10 09:30:01 -07:00
Nikolaj Bjorner
a55416351f lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-09 09:17:20 -07:00
Nikolaj Bjorner
c870b77366 fixes to lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-08 17:25:06 -07:00
Nikolaj Bjorner
964102726d lookahead on cardinality extension 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-07 18:24:58 -07:00
Nikolaj Bjorner
f3b0ede6e8 update lookahead to include extensions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-07 16:35:35 -07:00
Nikolaj Bjorner
c33dce1161 extract lemmas 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-04 14:12:55 -07:00
Nikolaj Bjorner
71b6f97fb1 fix lookahead code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-04 11:55:53 -07:00
Nikolaj Bjorner
19d4b0a97a resolve conflicts 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-02 10:38:37 -07:00
Nikolaj Bjorner
3ce82ea8ce merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-02 10:37:22 -07:00
Nikolaj Bjorner
efd5727676 add shorthand for enumerating constants in a model 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-02 10:35:09 -07:00
Nikolaj Bjorner
e37a6dd809 add tracking for reason unknown 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-01 17:04:37 -07:00
Nikolaj Bjorner
55ba1e9178 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-06-01 14:50:37 -07:00