diff --git a/src/backward.cpp b/src/backward.cpp index 7ddf7e3..de288fe 100644 --- a/src/backward.cpp +++ b/src/backward.cpp @@ -44,7 +44,7 @@ void Common::fill_assumptions_backward( uint32_t indic = var_to_indic[var]; assert(indic != var_Undef); - assumptions.push_back(Lit(indic, true)); + assumptions.push_back(Lit(indic, false)); if (conf.verb > 5) { cout << "Filled assump with indep: " << var << endl; } @@ -66,7 +66,7 @@ void Common::fill_assumptions_backward( assert(var < orig_num_vars); uint32_t indic = var_to_indic[var]; assert(indic != var_Undef); - assumptions.push_back(Lit(indic, true)); + assumptions.push_back(Lit(indic, false)); } unknown.resize(j); if (conf.verb > 5) { diff --git a/src/common.cpp b/src/common.cpp index 54f7e14..09fce11 100644 --- a/src/common.cpp +++ b/src/common.cpp @@ -104,12 +104,8 @@ void Common::add_fixed_clauses() indic_to_var.resize(solver->nVars(), var_Undef); //Indicator variable is TRUE when they are NOT equal + vector tmp; for(uint32_t var: *sampling_set) { - //(a=b) = !f - //a V -b V f - //-a V b V f - //a V b V -f - //-a V -b V -f solver->new_var(); uint32_t this_indic = solver->nVars()-1; //torem_orig.push_back(Lit(this_indic, false)); @@ -121,24 +117,12 @@ void Common::add_fixed_clauses() tmp.clear(); tmp.push_back(Lit(var, false)); tmp.push_back(Lit(var+orig_num_vars, true)); - tmp.push_back(Lit(this_indic, false)); - solver->add_clause(tmp); - - tmp.clear(); - tmp.push_back(Lit(var, true)); - tmp.push_back(Lit(var+orig_num_vars, false)); - tmp.push_back(Lit(this_indic, false)); - solver->add_clause(tmp); - - tmp.clear(); - tmp.push_back(Lit(var, false)); - tmp.push_back(Lit(var+orig_num_vars, false)); tmp.push_back(Lit(this_indic, true)); solver->add_clause(tmp); tmp.clear(); tmp.push_back(Lit(var, true)); - tmp.push_back(Lit(var+orig_num_vars, true)); + tmp.push_back(Lit(var+orig_num_vars, false)); tmp.push_back(Lit(this_indic, true)); solver->add_clause(tmp); } diff --git a/src/common.h b/src/common.h index 8470bcc..ffded4b 100644 --- a/src/common.h +++ b/src/common.h @@ -78,7 +78,6 @@ struct Common vector* sampling_set = NULL; vector empty_occs; - vector tmp; vector seen; uint32_t orig_num_vars = std::numeric_limits::max(); uint32_t total_eq_removed = 0;