mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 09:35:32 +00:00
Code Activity

Merge branch 'master' of https://github.com/Z3Prover/z3 into csp

Browse source
This commit is contained in:
Nikolaj Bjorner 2018-10-21 12:26:53 -07:00
commit ccca063e54
254 changed files with 1194 additions and 1753 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/solver/combined_solver.cpp
View file

@ -39,7 +39,7 @@ Notes:
The object switches to incremental when:
- push is used
- assertions are peformed after a check_sat
- assertions are performed after a check_sat
- parameter ignore_solver1==false
*/
class combined_solver : public solver {

2
src/solver/parallel_params.pyg
View file

@ -9,7 +9,7 @@ def_module_params('parallel',
('conquer.restart.max', UINT, 5, 'maximal number of restarts during conquer phase'),
('conquer.delay', UINT, 10, 'delay of cubes until applying conquer'),
('conquer.backtrack_frequency', UINT, 10, 'frequency to apply core minimization during conquer'),
('simplify.exp', DOUBLE, 1, 'restart and inprocess max is multipled by simplify.exp ^ depth'),
('simplify.exp', DOUBLE, 1, 'restart and inprocess max is multiplied by simplify.exp ^ depth'),
('simplify.restart.max', UINT, 5000, 'maximal number of restarts during simplification phase'),
('simplify.inprocess.max', UINT, 2, 'maximal number of inprocessing steps during simplification'),
))