mirror of
https://github.com/Z3Prover/z3
synced 2025-04-27 02:45:51 +00:00
tabs
This commit is contained in:
Christoph M. Wintersteiger
parent
25f37c8a0c
commit
32fb679066
17 changed files with 141 additions and 142 deletions
|
|
@ -1171,7 +1171,7 @@ namespace Duality {
|
|||
new_alits.push_back(conj);
|
||||
#endif
|
||||
slvr().add(ctx.make(Implies, res, conj));
|
||||
// std::cout << res << ": " << conj << "\n";
|
||||
// std::cout << res << ": " << conj << "\n";
|
||||
}
|
||||
if (opt_map)
|
||||
(*opt_map)[res] = conj;
|
||||
|
|
@ -2734,7 +2734,7 @@ namespace Duality {
|
|||
if(res != unsat)
|
||||
throw "should be unsat";
|
||||
s.pop(1);
|
||||
|
||||
|
||||
for(unsigned i = 0; i < conjuncts.size(); ){
|
||||
std::swap(conjuncts[i],conjuncts.back());
|
||||
expr save = conjuncts.back();
|
||||
|
|
@ -3056,7 +3056,7 @@ namespace Duality {
|
|||
Push();
|
||||
expr the_impl = is.get_implicant();
|
||||
if(eq(the_impl,prev_impl)){
|
||||
// std::cout << "got old implicant\n";
|
||||
// std::cout << "got old implicant\n";
|
||||
repeated_case_count++;
|
||||
}
|
||||
prev_impl = the_impl;
|
||||
|
|
@ -3126,8 +3126,8 @@ namespace Duality {
|
|||
axioms_added = true;
|
||||
}
|
||||
else {
|
||||
//#define KILL_ON_BAD_INTERPOLANT
|
||||
#ifdef KILL_ON_BAD_INTERPOLANT
|
||||
//#define KILL_ON_BAD_INTERPOLANT
|
||||
#ifdef KILL_ON_BAD_INTERPOLANT
|
||||
std::cout << "bad in InterpolateByCase -- core:\n";
|
||||
#if 0
|
||||
std::vector<expr> assumps;
|
||||
|
|
@ -3137,7 +3137,7 @@ namespace Duality {
|
|||
#endif
|
||||
std::cout << "checking for inconsistency\n";
|
||||
std::cout << "model:\n";
|
||||
is.get_model().show();
|
||||
is.get_model().show();
|
||||
expr impl = is.get_implicant();
|
||||
std::vector<expr> conjuncts;
|
||||
CollectConjuncts(impl,conjuncts,true);
|
||||
|
|
@ -3379,7 +3379,7 @@ namespace Duality {
|
|||
int arity = f.arity();
|
||||
std::vector<sort> domain;
|
||||
for(int i = 0; i < arity; i++)
|
||||
domain.push_back(f.domain(i));
|
||||
domain.push_back(f.domain(i));
|
||||
return ctx.function(name.c_str(), arity, &domain[0], f.range());
|
||||
}
|
||||
|
||||
|
|
@ -3390,7 +3390,7 @@ namespace Duality {
|
|||
int arity = f.arity();
|
||||
std::vector<sort> domain;
|
||||
for(int i = 0; i < arity; i++)
|
||||
domain.push_back(f.domain(i));
|
||||
domain.push_back(f.domain(i));
|
||||
return ctx.function(name.c_str(), arity, &domain[0], f.range());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
// #define KEEP_EXPANSIONS
|
||||
// #define USE_CACHING_RPFP
|
||||
// #define PROPAGATE_BEFORE_CHECK
|
||||
#define NEW_STRATIFIED_INLINING
|
||||
#define NEW_STRATIFIED_INLINING
|
||||
|
||||
#define USE_RPFP_CLONE
|
||||
#define USE_NEW_GEN_CANDS
|
||||
|
|
@ -389,7 +389,7 @@ namespace Duality {
|
|||
else InstantiateAllEdges();
|
||||
}
|
||||
else {
|
||||
#ifdef NEW_STRATIFIED_INLINING
|
||||
#ifdef NEW_STRATIFIED_INLINING
|
||||
|
||||
#else
|
||||
CreateLeaves();
|
||||
|
|
@ -929,7 +929,7 @@ namespace Duality {
|
|||
|
||||
int StratifiedLeafCount;
|
||||
|
||||
#ifdef NEW_STRATIFIED_INLINING
|
||||
#ifdef NEW_STRATIFIED_INLINING
|
||||
|
||||
/** Stratified inlining builds an initial layered unwinding before
|
||||
switching to the LAWI strategy. Currently the number of layers
|
||||
|
|
@ -1135,7 +1135,6 @@ namespace Duality {
|
|||
conj = rpfp->conjoin(conjs);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Node *CreateUnderapproxNode(Node *node){
|
||||
// cex.get_tree()->ComputeUnderapprox(cex.get_root(),0);
|
||||
|
|
@ -1872,7 +1871,7 @@ namespace Duality {
|
|||
underapproximations as upper bounds. This mode is used to
|
||||
complete the partial derivation constructed in underapprox
|
||||
mode.
|
||||
*/
|
||||
*/
|
||||
|
||||
bool Derive(RPFP *rpfp, RPFP::Node *root, bool _underapprox, bool _constrained = false, RPFP *_tree = 0){
|
||||
underapprox = _underapprox;
|
||||
|
|
@ -2066,7 +2065,7 @@ namespace Duality {
|
|||
if(!top->Outgoing || tree->Check(top,unused_set) == unsat){
|
||||
unused_set.resize(orig_unused);
|
||||
if(to - from == 1){
|
||||
#if 1
|
||||
#if 1
|
||||
std::cout << "Not using underapprox of " << used_set[from] ->number << std::endl;
|
||||
#endif
|
||||
choices.insert(used_set[from]);
|
||||
|
|
@ -2250,14 +2249,14 @@ namespace Duality {
|
|||
throw "stacks out of sync!";
|
||||
reporter->Depth(stack.size());
|
||||
|
||||
// res = tree->Solve(top, 1); // incremental solve, keep interpolants for one pop
|
||||
// res = tree->Solve(top, 1); // incremental solve, keep interpolants for one pop
|
||||
check_result foo = Check();
|
||||
res = foo == unsat ? l_false : l_true;
|
||||
|
||||
if (res == l_false) {
|
||||
if (stack.empty()) // should never happen
|
||||
return false;
|
||||
|
||||
|
||||
{
|
||||
std::vector<Node *> &expansions = stack.back().expansions;
|
||||
int update_count = 0;
|
||||
|
|
@ -2384,7 +2383,7 @@ namespace Duality {
|
|||
tree->Pop(1);
|
||||
node_order.clear();
|
||||
while(stack.size() > 1){
|
||||
tree->Pop(1);
|
||||
tree->Pop(1);
|
||||
std::vector<Node *> &expansions = stack.back().expansions;
|
||||
for(unsigned i = 0; i < expansions.size(); i++)
|
||||
node_order.push_back(expansions[i]);
|
||||
|
|
@ -2420,12 +2419,12 @@ namespace Duality {
|
|||
|
||||
void PopLevel(){
|
||||
std::vector<Node *> &expansions = stack.back().expansions;
|
||||
tree->Pop(1);
|
||||
tree->Pop(1);
|
||||
hash_set<Node *> leaves_to_remove;
|
||||
for(unsigned i = 0; i < expansions.size(); i++){
|
||||
Node *node = expansions[i];
|
||||
// if(node != top)
|
||||
// tree->ConstrainParent(node->Incoming[0],node);
|
||||
// if(node != top)
|
||||
//tree->ConstrainParent(node->Incoming[0],node);
|
||||
std::vector<Node *> &cs = node->Outgoing->Children;
|
||||
for(unsigned i = 0; i < cs.size(); i++){
|
||||
leaves_to_remove.insert(cs[i]);
|
||||
|
|
@ -2441,7 +2440,7 @@ namespace Duality {
|
|||
}
|
||||
stack.pop_back();
|
||||
}
|
||||
|
||||
|
||||
bool NodeTooComplicated(Node *node){
|
||||
int ops = tree->CountOperators(node->Annotation.Formula);
|
||||
if(ops > 10) return true;
|
||||
|
|
@ -2670,7 +2669,7 @@ namespace Duality {
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -2732,7 +2731,7 @@ namespace Duality {
|
|||
return false;
|
||||
if(parent->underapprox_map.find(covering) != parent->underapprox_map.end())
|
||||
return covering->number < covered->number || parent->underapprox_map[covering] == covered;
|
||||
#endif
|
||||
#endif
|
||||
return covering->number < covered->number;
|
||||
}
|
||||
|
||||
|
|
@ -2778,7 +2777,7 @@ namespace Duality {
|
|||
else
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
bool Close(Node *node){
|
||||
if(covered_by(node))
|
||||
|
|
@ -2842,7 +2841,7 @@ namespace Duality {
|
|||
#ifdef UNDERAPPROX_NODES
|
||||
// if(parent->underapprox_map.find(covering) != parent->underapprox_map.end())
|
||||
// return parent->underapprox_map[covering] == covered;
|
||||
#endif
|
||||
#endif
|
||||
if(CoverOrder(covering,covered)
|
||||
&& !IsCovered(covering)){
|
||||
RPFP::Transformer f(covering->Annotation); f.SetEmpty();
|
||||
|
|
@ -3175,7 +3174,7 @@ namespace Duality {
|
|||
// else
|
||||
// std::cout << "constant not matched\n";
|
||||
}
|
||||
|
||||
|
||||
RPFP *old_unwinding = old_solver->unwinding;
|
||||
hash_map<std::string, std::vector<Node *> > pred_match;
|
||||
|
||||
|
|
@ -3467,7 +3466,7 @@ namespace Duality {
|
|||
dnode->Bound.Formula = bound_fmla;
|
||||
}
|
||||
db_saved_bounds.push_back(bound_fmla);
|
||||
// dnode->Annotation.Formula = ctx.make(And,node->Annotation.Formula,ctx.make(Geq,dvar,ctx.int_val(0)));
|
||||
// dnode->Annotation.Formula = ctx.make(And,node->Annotation.Formula,ctx.make(Geq,dvar,ctx.int_val(0)));
|
||||
}
|
||||
for(unsigned i = 0; i < rpfp->edges.size(); i++){
|
||||
Edge *edge = rpfp->edges[i];
|
||||
|
|
|
|||
|
|
@ -727,7 +727,7 @@ namespace Duality {
|
|||
if(!started){
|
||||
sw.start();
|
||||
started = true;
|
||||
}
|
||||
}
|
||||
return sw.get_current_seconds();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue