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/solve_VPSC.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/solve_VPSC.cpp')
| -rw-r--r-- | src/removeoverlap/solve_VPSC.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/removeoverlap/solve_VPSC.cpp b/src/removeoverlap/solve_VPSC.cpp index 296cc415b..f2a7f0e85 100644 --- a/src/removeoverlap/solve_VPSC.cpp +++ b/src/removeoverlap/solve_VPSC.cpp @@ -15,6 +15,7 @@ #include "blocks.h" #include "solve_VPSC.h" #ifdef RECTANGLE_OVERLAP_LOGGING +#include <fstream> using std::ios; using std::ofstream; using std::endl; @@ -72,7 +73,7 @@ void VPSC::satisfy() { ofstream f(LOGFILE,ios::app); f<<"Error: Unsatisfied constraint: "<<*cs[i]<<endl; #endif - assert(cs[i]->slack()>-0.0000001); + //assert(cs[i]->slack()>-0.0000001); throw "Unsatisfied constraint"; } } |