implementing model updates

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

src/muz/base/dl_util.cpp

@@ -384,6 +384,7 @@ namespace datalog {
             return alloc(skip_model_converter);
         }
 
+        virtual void display(std::ostream & out) { }
     };
 
     model_converter* mk_skip_model_converter() { return alloc(skip_model_converter); }
@@ -398,6 +399,7 @@ namespace datalog {
             return alloc(skip_proof_converter);
         }
 
+        virtual void display(std::ostream & out) { out << "(skip-proof-converter)\n"; }
     };
 
     proof_converter* mk_skip_proof_converter() { return alloc(skip_proof_converter); }
@@ -508,10 +510,9 @@ namespace datalog {
     }
 
     void collect_and_transform(const unsigned_vector & src, const unsigned_vector & translation, 
-            unsigned_vector & res) {
-        unsigned n = src.size();
-        for(unsigned i=0; i<n; i++) {
-            unsigned translated = translation[src[i]];
+                               unsigned_vector & res) {
+        for (unsigned s : src) {
+            unsigned translated = translation[s];
             if(translated!=UINT_MAX) {
                 res.push_back(translated);
             }
@@ -520,10 +521,8 @@ namespace datalog {
 
 
     void transform_set(const unsigned_vector & map, const idx_set & src, idx_set & result) {
-        idx_set::iterator it = src.begin();
-        idx_set::iterator end = src.end();
-        for(; it!=end; ++it) {
-            result.insert(map[*it]);
+        for (unsigned s : src) {
+            result.insert(map[s]);
         }
     }
 

src/muz/spacer/spacer_itp_solver.h

@@ -146,7 +146,7 @@ public:
     virtual void collect_statistics(statistics &st) const ;
     virtual void reset_statistics();
     virtual void get_unsat_core(ptr_vector<expr> &r);
-    virtual void get_model(model_ref &m) {m_solver.get_model(m);}
+    virtual void get_model_core(model_ref &m) {m_solver.get_model(m);}
     virtual proof *get_proof() {return m_solver.get_proof();}
     virtual std::string reason_unknown() const
     {return m_solver.reason_unknown();}

src/muz/spacer/spacer_virtual_solver.h

@@ -80,7 +80,7 @@ public:
     virtual void get_unsat_core(ptr_vector<expr> &r);
     virtual void assert_expr(expr *e);
     virtual void collect_statistics(statistics &st) const {}
-    virtual void get_model(model_ref &m) {m_context.get_model(m);}
+    virtual void get_model_core(model_ref &m) {m_context.get_model(m);}
     virtual proof* get_proof();
     virtual std::string reason_unknown() const
     {return m_context.last_failure_as_string();}

src/muz/transforms/dl_mk_bit_blast.cpp

@@ -63,6 +63,8 @@ namespace datalog {
             return alloc(bit_blast_model_converter, m);
         }
 
+        virtual void display(std::ostream& out) { out << "(bit-blast-model-converter)\n"; }
+
         virtual void operator()(model_ref & model) {
             for (unsigned i = 0; i < m_new_funcs.size(); ++i) {
                 func_decl* p = m_new_funcs[i].get();

src/muz/transforms/dl_mk_karr_invariants.cpp

@@ -150,6 +150,8 @@ namespace datalog {
             return mc;
         }
 
+        virtual void display(std::ostream& out) { out << "(add-invariant-model-converter)\n"; }
+
     private:
         void mk_body(matrix const& M, expr_ref& body) {
             expr_ref_vector conj(m);

src/muz/transforms/dl_mk_quantifier_abstraction.cpp

@@ -53,6 +53,8 @@ namespace datalog {
             return alloc(qa_model_converter, m);
         }
 
+        virtual void display(std::ostream& out) { display_add(out, m); }
+
         void insert(func_decl* old_p, func_decl* new_p, expr_ref_vector& sub, sort_ref_vector& sorts, svector<bool> const& bound) {
             m_old_funcs.push_back(old_p);
             m_new_funcs.push_back(new_p);
@@ -81,7 +83,11 @@ namespace datalog {
                     SASSERT(body);                    
                 }
                 else {
-                    body = m.mk_false();  
+                    expr_ref_vector args(m);
+                    for (unsigned i = 0; i < p->get_arity(); ++i) {
+                        args.push_back(m.mk_var(i, p->get_domain(i)));
+                    }
+                    body = m.mk_app(p, args.size(), args.c_ptr());
                 }
                 // Create quantifier wrapper around body.
 

src/muz/transforms/dl_mk_scale.cpp

@@ -99,6 +99,9 @@ namespace datalog {
             UNREACHABLE();
             return 0;
         }
+
+        virtual void display(std::ostream& out) { out << "(scale-model-converter)\n"; }
+
     };
 
 

src/muz/transforms/dl_mk_slice.cpp

@@ -283,6 +283,8 @@ namespace datalog {
             // this would require implementing translation for the dl_context.
             return 0;
         }
+
+        virtual void display(std::ostream& out) { out << "(slice-proof-converter)\n"; }
     };
 
     class mk_slice::slice_model_converter : public model_converter {
@@ -396,6 +398,8 @@ namespace datalog {
             return 0;
         }
 
+        virtual void display(std::ostream& out) { out << "(slice-model-converter)\n"; }
+
     };
    
     mk_slice::mk_slice(context & ctx):