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/ast.cpp

@@ -1794,6 +1794,7 @@ static void track_id(ast_manager& m, ast* n, unsigned id) {
     if (n->get_id() != id) return;
     ++s_count;
     TRACE("ast", tout << s_count << "\n";);
+//    SASSERT(s_count != 5);
 }
 #endif
 
@@ -1827,7 +1828,7 @@ ast * ast_manager::register_node_core(ast * n) {
 
     n->m_id = is_decl(n) ? m_decl_id_gen.mk() : m_expr_id_gen.mk();
 
-//  track_id(*this, n, 3);
+//    track_id(*this, n, 77);
     
 //    TRACE("ast", tout << (s_count++) << " Object " << n->m_id << " was created.\n";);
     TRACE("mk_var_bug", tout << "mk_ast: " << n->m_id << "\n";);
@@ -1912,10 +1913,10 @@ ast * ast_manager::register_node_core(ast * n) {
     default:
         break;
     }
-
     return n;
 }
 
+
 void ast_manager::delete_node(ast * n) {
     TRACE("delete_node_bug", tout << mk_ll_pp(n, *this) << "\n";);
 

src/ast/ast.h

@@ -1680,9 +1680,8 @@ public:
     void debug_ref_count() { m_debug_ref_count = true; }
 
     void inc_ref(ast* n) {
-        if (n) {
+        if (n) 
             n->inc_ref();
-        }
     }
     
     void dec_ref(ast* n) {

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); }
+};
+
+
+
+

src/ast/rewriter/expr_safe_replace.cpp

@@ -33,7 +33,7 @@ void expr_safe_replace::insert(expr* src, expr* dst) {
 void expr_safe_replace::operator()(expr_ref_vector& es) {
     expr_ref val(m);
     for (unsigned i = 0; i < es.size(); ++i) {
-        (*this)(es[i].get(), val);
+        (*this)(es.get(i), val);
         es[i] = val;
     }
 }

src/ast/rewriter/pb2bv_rewriter.cpp

@@ -17,16 +17,19 @@ Notes:
 
 --*/
 
-#include "ast/rewriter/rewriter.h"
-#include "ast/rewriter/rewriter_def.h"
 #include "util/statistics.h"
-#include "ast/rewriter/pb2bv_rewriter.h"
-#include "util/sorting_network.h"
-#include "ast/ast_util.h"
-#include "ast/ast_pp.h"
 #include "util/lbool.h"
 #include "util/uint_set.h"
 #include "util/gparams.h"
+#include "util/debug.h"
+
+#include "ast/rewriter/rewriter.h"
+#include "ast/rewriter/rewriter_def.h"
+#include "ast/rewriter/pb2bv_rewriter.h"
+#include "ast/ast_util.h"
+#include "ast/ast_pp.h"
+#include "util/sorting_network.h"
+
 
 static const unsigned g_primes[7] = { 2, 3, 5, 7, 11, 13, 17};
 
@@ -90,7 +93,7 @@ struct pb2bv_rewriter::imp {
         void sort_args() {
             vector<ca> cas;
             for (unsigned i = 0; i < m_args.size(); ++i) {
-                cas.push_back(std::make_pair(m_coeffs[i], expr_ref(m_args[i].get(), m)));
+                cas.push_back(std::make_pair(m_coeffs[i], expr_ref(m_args.get(i), m)));
             }
             std::sort(cas.begin(), cas.end(), compare_coeffs());
             m_coeffs.reset();
@@ -101,6 +104,38 @@ struct pb2bv_rewriter::imp {
             }
         }
 
+        template <lbool is_le>
+        void gcd_reduce(vector<rational>& coeffs, rational & k) {
+            rational g(0);
+            for (rational const& c : coeffs) {
+                if (!c.is_int())
+                    return;
+                g = gcd(g, c);
+                if (g.is_one())
+                    return;
+            }
+            switch (is_le) {
+            case l_undef:
+                if (!k.is_int())
+                    return;
+                g = gcd(k, g);
+                if (g.is_one() || g.is_zero())
+                    return;
+                k /= g;
+                break;
+            case l_true:
+                k /= g;
+                k = floor(k);
+                break;
+            case l_false:
+                k /= g;
+                k = ceil(k);
+                break;
+            }      
+            for (rational& c : coeffs)
+                c /= g;
+        }
+        
         // 
         // create a circuit of size sz*log(k) 
         // by forming a binary tree adding pairs of values that are assumed <= k, 
@@ -114,8 +149,10 @@ struct pb2bv_rewriter::imp {
         // is_le = l_false -  >= 
         //
         template<lbool is_le>
-        expr_ref mk_le_ge(rational const & k) {
+        expr_ref mk_le_ge(rational const & _k) {
+            rational k(_k);
             //sort_args();
+            gcd_reduce<is_le>(m_coeffs, k);
             unsigned sz = m_args.size();
             expr * const* args = m_args.c_ptr();
             TRACE("pb",