diff options
Diffstat (limited to 'src/removeoverlap/remove_rectangle_overlap.cpp')
| -rwxr-xr-x | src/removeoverlap/remove_rectangle_overlap.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/removeoverlap/remove_rectangle_overlap.cpp b/src/removeoverlap/remove_rectangle_overlap.cpp index 6f6ace03a..9fbef647b 100755 --- a/src/removeoverlap/remove_rectangle_overlap.cpp +++ b/src/removeoverlap/remove_rectangle_overlap.cpp @@ -40,19 +40,18 @@ double Rectangle::yBorder=0; * too much in the first pass. */ void removeRectangleOverlap(unsigned n, Rectangle *rs[], double xBorder, double yBorder) { - assert(0 <= n); try { // The extra gap avoids numerical imprecision problems Rectangle::setXBorder(xBorder+EXTRA_GAP); Rectangle::setYBorder(yBorder+EXTRA_GAP); Variable **vs=new Variable*[n]; - for(int i=0;i<n;i++) { + for(unsigned int i=0;i<n;i++) { vs[i]=new Variable(i,0,1); } Constraint **cs; double *oldX = new double[n]; int m=generateXConstraints(n,rs,vs,cs,true); - for(int i=0;i<n;i++) { + for(unsigned int i=0;i<n;i++) { oldX[i]=vs[i]->desiredPosition; } VPSC vpsc_x(n,vs,m,cs); @@ -62,7 +61,7 @@ void removeRectangleOverlap(unsigned n, Rectangle *rs[], double xBorder, double f.close(); #endif vpsc_x.solve(); - for(int i=0;i<n;i++) { + for(unsigned int i=0;i<n;i++) { rs[i]->moveCentreX(vs[i]->position()); } for(int i = 0; i < m; ++i) { @@ -80,7 +79,7 @@ void removeRectangleOverlap(unsigned n, Rectangle *rs[], double xBorder, double f.close(); #endif vpsc_y.solve(); - for(int i=0;i<n;i++) { + for(unsigned int i=0;i<n;i++) { rs[i]->moveCentreY(vs[i]->position()); rs[i]->moveCentreX(oldX[i]); } @@ -102,14 +101,14 @@ void removeRectangleOverlap(unsigned n, Rectangle *rs[], double xBorder, double delete cs[i]; } delete [] cs; - for(int i=0;i<n;i++) { + for(unsigned int i=0;i<n;i++) { rs[i]->moveCentreX(vs[i]->position()); delete vs[i]; } delete [] vs; } catch (char const *str) { std::cerr<<str<<std::endl; - for(int i=0;i<n;i++) { + for(unsigned int i=0;i<n;i++) { std::cerr << *rs[i]<<std::endl; } } |