bmc improvements, move fd_solver to self-contained directory

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

src/tactic/fd_solver/bounded_int2bv_solver.cpp

@@ -16,8 +16,7 @@ Author:
 Notes:
 
 --*/
-
-#include "tactic/portfolio/bounded_int2bv_solver.h"
+#include "tactic/fd_solver/bounded_int2bv_solver.h"
 #include "solver/solver_na2as.h"
 #include "tactic/tactic.h"
 #include "ast/rewriter/pb2bv_rewriter.h"

src/tactic/fd_solver/enum2bv_solver.cpp

@@ -26,9 +26,9 @@ Notes:
 #include "model/model_smt2_pp.h"
 #include "tactic/tactic.h"
 #include "tactic/generic_model_converter.h"
-#include "tactic/portfolio/enum2bv_solver.h"
 #include "solver/solver_na2as.h"
 #include "ast/rewriter/enum2bv_rewriter.h"
+#include "tactic/fd_solver/enum2bv_solver.h"
 
 class enum2bv_solver : public solver_na2as {
     ast_manager&     m;

src/tactic/fd_solver/fd_solver.cpp

@@ -17,7 +17,7 @@ Notes:
    
 --*/
 
-#include "tactic/portfolio/fd_solver.h"
+#include "tactic/fd_solver/fd_solver.h"
 #include "tactic/tactic.h"
 #include "sat/sat_solver/inc_sat_solver.h"
 #include "tactic/portfolio/enum2bv_solver.h"

src/tactic/fd_solver/pb2bv_solver.cpp

@@ -17,13 +17,13 @@ Notes:
 --*/
 
 #include "ast/ast_pp.h"
+#include "ast/rewriter/pb2bv_rewriter.h"
+#include "ast/rewriter/th_rewriter.h"
 #include "model/model_smt2_pp.h"
-#include "tactic/portfolio/pb2bv_solver.h"
 #include "tactic/tactic.h"
 #include "tactic/generic_model_converter.h"
 #include "solver/solver_na2as.h"
-#include "ast/rewriter/pb2bv_rewriter.h"
-#include "ast/rewriter/th_rewriter.h"
+#include "tactic/fd_solver/pb2bv_solver.h"
 
 class pb2bv_solver : public solver_na2as {
     ast_manager&     m;

src/tactic/portfolio/CMakeLists.txt

@@ -1,10 +1,6 @@
 z3_add_component(portfolio
   SOURCES
-    bounded_int2bv_solver.cpp
     default_tactic.cpp
-    enum2bv_solver.cpp
-    fd_solver.cpp
-    pb2bv_solver.cpp
     smt_strategic_solver.cpp
     solver2lookahead.cpp
   COMPONENT_DEPENDENCIES
@@ -17,7 +13,7 @@ z3_add_component(portfolio
     smtlogic_tactics
     subpaving_tactic
     ufbv_tactic
+    fd_solver
   TACTIC_HEADERS
     default_tactic.h
-    fd_solver.h
 )

src/tactic/portfolio/default_tactic.cpp

@@ -31,7 +31,7 @@ Notes:
 #include "tactic/fpa/qffplra_tactic.h"
 #include "tactic/smtlogics/qfaufbv_tactic.h"
 #include "tactic/smtlogics/qfauflia_tactic.h"
-#include "tactic/portfolio/fd_solver.h"
+#include "tactic/fd_solver/fd_solver.h"
 
 tactic * mk_default_tactic(ast_manager & m, params_ref const & p) {
     tactic * st = using_params(and_then(mk_simplify_tactic(m),

src/tactic/portfolio/smt_strategic_solver.cpp

@@ -33,7 +33,7 @@ Notes:
 #include "tactic/smtlogics/qfidl_tactic.h"
 #include "tactic/smtlogics/nra_tactic.h"
 #include "tactic/portfolio/default_tactic.h"
-#include "tactic/portfolio/fd_solver.h"
+#include "tactic/fd_solver/fd_solver.h"
 #include "tactic/ufbv/ufbv_tactic.h"
 #include "tactic/fpa/qffp_tactic.h"
 #include "muz/fp/horn_tactic.h"