mirror of
https://github.com/Z3Prover/z3
synced 2025-04-29 03:45:51 +00:00
merge with master branch
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
commit
651587ce01
1602 changed files with 40496 additions and 27837 deletions
|
@ -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";);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue