From bd5d4e5d36392293eeb966cfdf4b68cca2099a9f Mon Sep 17 00:00:00 2001 From: Tim Dwyer Date: Thu, 26 Jan 2006 05:32:20 +0000 Subject: Fixed bug to do with comparison of invalid constraints in pairing heaps. Also numerical problem with constraint generation fixed. (bzr r30) --- src/removeoverlap/block.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/removeoverlap/block.cpp') diff --git a/src/removeoverlap/block.cpp b/src/removeoverlap/block.cpp index 32b310153..ebf56ea9e 100644 --- a/src/removeoverlap/block.cpp +++ b/src/removeoverlap/block.cpp @@ -8,13 +8,13 @@ * * Released under GNU GPL. Read the file 'COPYING' for more information. */ - - +#include #include "constraint.h" #include "block.h" #include "blocks.h" #include "pairingheap/PairingHeap.h" #ifdef RECTANGLE_OVERLAP_LOGGING +#include using std::ios; using std::ofstream; using std::endl; @@ -125,6 +125,13 @@ Constraint *Block::findMinInConstraint() { #endif if(lb == rb) { // constraint has been merged into the same block +#ifdef RECTANGLE_OVERLAP_LOGGING + if(v->slack()<0) { + f<<" violated internal constraint found! "<<*v<