iterator bug

Author: arodrigue003

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
 project(free_packingPFA)
 set(BOOST_LIBS program_options)
 set(LIBS_DIR third_party/boost/stage/lib/)
@@ -9,9 +9,9 @@ set(EXE_NAME "packer")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wfatal-errors -std=c++11 -fopenmp")
 
 # Options
-option(FORCE_UNPACK "Boost unpack forcing" 0) #Set to 1 to force local installation of Boost (ensure that it will take priority)
-option(DISPLAY "Display build" 0)
-option(DEBUG "Enable debug compilation flags" 0)
+option(FORCE_UNPACK "Boost unpack forcing") #Set to 1 to force local installation of Boost (ensure that it will take priority)
+option(DISPLAY "Display build")
+option(DEBUG "Enable debug compilation flags")
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules)
 
@@ -30,6 +30,7 @@ endif ()
 
 # Debug enabling (use it with cmake -DDEBUG=1 ..)
 if(${DEBUG})
+        message(STATUS "Will build sebug configuration")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g")
 else ()
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")

conf/default.ce

@@ -1,4 +1,3 @@
-HoleTransformer();
 DO 2 TIMES
 	SimpleTransformer(rotate_step=30, criteria=intersection);
 ScanlineSolver();

src/Layout.cpp

@@ -40,7 +40,7 @@ void Layout::replaceShapes(std::vector<Shape>* s) {
  */
 void Layout::push_back(const Shape& s) {
     if (usingQuads)
-        _q->push_back(dynamic_cast<const QuadTree&>(s));
+		_q->push_back(dynamic_cast<const QuadTree&>(s));
     else
         _s->push_back(s);
 }

src/Layout.hpp

@@ -44,6 +44,9 @@ class Layout {
     Shape& operator[](unsigned n);
     void push_back(const Shape& s);
     void erase(unsigned n);
+	bool useQuads() {
+		return usingQuads;
+	}
 
     class iterator : public std::iterator <
         std::random_access_iterator_tag,

src/Shape.hpp

@@ -1,6 +1,7 @@
 #ifndef SHAPE__H
 #define SHAPE__H
 
+#include <iostream> //need to remove after
 #include <string>
 #include <array>
 
@@ -40,6 +41,7 @@ class Shape {
     Shape(Point P1, Point P2, unsigned i1, unsigned i2, unsigned id) : _oldP1(P1),
         _oldP2(P2), _indexP1(i1), _indexP2(i2), _id(id) {}
     virtual Shape& operator=(const Shape& s) {
+		std::cerr << "shape assignement called" << std::endl;
         _multiP = s._multiP;
         _oldP1 = s._oldP1;
         _oldP2 = s._oldP2;

src/quadtree/QuadTree.cpp

@@ -56,7 +56,10 @@ QuadTree::QuadTree(const QuadTree& q) : Shape(q) {
  * @param qi
  * @return the quadtree copied
  */
-QuadTree& QuadTree::operator=(const QuadTree& q) {
+QuadTree& QuadTree::operator=(const Shape& s) {
+	cerr << "quadtree assignement called" << endl;
+
+	const QuadTree &q = dynamic_cast<const QuadTree &>(s);
     if (this != &q) {
         destroy();
         Shape::operator=(q);
@@ -191,7 +194,7 @@ QuadTree::QuadTree(MultiPolygon& mult, float precision, unsigned id)
  */
 bool QuadTree::intersectsWith(const Shape& s) const {
 	cerr << "QuadTree intersect" << endl;
-	const QuadTree& q = static_cast<const QuadTree &>(s);
+	const QuadTree& q = dynamic_cast<const QuadTree &>(s);
     return trees[currentTree]->intersectsRec(*q.trees[q.currentTree], _totalX, _totalY,
             q._totalX, q._totalY);
 }

src/quadtree/QuadTree.hpp

@@ -28,8 +28,8 @@ class QuadTree : public Shape {
     void copy(const QuadTree&);
     void destroy();
 public:
-    QuadTree(const QuadTree&); //copy operator
-    QuadTree& operator=(const QuadTree&); //assignment operator
+	QuadTree(const QuadTree&); //copy operator
+	QuadTree& operator=(const Shape&) override; //assignment operator
     QuadTree& operator=(QuadTree&& q);
     ~QuadTree();
 

src/transformer/SimpleTransformer.cpp

@@ -10,6 +10,7 @@
 #include "Merger.hpp"
 #include "Parser.hpp"
 #include "Display.hpp"
+#include "quadtree/QuadTree.hpp"
 
 using namespace std;
 
@@ -48,6 +49,9 @@ void applyTrans(Shape& a, Shape& b, double alpha, double beta, double offset, Bo
  * (uses precomputed boxA)
  */
 double getClose(Shape& shapeA, Shape& shapeB, Box& boxA) {
+	//QuadTree& q1 = dynamic_cast<QuadTree &>(shapeA);
+	//QuadTree& q2 = dynamic_cast<QuadTree &>(shapeB);
+
     //Dichotomy to find closest non-intersecting position (by translating on the x-axis)
     double x1, x2, mid;
     x1 = boxA.min_corner().x();
@@ -73,6 +77,8 @@ vector<vector<unsigned> > SimpleTransformer::transform() {
     LOG(info) << "Merging shapes";
     vector<vector<unsigned> > ret;
     vector<bool> mergedV(_shapes.size(), false);
+
+	cerr << "USE QUADS :" << _shapes.useQuads() << endl;
     //Initial shufle
     random_shuffle(_shapes.begin(), _shapes.end());
 
@@ -85,7 +91,7 @@ vector<vector<unsigned> > SimpleTransformer::transform() {
         double bestAlpha = 0., bestBeta = 0., bestMid = 0; //Best rotations
         int bestOffset = 0.; //Best translation
         double bestArea = 0.; //Best area of merged couples of shapes
-        unsigned j = i + 1;
+		unsigned j = i + 1;
         unsigned bestJ = j;
         //Move shapes
         bool merged = false; //Check if a merge occured
@@ -95,9 +101,11 @@ vector<vector<unsigned> > SimpleTransformer::transform() {
             for (int beta = 0.; beta < 360 ; beta += _rotateStep) { //Rotate second shape
                 for (int offset = 0; offset < _translateNb ; ++offset) { //Trying different offsets
                     Box boxA, boxB;
-                    Shape shapeA, shapeB;
-                    shapeA = _shapes[i];
-                    shapeB = _shapes[j];
+					Shape shapeA = _shapes[i];
+					Shape shapeB = _shapes[j];
+					//QuadTree& q1 = dynamic_cast<QuadTree &>(_shapes[i]);
+					//QuadTree& q2 = dynamic_cast<QuadTree &>(_shapes[j]);
+
                     applyTrans(shapeA, shapeB, alpha, beta, static_cast<double>(offset) / _translateNb, boxA,
                                boxB, 0, true);
                     double mid = getClose(shapeA, shapeB, boxA);