checkpoint

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>

scripts/mk_make.py

@@ -65,10 +65,14 @@ add_lib('fpa', ['core_tactics', 'bit_blaster', 'sat_tactic'])
 add_lib('smt_tactic', ['smt'])
 add_lib('sls_tactic', ['tactic', 'normal_forms', 'core_tactics', 'bv_tactics'])
 add_lib('smtlogic_tactics', ['arith_tactics', 'bv_tactics', 'nlsat_tactic', 'smt_tactic'])
+# TODO: rewrite ufbv_strategy as a tactic and move to smtlogic_tactics.
+add_lib('ufbv_strategy', ['assertion_set', 'normal_forms', 'macros', 'smt_tactic', 'rewriter'])
 # TODO: split muz_qe into muz, qe. Perhaps, we should also consider breaking muz into muz and pdr.
 add_lib('muz_qe', ['smt', 'sat', 'smt2parser'])
 add_lib('aig', ['cmd_context', 'assertion_set'])
+add_lib('portfolio', ['smtlogic_tactics', 'ufbv_strategy', 'fpa', 'aig', 'muz_qe', 'sls_tactic', 'subpaving_tactic'])
 # TODO: delete SMT 1.0 frontend
-add_lib('smtparser', ['api_headers', 'smt', 'spc'])
+add_lib('smtparser', ['api_headers', 'smt', 'spc', 'portfolio'])
+add_lib('api', ['portfolio', 'user_plugin', 'smtparser'])
 
 mk_vs_solution()

src/portfolio/install_tactics.cpp

@@ -27,7 +27,7 @@ Notes:
 
 #include"bit_blaster_tactic.h"
 #include"bv1_blaster_tactic.h"
-#include"der.h"
+#include"der_tactic.h"
 #include"aig_tactic.h"
 #include"smt_tactic.h"
 #include"sat_tactic.h"

src/ufbv_strategy/ufbv_strategy.cpp

@@ -17,8 +17,9 @@ Notes:
 
 --*/
 #include"assertion_set_rewriter.h"
+#include"smt_solver_strategy.h"
 #include"nnf.h"
-#include"der.h"
+#include"der_strategy.h"
 #include"distribute_forall.h"
 #include"macro_finder.h"
 #include"arith_simplifier_plugin.h"