mbp (#4741)

* adding dt-solver

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* dt

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* move mbp to self-contained module

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* files

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* Create CMakeLists.txt

* dt

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* rename to bool_var2expr to indicate type class

* mbp

* na

* add projection

* na

* na

* na

* na

* na

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* deps

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* testing arith/q

* na

* newline for model printing

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

src/ast/normal_forms/CMakeLists.txt

@@ -1,6 +1,7 @@
 z3_add_component(normal_forms
   SOURCES
     defined_names.cpp
+    elim_term_ite.cpp
     name_exprs.cpp
     nnf.cpp
     pull_quant.cpp

src/ast/normal_forms/elim_term_ite.cpp

@@ -0,0 +1,40 @@
+/*++
+Copyright (c) 2006 Microsoft Corporation
+
+Module Name:
+
+    elim_term_ite.cpp
+
+Abstract:
+
+    <abstract>
+
+Author:
+
+    Leonardo de Moura (leonardo) 2008-06-12.
+
+Revision History:
+
+--*/
+#include "ast/normal_forms/elim_term_ite.h"
+#include "ast/ast_smt2_pp.h"
+
+br_status elim_term_ite_cfg::reduce_app(func_decl* f, unsigned n, expr * const* args, expr_ref& result, proof_ref& result_pr) {
+    if (!m.is_term_ite(f)) {
+        return BR_FAILED;
+    }
+
+    expr_ref   new_def(m);
+    proof_ref  new_def_pr(m);
+    app_ref   r(m.mk_app(f, n, args), m);
+    app_ref    new_r(m);
+    if (!m_defined_names.mk_name(r, new_def, new_def_pr, new_r, result_pr)) {
+        return BR_FAILED;
+    }
+    result = new_r;
+     
+    CTRACE("elim_term_ite_bug", new_def.get() == 0, tout << mk_ismt2_pp(r, m) << "\n";);
+    m_new_defs.push_back(justified_expr(m, new_def, new_def_pr));
+    return BR_DONE;
+}
+

src/ast/normal_forms/elim_term_ite.h

@@ -0,0 +1,55 @@
+/*++
+Copyright (c) 2006 Microsoft Corporation
+
+Module Name:
+
+    elim_term_ite.h
+
+Abstract:
+
+    <abstract>
+
+Author:
+
+    Leonardo de Moura (leonardo) 2008-06-12.
+
+Revision History:
+
+--*/
+#pragma once
+
+#include "ast/normal_forms/defined_names.h"
+#include "ast/rewriter/rewriter.h"
+#include "ast/justified_expr.h"
+
+class elim_term_ite_cfg : public default_rewriter_cfg {
+    ast_manager&           m;
+    defined_names &        m_defined_names;
+    vector<justified_expr> m_new_defs;
+    unsigned_vector        m_lim;
+public:
+    elim_term_ite_cfg(ast_manager & m, defined_names & d): m(m), m_defined_names(d) { 
+        // TBD enable_ac_support(false);
+    }
+    virtual ~elim_term_ite_cfg() {}
+    vector<justified_expr> const& new_defs() const { return m_new_defs; }
+    br_status reduce_app(func_decl* f, unsigned n, expr *const* args, expr_ref& result, proof_ref& result_pr);
+    void push() { m_lim.push_back(m_new_defs.size()); }
+    void pop(unsigned n) {if (n > 0) { m_new_defs.shrink(m_lim[m_lim.size() - n]); m_lim.shrink(m_lim.size() - n); } }
+};
+
+class elim_term_ite_rw : public rewriter_tpl<elim_term_ite_cfg> {
+    elim_term_ite_cfg m_cfg;
+public:
+    elim_term_ite_rw(ast_manager& m, defined_names & dn):
+        rewriter_tpl<elim_term_ite_cfg>(m, m.proofs_enabled(), m_cfg),
+        m_cfg(m, dn) 
+    {}
+    vector<justified_expr> const& new_defs() const { return m_cfg.new_defs(); }
+    void push() { m_cfg.push(); }
+    void pop(unsigned n) { m_cfg.pop(n); }
+};
+
+
+
+