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/blocks.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/removeoverlap/blocks.cpp') diff --git a/src/removeoverlap/blocks.cpp b/src/removeoverlap/blocks.cpp index 23df60516..13da8e15e 100644 --- a/src/removeoverlap/blocks.cpp +++ b/src/removeoverlap/blocks.cpp @@ -17,6 +17,7 @@ #include "block.h" #include "constraint.h" #ifdef RECTANGLE_OVERLAP_LOGGING +#include using std::ios; using std::ofstream; using std::endl; @@ -37,6 +38,7 @@ Blocks::Blocks(Variable *vs[], const int n) : vs(vs),nvs(n) { } Blocks::~Blocks(void) { + blockTimeCtr=0; for(set::iterator i=begin();i!=end();i++) { delete *i; } @@ -69,7 +71,11 @@ void Blocks::dfsVisit(Variable *v, list *order) { if(!c->right->visited) { dfsVisit(c->right, order); } - } + } +#ifdef RECTANGLE_OVERLAP_LOGGING + ofstream f(LOGFILE,ios::app); + f<<" order="<<*v<push_front(v); } /** -- cgit v1.2.3