some fixes

src/math/polysat/conflict_core.cpp

@@ -149,6 +149,7 @@ namespace polysat {
             if (c->contains_var(v))
                 unset_mark(c);
         }
+        m_vars.remove(v);
     }
 
     void conflict_core::set_bailout() {
@@ -366,6 +367,10 @@ namespace polysat {
         return m_bvar2mark.get(b, false);
     }
 
+    bool conflict_core::contains_literal(sat::literal lit) const {
+        return m_literals.contains(lit.to_uint());
+    }
+
     void conflict_core::insert_literal(sat::literal lit) {
         m_literals.insert(lit.to_uint());
     }

src/math/polysat/conflict_core.h

@@ -45,6 +45,7 @@ namespace polysat {
         void set_mark(signed_constraint c);
         void unset_mark(signed_constraint c);
 
+        bool contains_literal(sat::literal lit) const;
         void insert_literal(sat::literal lit);
         void remove_literal(sat::literal lit);
 

src/math/polysat/search_state.cpp

@@ -19,9 +19,9 @@ namespace polysat {
     std::ostream& search_item::display(std::ostream& out) const {
         switch (kind()) {
         case search_item_k::assignment:
-            return out << "assignment(v" << var() << ")";
+            return out << "v" << var() << "=?";
         case search_item_k::boolean:
-            return out << "boolean(" << lit() << ")";
+            return out << lit();
         }
         UNREACHABLE();
         return out;

src/math/polysat/solver.cpp

@@ -210,14 +210,14 @@ namespace polysat {
     }
 
     void solver::propagate(sat::literal lit) {
-        LOG_H2("Propagate boolean literal " << lit);
+        LOG_H2("Propagate bool " << lit);
         signed_constraint c = m_constraints.lookup(lit);
         SASSERT(c);
         activate_constraint(c);
     }
 
     void solver::propagate(pvar v) {
-        LOG_H2("Propagate pvar " << v);
+        LOG_H2("Propagate v" << v);
         auto& wlist = m_watch[v];
         unsigned i = 0, j = 0, sz = wlist.size();
         for (; i < sz && !is_conflict(); ++i) 

src/math/polysat/ule_constraint.cpp

@@ -50,14 +50,13 @@ namespace polysat {
         // p <= 0, e.g., p == 0
         if (q.is_zero() && p.is_unilinear()) {
             // a*x + b == 0
-            pvar v = q.var();
+            pvar v = p.var();
             s.push_cjust(v, { this, is_positive });
 
-            rational a = q.hi().val();
-            rational b = q.lo().val();
+            rational a = p.hi().val();
+            rational b = p.lo().val();
             s.m_viable.intersect_eq(a, v, b, is_positive);
 
-
             rational val;
             if (s.m_viable.find_viable(v, val) == dd::find_t::singleton)
                 s.propagate(v, val, { this, is_positive });