diff options
| author | Tim Dwyer <tgdwyer@gmail.com> | 2006-01-26 05:32:20 +0000 |
|---|---|---|
| committer | tgdwyer <tgdwyer@users.sourceforge.net> | 2006-01-26 05:32:20 +0000 |
| commit | bd5d4e5d36392293eeb966cfdf4b68cca2099a9f (patch) | |
| tree | 844ef674a2ce640ced96538258264f1e5003535c /src/removeoverlap/blocks.cpp | |
| parent | fix silly bug - was unable to flip by scaling (diff) | |
| download | inkscape-bd5d4e5d36392293eeb966cfdf4b68cca2099a9f.tar.gz inkscape-bd5d4e5d36392293eeb966cfdf4b68cca2099a9f.zip | |
Fixed bug to do with comparison of invalid constraints in pairing heaps.
Also numerical problem with constraint generation fixed.
(bzr r30)
Diffstat (limited to 'src/removeoverlap/blocks.cpp')
| -rw-r--r-- | src/removeoverlap/blocks.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
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 <fstream> 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<Block*>::iterator i=begin();i!=end();i++) { delete *i; } @@ -69,7 +71,11 @@ void Blocks::dfsVisit(Variable *v, list<Variable*> *order) { if(!c->right->visited) { dfsVisit(c->right, order); } - } + } +#ifdef RECTANGLE_OVERLAP_LOGGING + ofstream f(LOGFILE,ios::app); + f<<" order="<<*v<<endl; +#endif order->push_front(v); } /** |