moving to context reset model

Signed-off-by: Nikolaj Bjorner <[email protected]>

Author: NikolajBjorner

src/model/model.cpp

@@ -178,8 +178,9 @@ model * model::translate(ast_translation & translator) const {
     // Translate usort interps
     for (auto const& kv : m_usort2universe) {
         ptr_vector<expr> new_universe;
-        for (expr* e : *kv.m_value) 
+        for (expr* e : *kv.m_value) {
             new_universe.push_back(translator(e));
+        }
         res->register_usort(translator(kv.m_key),
                             new_universe.size(),
                             new_universe.c_ptr());
@@ -342,7 +343,6 @@ void model::cleanup_interp(top_sort& ts, func_decl* f) {
                 fi->insert_entry(fe->get_args(), e2);
             }
         }
-
     }
 }
 

src/model/model_evaluator.cpp

@@ -16,10 +16,8 @@ Module Name:
 Revision History:
 
 --*/
-#include "model/model.h"
-#include "model/model_evaluator_params.hpp"
-#include "model/model_evaluator.h"
-#include "model/model_v2_pp.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_util.h"
 #include "ast/rewriter/rewriter_types.h"
 #include "ast/rewriter/bool_rewriter.h"
 #include "ast/rewriter/arith_rewriter.h"
@@ -31,10 +29,13 @@ Revision History:
 #include "ast/rewriter/fpa_rewriter.h"
 #include "ast/rewriter/th_rewriter.h"
 #include "ast/rewriter/rewriter_def.h"
-#include "ast/ast_pp.h"
-#include "ast/ast_util.h"
-#include "model/model_smt2_pp.h"
 #include "ast/rewriter/var_subst.h"
+#include "model/model_smt2_pp.h"
+#include "model/model.h"
+#include "model/model_evaluator_params.hpp"
+#include "model/model_evaluator.h"
+#include "model/model_v2_pp.h"
+
 
 namespace {