move model and proof converters to self-contained module

src/tactic/arith/card2bv_tactic.cpp

@@ -22,7 +22,7 @@ Notes:
 #include "ast/rewriter/pb2bv_rewriter.h"
 #include "ast/ast_util.h"
 #include "ast/ast_pp.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 
 class card2bv_tactic : public tactic {
     ast_manager &              m;

src/tactic/arith/degree_shift_tactic.cpp

@@ -20,7 +20,7 @@ Revision History:
 
 --*/
 #include "tactic/tactical.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 #include "ast/arith_decl_plugin.h"
 #include "tactic/core/simplify_tactic.h"
 #include "ast/ast_smt2_pp.h"

src/tactic/arith/fix_dl_var_tactic.cpp

@@ -23,7 +23,7 @@ Revision History:
 --*/
 #include "tactic/tactical.h"
 #include "ast/rewriter/th_rewriter.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 #include "ast/arith_decl_plugin.h"
 #include "ast/expr_substitution.h"
 #include "ast/ast_smt2_pp.h"

src/tactic/arith/lia2card_tactic.cpp

@@ -25,7 +25,7 @@ Notes:
 #include "ast/ast_pp_util.h"
 #include "tactic/tactical.h"
 #include "tactic/arith/bound_manager.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 
 class lia2card_tactic : public tactic {
 

src/tactic/arith/lia2pb_tactic.cpp

@@ -20,7 +20,7 @@ Revision History:
 #include "tactic/arith/bound_manager.h"
 #include "ast/rewriter/th_rewriter.h"
 #include "ast/for_each_expr.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 #include "ast/arith_decl_plugin.h"
 #include "ast/expr_substitution.h"
 #include "ast/ast_smt2_pp.h"

src/tactic/arith/nla2bv_tactic.cpp

@@ -27,7 +27,7 @@ Notes:
 #include "util/optional.h"
 #include "tactic/arith/bv2int_rewriter.h"
 #include "tactic/arith/bv2real_rewriter.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 #include "tactic/arith/bound_manager.h"
 #include "util/obj_pair_hashtable.h"
 #include "ast/ast_smt2_pp.h"

src/tactic/arith/normalize_bounds_tactic.cpp

@@ -21,7 +21,7 @@ Revision History:
 #include "tactic/tactical.h"
 #include "tactic/arith/bound_manager.h"
 #include "ast/rewriter/th_rewriter.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 #include "ast/arith_decl_plugin.h"
 #include "ast/expr_substitution.h"
 #include "ast/ast_smt2_pp.h"

src/tactic/arith/pb2bv_model_converter.h

@@ -18,7 +18,7 @@ Notes:
 --*/
 #pragma once
 
-#include "tactic/model_converter.h"
+#include "ast/converters/model_converter.h"
 #include "tactic/arith/bound_manager.h"
 
 class pb2bv_model_converter : public model_converter {

src/tactic/arith/pb2bv_tactic.cpp

@@ -29,7 +29,7 @@ Notes:
 #include "ast/rewriter/pb2bv_rewriter.h"
 #include "tactic/tactical.h"
 #include "tactic/arith/bound_manager.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 #include "tactic/arith/pb2bv_model_converter.h"
 #include "tactic/arith/pb2bv_tactic.h"
 

src/tactic/arith/purify_arith_tactic.cpp

@@ -27,7 +27,7 @@ Revision History:
 #include "tactic/core/nnf_tactic.h"
 #include "tactic/core/simplify_tactic.h"
 #include "ast/rewriter/th_rewriter.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 #include "ast/ast_smt2_pp.h"
 #include "ast/ast_pp.h"
 #include "ast/rewriter/expr_replacer.h"

src/tactic/arith/recover_01_tactic.cpp

@@ -57,7 +57,7 @@ Revision History:
 --*/
 #include "tactic/tactical.h"
 #include "ast/rewriter/th_rewriter.h"
-#include "tactic/generic_model_converter.h"
+#include "ast/converters/generic_model_converter.h"
 #include "ast/arith_decl_plugin.h"
 #include "ast/expr_substitution.h"
 #include "util/dec_ref_util.h"