merge with master branch

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

src/sat/tactic/atom2bool_var.cpp

@@ -16,10 +16,10 @@ Author:
 Notes:
 
 --*/
-#include"atom2bool_var.h"
-#include"ast_smt2_pp.h"
-#include"ref_util.h"
-#include"goal.h"
+#include "sat/tactic/atom2bool_var.h"
+#include "ast/ast_smt2_pp.h"
+#include "util/ref_util.h"
+#include "tactic/goal.h"
 
 void atom2bool_var::mk_inv(expr_ref_vector & lit2expr) const {
     obj_map<expr, var>::iterator it  = m_mapping.begin();

src/sat/tactic/atom2bool_var.h

@@ -19,8 +19,8 @@ Notes:
 #ifndef ATOM2BOOL_VAR_H_
 #define ATOM2BOOL_VAR_H_
 
-#include"expr2var.h"
-#include"sat_types.h"
+#include "ast/expr2var.h"
+#include "sat/sat_types.h"
 
 /**
    \brief Mapping from atoms into SAT boolean variables.

src/sat/tactic/goal2sat.cpp

@@ -26,19 +26,19 @@ Author:
 Notes:
 
 --*/
-#include"goal2sat.h"
-#include"ast_smt2_pp.h"
-#include"ref_util.h"
-#include"cooperate.h"
-#include"filter_model_converter.h"
-#include"model_evaluator.h"
-#include"for_each_expr.h"
-#include"model_v2_pp.h"
-#include"tactic.h"
-#include"ast_pp.h"
-#include"ast_util.h"
-#include"pb_decl_plugin.h"
-#include"ba_solver.h"
+#include "sat/tactic/goal2sat.h"
+#include "ast/ast_smt2_pp.h"
+#include "util/ref_util.h"
+#include "util/cooperate.h"
+#include "tactic/filter_model_converter.h"
+#include "model/model_evaluator.h"
+#include "ast/for_each_expr.h"
+#include "model/model_v2_pp.h"
+#include "tactic/tactic.h"
+#include "ast/ast_pp.h"
+#include "sat/ba_solver.h"
+#include "ast/pb_decl_plugin.h"
+#include "ast/ast_util.h"
 #include<sstream>
 
 struct goal2sat::imp {
@@ -275,6 +275,7 @@ struct goal2sat::imp {
                 for (unsigned i = 0; i < num; ++i) {
                     m_result_stack[i].neg();
                 }                
+                mk_clause(m_result_stack.size(), m_result_stack.c_ptr());
             }
             else {
                 for (unsigned i = 0; i < num; ++i) {
@@ -305,6 +306,7 @@ struct goal2sat::imp {
             if (sign)
                 l.neg();
             m_result_stack.push_back(l);
+            TRACE("goal2sat", tout << m_result_stack << "\n";);
         }
     }
 

src/sat/tactic/goal2sat.h

@@ -29,10 +29,10 @@ Notes:
 #ifndef GOAL2SAT_H_
 #define GOAL2SAT_H_
 
-#include"goal.h"
-#include"sat_solver.h"
-#include"model_converter.h"
-#include"atom2bool_var.h"
+#include "tactic/goal.h"
+#include "sat/sat_solver.h"
+#include "tactic/model_converter.h"
+#include "sat/tactic/atom2bool_var.h"
 
 class goal2sat {
     struct imp;

src/sat/tactic/sat_tactic.cpp

@@ -16,12 +16,12 @@ Author:
 Notes:
 
 --*/
-#include"tactical.h"
-#include"goal2sat.h"
-#include"sat_solver.h"
-#include"filter_model_converter.h"
-#include"ast_smt2_pp.h"
-#include"model_v2_pp.h"
+#include "tactic/tactical.h"
+#include "sat/tactic/goal2sat.h"
+#include "sat/sat_solver.h"
+#include "tactic/filter_model_converter.h"
+#include "ast/ast_smt2_pp.h"
+#include "model/model_v2_pp.h"
 
 class sat_tactic : public tactic {
 

src/sat/tactic/sat_tactic.h

@@ -19,7 +19,7 @@ Notes:
 #ifndef SAT_TACTIC_H_
 #define SAT_TACTIC_H_
 
-#include"params.h"
+#include "util/params.h"
 class ast_manager;
 class tactic;