mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-14 21:08:46 +00:00
Code Activity

fix #4637

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-08-23 10:05:17 -07:00
parent 666e835e08
commit 84475ff142
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/api/c++/z3++.h
View file

@ -2864,7 +2864,10 @@ namespace z3 {
assert(e.is_bool()); assert(e.is_bool());
Z3_optimize_assert_and_track(ctx(), m_opt, e, t); Z3_optimize_assert_and_track(ctx(), m_opt, e, t);
} }
void add(expr const& e, char const* p) {
assert(e.is_bool());
add(e, ctx().bool_const(p));
}
handle add_soft(expr const& e, unsigned weight) { handle add_soft(expr const& e, unsigned weight) {
assert(e.is_bool()); assert(e.is_bool());
auto str = std::to_string(weight); auto str = std::to_string(weight);

23
src/smt/user_propagator.h
View file

@ -9,7 +9,7 @@ Abstract:
User-propagator plugin. User-propagator plugin.
Adds user plugins to propagate based on Adds user plugins to propagate based on
terms receiving fixed values. terms receiving fixed values or equalities.
Author: Author:
@ -17,8 +17,6 @@ Author:
Notes: Notes:
- could also be complemented with disequalities to fixed values to narrow range of variables.
--*/ --*/
@ -49,16 +47,15 @@ namespace smt {
void reset() { memset(this, 0, sizeof(*this)); } void reset() { memset(this, 0, sizeof(*this)); }
}; };
void* m_user_context; void* m_user_context;
solver::push_eh_t m_push_eh; solver::push_eh_t m_push_eh;
solver::pop_eh_t m_pop_eh; solver::pop_eh_t m_pop_eh;
solver::fresh_eh_t m_fresh_eh; solver::fresh_eh_t m_fresh_eh;
solver::final_eh_t m_final_eh; solver::final_eh_t m_final_eh;
solver::fixed_eh_t m_fixed_eh; solver::fixed_eh_t m_fixed_eh;
solver::eq_eh_t m_eq_eh; solver::eq_eh_t m_eq_eh;
solver::eq_eh_t m_diseq_eh; solver::eq_eh_t m_diseq_eh;
solver::context_obj* m_api_context { nullptr }; solver::context_obj* m_api_context { nullptr };
unsigned m_qhead { 0 }; unsigned m_qhead { 0 };
vector<prop_info> m_prop; vector<prop_info> m_prop;
unsigned_vector m_prop_lim; unsigned_vector m_prop_lim;
@ -78,7 +75,7 @@ namespace smt {
* \brief initial setup for user propagator. * \brief initial setup for user propagator.
*/ */
void add( void add(
void* ctx, void* ctx,
solver::push_eh_t& push_eh, solver::push_eh_t& push_eh,
solver::pop_eh_t& pop_eh, solver::pop_eh_t& pop_eh,
solver::fresh_eh_t& fresh_eh) { solver::fresh_eh_t& fresh_eh) {