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/solve_VPSC.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/removeoverlap/solve_VPSC.cpp') 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 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]<slack()>-0.0000001); + //assert(cs[i]->slack()>-0.0000001); throw "Unsatisfied constraint"; } } -- cgit v1.2.3