Skip to content

Commit

Permalink
na
Browse files Browse the repository at this point in the history
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
  • Loading branch information
NikolajBjorner committed Aug 24, 2020
1 parent 6beec7b commit e46ad45
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/math/lp/lp_bound_propagator.h
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ class lp_bound_propagator {
void try_add_equation_with_lp_fixed_tables(const vertex *v) {
SASSERT(m_fixed_vertex);
unsigned v_j = v->column();
unsigned j;
unsigned j = null_lpvar;
if (!lp().find_in_fixed_tables(val(v_j), is_int(v_j), j))
return;
TRACE("cheap_eq", tout << "found j=" << j << " for v=";
Expand Down
7 changes: 4 additions & 3 deletions src/smt/smt_quantifier.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,9 @@ namespace smt {
}

void log_causality(
fingerprint* f,
app * pat,
vector<std::tuple<enode *, enode *>> & used_enodes) {
fingerprint* f,
app * pat,
vector<std::tuple<enode *, enode *>> & used_enodes) {

if (pat != nullptr) {
if (used_enodes.size() > 0) {
Expand All @@ -219,6 +219,7 @@ namespace smt {
for (auto n : used_enodes) {
enode *orig = std::get<0>(n);
enode *substituted = std::get<1>(n);
(void) substituted;
if (orig == nullptr) {
STRACE("causality", tout << " #" << substituted->get_owner_id(););
}
Expand Down
1 change: 0 additions & 1 deletion src/smt/theory_bv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,6 @@ namespace smt {
bool_var watch_var = null_bool_var;
it1 = bits1.begin();
it2 = bits2.begin();
unsigned h = hash_u_u(v1, v2);
unsigned act = m_diseq_activity[hash_u_u(v1, v2) & 0xFF]++;

for (; it1 != end1 && ((act & 0x3) != 0x3); ++it1, ++it2) {
Expand Down
5 changes: 3 additions & 2 deletions src/test/egraph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Copyright (c) 2020 Microsoft Corporation
--*/

#include "util/util.h"
#include "util/timer.h"
#include "ast/euf/euf_egraph.h"
#include "ast/reg_decl_plugins.h"
Expand All @@ -15,13 +16,13 @@ static expr_ref mk_const(ast_manager& m, char const* name, sort* s) {
static expr_ref mk_app(char const* name, expr_ref const& arg, sort* s) {
ast_manager& m = arg.m();
func_decl_ref f(m.mk_func_decl(symbol(name), m.get_sort(arg), s), m);
return expr_ref(m.mk_app(f, arg), m);
return expr_ref(m.mk_app(f, arg.get()), m);
}

static expr_ref mk_app(char const* name, expr_ref const& arg1, expr_ref const& arg2, sort* s) {
ast_manager& m = arg1.m();
func_decl_ref f(m.mk_func_decl(symbol(name), m.get_sort(arg1), m.get_sort(arg2), s), m);
return expr_ref(m.mk_app(f, arg1, arg2), m);
return expr_ref(m.mk_app(f, arg1.get(), arg2.get()), m);
}

static void test1() {
Expand Down

0 comments on commit e46ad45

Please sign in to comment.