Commit 6a778ff4 authored by danfis's avatar danfis

op-mutex-sym-redundant: Cleanup + simplified fixpoint computation.

parent 8e0565ad
......@@ -300,11 +300,11 @@ static void computeRedundantSets(reduce_t *red, bor_err_t *err)
}
findRedundantSet(rgen, red);
BOR_INFO(err, " --> Sym %d: size: %d, destroyed symmetries: %d",
//" relevant ops: %d",
BOR_INFO(err, " --> Sym %d: size: %d, destroyed symmetries: %d,"
" relevant ops: %d",
gi, borISetSize(&rgen->redundant_set),
borISetSize(&rgen->destroyed_syms));
//borISetSize(&rgen->relevant_op));
borISetSize(&rgen->destroyed_syms),
borISetSize(&rgen->relevant_op));
}
}
......@@ -319,9 +319,6 @@ static int selectRedundantSet(const reduce_t *red, bor_err_t *err)
continue;
if (borISetSize(&rgen->redundant_set) == 0)
continue;
// TODO
//if (!borISetIsDisjunct(&rgen->redundant_set, &red->pruned_ops))
// continue;
int size = borISetSize(&rgen->redundant_set);
int destr = borISetSize(&rgen->destroyed_syms);
......@@ -356,29 +353,16 @@ void planOpMutexSymRedundantFixpoint(bor_iset_t *redundant_out,
change = 0;
computeRedundantSets(&red, err);
int local_change = 1;
// TODO
for (int i = 0; local_change && i < 10; ++i){
//while (change){
if ((gen_id = selectRedundantSet(&red, err)) >= 0){
// TODO
/*
if (!borISetIsDisjunct(&red.gen[gen_id].redundant_set,
&red.pruned_ops)){
break;
}
*/
BOR_INFO(err, " --> Selected redundant set from symmetry"
" %d with size %d destroying %d symmetries",
gen_id,
borISetSize(&red.gen[gen_id].redundant_set),
borISetSize(&red.gen[gen_id].destroyed_syms));
pruneRedundantSet(&red, &red.gen[gen_id].redundant_set);
change = local_change = 1;
BOR_INFO(err, " --> Redundant operators overall: %d",
borISetSize(&red.pruned_ops));
}
if ((gen_id = selectRedundantSet(&red, err)) >= 0){
pruneRedundantSet(&red, &red.gen[gen_id].redundant_set);
change = 1;
BOR_INFO(err, " --> Selected redundant set from symmetry"
" %d with size %d destroying %d symmetries"
" :: overall: %d",
gen_id,
borISetSize(&red.gen[gen_id].redundant_set),
borISetSize(&red.gen[gen_id].destroyed_syms),
borISetSize(&red.pruned_ops));
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment