mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable

Browse source
This commit is contained in:
Leonardo de Moura 2012-10-31 14:22:00 -07:00
commit 6d8b8a762c
17 changed files with 136 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/smt/diff_logic.h
View file

@ -1041,7 +1041,6 @@ private:
for (unsigned i = 0; i < edges.size(); ++i) {
potential0 += m_edges[edges[i]].get_weight();
// numeral potential1 = potentials[i];
if (potential0 != potentials[i] ||
nodes[i] != m_edges[edges[i]].get_source()) {
TRACE("diff_logic_traverse", tout << "checking index " << i << " ";

1
src/smt/theory_diff_logic_def.h
View file

@ -675,7 +675,6 @@ void theory_diff_logic<Ext>::set_neg_cycle_conflict() {
inc_conflicts();
literal_vector const& lits = m_nc_functor.get_lits();
context & ctx = get_context();
// region& r = ctx.get_region();
TRACE("arith_conflict",
//display(tout);
tout << "conflict: ";