mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 01:24:08 +00:00
Code Activity

updates

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-03-25 19:42:06 -07:00
parent c4ff5c7ac7
commit 7063ad81cc
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scripts/vsts-mac.sh Normal file
View file

@ -0,0 +1,18 @@
#!/bin/sh
cd ..
mkdir build
CSC=/usr/bin/csc GACUTIL=/usr/bin/gacutil CXX=clang++ CC=clang python scripts/mk_make.py --java --python
cd build
make
make test-z3
make cpp_example
make c_example
# make java_example
# make python_example
./cpp_example
./test_capi
git clone https://github.com/z3prover/z3test.git z3test
ls
python z3test/scripts/test_benchmarks.py ./z3 ./z3test/regressions/smt2

2
src/opt/opt_solver.h
View file

@ -117,7 +117,7 @@ namespace opt {
void maximize_objectives(expr_ref_vector& blockers); void maximize_objectives(expr_ref_vector& blockers);
inf_eps const & saved_objective_value(unsigned obj_index); inf_eps const & saved_objective_value(unsigned obj_index);
inf_eps current_objective_value(unsigned obj_index); inf_eps current_objective_value(unsigned obj_index);
model* get_model(unsigned obj_index) { return m_models[obj_index]; } model* get_model_idx(unsigned obj_index) { return m_models[obj_index]; }
bool objective_is_model_valid(unsigned obj_index) const { bool objective_is_model_valid(unsigned obj_index) const {
return m_valid_objectives[obj_index]; return m_valid_objectives[obj_index];
} }

2
src/opt/optsmt.cpp
View file

@ -46,7 +46,7 @@ namespace opt {
for (unsigned i = 0; i < src.size(); ++i) { for (unsigned i = 0; i < src.size(); ++i) {
if (src[i] >= dst[i]) { if (src[i] >= dst[i]) {
dst[i] = src[i]; dst[i] = src[i];
m_models.set(i, m_s->get_model(i)); m_models.set(i, m_s->get_model_idx(i));
m_s->get_labels(m_labels); m_s->get_labels(m_labels);
m_lower_fmls[i] = fmls[i].get(); m_lower_fmls[i] = fmls[i].get();
if (dst[i].is_pos() && !dst[i].is_finite()) { // review: likely done already. if (dst[i].is_pos() && !dst[i].is_finite()) { // review: likely done already.