From ef101190056d5d856cf34135645916f01be6c20e Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Wed, 4 Jan 2023 13:05:45 -0800
Subject: [PATCH] #6429 fixes

---
 src/math/simplex/model_based_opt.cpp  | 4 ++--
 src/sat/sat_solver/sat_smt_solver.cpp | 2 +-
 src/sat/smt/euf_solver.cpp            | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/math/simplex/model_based_opt.cpp b/src/math/simplex/model_based_opt.cpp
index 8df04327dc7..f53ab6f8f45 100644
--- a/src/math/simplex/model_based_opt.cpp
+++ b/src/math/simplex/model_based_opt.cpp
@@ -1510,7 +1510,7 @@ namespace opt {
 
 
         for (unsigned v : vs) {
-            def v_def = project(v, false);
+            def v_def = project(v, compute_def);
             if (compute_def)
                 eliminate(v, v_def);
         }
@@ -1739,7 +1739,7 @@ namespace opt {
         for (unsigned i = 0; i < num_vars; ++i) {
             m_result.push_back(project(vars[i], compute_def));
             eliminate(vars[i], m_result.back());
-            TRACE("opt", display(tout << "After projecting: v" << vars[i] << "\n"););
+            TRACE("opt", display(tout << "After projecting: v" << vars[i] << "\n" << m_result << "\n"););
         }
         return m_result;
     }
diff --git a/src/sat/sat_solver/sat_smt_solver.cpp b/src/sat/sat_solver/sat_smt_solver.cpp
index cc138be9b8d..923594501b5 100644
--- a/src/sat/sat_solver/sat_smt_solver.cpp
+++ b/src/sat/sat_solver/sat_smt_solver.cpp
@@ -179,8 +179,8 @@ class sat_smt_solver : public solver {
         m_preprocess_state(*this),
         m_preprocess(m, p, m_preprocess_state),
         m_trail(m_preprocess_state.m_trail),
-        m_dep(m, m_trail),
         m_solver(p, m.limit()),
+        m_dep(m, m_trail),
         m_assumptions(m), m_core(m), m_ors(m), m_aux_fmls(m), m_internalized_fmls(m),
         m_map(m),
         m_mc(alloc(generic_model_converter, m, "sat-smt-solver")) {
diff --git a/src/sat/smt/euf_solver.cpp b/src/sat/smt/euf_solver.cpp
index 8656083392d..e34a590f805 100644
--- a/src/sat/smt/euf_solver.cpp
+++ b/src/sat/smt/euf_solver.cpp
@@ -48,11 +48,11 @@ namespace euf {
         m_unhandled_functions(m),
         m_to_m(&m),
         m_to_si(&si),
-        m_values(m),
         m_clause_visitor(m),
         m_smt_proof_checker(m, p),
-        m_clause(m),
-        m_expr_args(m)
+        m_clause(m),       
+        m_expr_args(m),
+        m_values(m)
     {
         updt_params(p);
         m_relevancy.set_enabled(get_config().m_relevancy_lvl > 2);