mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-22 16:45:31 +00:00
Code Activity

Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt

Browse source
This commit is contained in:
Nikolaj Bjorner 2018-03-19 15:49:40 -07:00
commit 965da74d01
3 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/test/sat_local_search.cpp
View file

@ -92,16 +92,12 @@ void tst_sat_local_search(char ** argv, int argc, int& i) {
switch (argv[i + 1][1]) {
case 's': // seed
v = atoi(argv[i + 2]);
local_search.config().set_seed(v);
local_search.config().set_random_seed(v);
break;
case 't': // cutoff_time
v = atoi(argv[i + 2]);
cutoff_time = v;
break;
case 'i': // strategy_id
v = atoi(argv[i + 2]);
local_search.config().set_strategy_id(v);
break;
case 'b': // best_known_value
v = atoi(argv[i + 2]);
local_search.config().set_best_known_value(v);

1
src/util/vector.h
View file

@ -73,7 +73,6 @@ class vector {
SZ new_capacity = (3 * old_capacity + 1) >> 1;
SZ new_capacity_T = sizeof(T) * new_capacity + sizeof(SZ) * 2;
if (new_capacity <= old_capacity || new_capacity_T <= old_capacity_T) {
UNREACHABLE();
throw default_exception("Overflow encountered when expanding vector");
}
SZ *mem, *old_mem = reinterpret_cast<SZ*>(m_data) - 2;