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

scripts/vsts.cmd

@@ -0,0 +1,26 @@
+rem Build
+md build
+cd build
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+cmake -DBUILD_DOTNET_BINDINGS=True -DBUILD_JAVA_BINDINGS=True -DBUILD_PYTHON_BINDINGS=True -G "NMake Makefiles" ../
+nmake
+
+rem test python bindings
+pushd python
+python z3test.py z3
+python z3test.py z3num
+popd
+
+rem Build and run examples
+
+
+
+rem Build and run unit tests
+nmake test-z3
+rem test-z3.exe -a
+
+
+cd ..
+rem Run regression tests
+rem git pull https://github.com/z3prover/z3test z3test
+rem cd z3test

src/test/sat_local_search.cpp

@@ -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);

src/util/vector.h

@@ -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;