diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_2d_traits.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_2d_traits.h index 39e12718a82..23896b94a3b 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_2d_traits.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_2d_traits.h @@ -61,7 +61,6 @@ public: }; AABB_traits_2(): m_p(Container()), m_q(Container()) { - }; /// Non-virtual Destructor @@ -239,7 +238,6 @@ public: has_weak_intersection = true; p_intersect = true; } - } if (*ipoint == q.datum().source()) { @@ -251,7 +249,6 @@ public: q_intersect = true; has_weak_intersection = true; } - } if (has_weak_intersection) { @@ -262,11 +259,9 @@ public: int k = 4; k = k + 4; k++; - } return val; - } else { return true; } @@ -309,7 +304,6 @@ public: } else { return handle_one_weak_int(tr_pr_datum, p_other_translated, *itr_q); } - } else { if (!p_intersect && q_intersect) { if (q_intersect_start) { @@ -340,7 +334,6 @@ public: return check_overlapping(first_p, second_p, first_q, second_q); } } - } bool handle_one_weak_int(const Datum &incoming, const Datum &outgoing, const Datum &other_segment) const { @@ -348,7 +341,6 @@ public: //return (other_segment.direction()).counterclockwise_in_between(outgoing.direction(),incoming.opposite().direction()); return (other_segment.direction()).counterclockwise_in_between(outgoing.direction(), incoming.opposite().direction()) || outgoing.direction().counterclockwise_in_between(other_segment.direction(), other_segment.opposite().direction()); - } bool check_overlapping(const Datum &incoming_p, const Datum &outgoing_p, const Datum &incoming_q, const Datum &outgoing_q) const { @@ -373,7 +365,6 @@ public: --p_other; } - } else { p_other = cont.edges_end(); --p_other; @@ -392,7 +383,6 @@ public: return p_other; } - }; Do_intersect do_intersect_object() { @@ -489,7 +479,6 @@ private: } /* static bool less_z(const Primitive& pr1, const Primitive& pr2) { return pr1.reference_point().z() < pr2.reference_point().z(); }*/ - }; template @@ -528,6 +517,5 @@ AABB_traits_2::longest_axis(const Bounding_box &bbox) { // } //} } - } #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_Collision_detector.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_Collision_detector.h index 6896245de1d..870a1045ad6 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_Collision_detector.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_Collision_detector.h @@ -27,7 +27,6 @@ protected: public: AABBCollisionDetector(Polygon_2 &p, Polygon_2 &q)//:m_stationary_tree((q.edges_begin()),(q.edges_end())),m_translating_tree((p.edges_begin()),(p.edges_end())),m_p(p),m_q(q) : m_stationary_tree((p.edges_begin()), (p.edges_end())), m_translating_tree((q.edges_begin()), (q.edges_end())), m_p(q), m_q(p) { - } //typedef typename Polygon_2::Vertex_circulator Vertex_circulator; //typedef typename @@ -40,7 +39,6 @@ public: return (p.has_on_bounded_side(*(q.vertices_begin())) || q.has_on_bounded_side(*(p.vertices_begin()))); //return true; - } void setTranslationPoint(const Point &t) { @@ -55,7 +53,6 @@ private: Polygon_2 &m_p; Polygon_2 &m_q; }; - } #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_node_mod.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_node_mod.h index 03003b4a387..e9aae70960e 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_node_mod.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_node_mod.h @@ -132,7 +132,6 @@ private: typedef AABB_node Self; AABB_node(const Self &src); Self &operator=(const Self &src); - }; // end class AABB_node template @@ -268,9 +267,7 @@ AABB_node::join_traversal(const AABB_node &other_node, other_node.right_child().join_traversal(*this, traits, 2, 3, !first_stationary); } } - } - } } @@ -317,11 +314,8 @@ AABB_node::join_traversal(const AABB_node &other_node, if (traits.go_further() && traits.do_intersect(right_child(), other_node.right_child(), !first_stationary)) { right_child().join_traversal(other_node.right_child(), traits, nb_primitives_this - nb_primitives_this / 2, nb_primitives_other - nb_primitives_other / 2, first_stationary); } - } - } - } // end namespace CGAL #endif // CGAL_AABB_NODE_H diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_segment_2_primitive.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_segment_2_primitive.h index 08f96e97bf3..31d65e872ea 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_segment_2_primitive.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_segment_2_primitive.h @@ -71,7 +71,6 @@ public: return m_datum.source(); } }; - } // end namespace CGAL #endif // CGAL_AABB_SEGMENT_PRIMITIVE_H_ diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_tree_mod.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_tree_mod.h index 725cf280ac1..62bf3515e11 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_tree_mod.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/AABB_tree_mod.h @@ -516,7 +516,6 @@ private: typedef AABB_tree Self; AABB_tree(const Self &src); Self &operator=(const Self &src); - }; // end class AABB_tree template @@ -735,7 +734,6 @@ AABB_tree::closest_point_and_primitive(const Point &query, this->traversal(query, distance_traits); return distance_traits.closest_point_and_primitive(); } - } // end namespace CGAL #endif // CGAL_AABB_TREE_H diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/Arr_SegmentData_traits.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/Arr_SegmentData_traits.h index d4fa1bd3198..542f1eb8534 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/Arr_SegmentData_traits.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/Arr_SegmentData_traits.h @@ -109,7 +109,6 @@ public: operator Base_p &() { return (m_base_pt); } - }; typedef Ex_point_2 Point_2; @@ -433,7 +432,6 @@ public: //if (xcv1.color() == RB_OVERLAP || xcv2.color() == RB_OVERLAP) return (oi); } - }; /*! Obtain an Intersect_2 functor object. */ @@ -853,6 +851,5 @@ public: // // //}; - }; #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/BounderyConvCalc.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/BounderyConvCalc.h index fdc1371e74f..602ec5413ab 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/BounderyConvCalc.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/BounderyConvCalc.h @@ -16,12 +16,10 @@ public: virtual void calc_sum(Polygon_2 &a, Polygon_2 &b, Polygon_2 &res_poly) { Segments_list reduced_conv; _mink->buildReducedConvolution(a, b, reduced_conv); - } private: Minkowski_sum_by_convolution_lien_2 *_mink; - }; #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/Graphics.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/Graphics.h index 432d8116434..93c1655cf4b 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/Graphics.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/Graphics.h @@ -38,7 +38,6 @@ public: to_file_double_x (p2.x()), to_file_double_y (p2.y())), QPen(color)); - } template void draw_edge(const typename K::Point_2 &p1, const typename K::Point_2 &p2, const QColor &color, const QColor &color2) { diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/IBounderySumCalculator.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/IBounderySumCalculator.h index 65501b75cd7..fffeb80348d 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/IBounderySumCalculator.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/IBounderySumCalculator.h @@ -11,7 +11,6 @@ protected: typedef CGAL::Polygon_2 Polygon_2; public: virtual void calc_sum(Polygon_2 &a, Polygon_2 &b, Polygon_2 &res_poly) = 0; - }; #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/Minkowski_sum_reduced_conv_2.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/Minkowski_sum_reduced_conv_2.h index 1066ed049d7..a0898dfc366 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/Minkowski_sum_reduced_conv_2.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/Minkowski_sum_reduced_conv_2.h @@ -59,7 +59,6 @@ struct Less_than_handle { /* struct Convseg_Less_than{ bool operator()(ConvS s1, Type s2) const { return (&(*s1) < &(*s2)); } - }; */ @@ -92,7 +91,6 @@ public: typedef Arr_my_extended_dcel other; }; - }; template @@ -228,7 +226,6 @@ public: bool operator==(const ConvSegment &rhs) const { return !Less_than_handle()(_he, rhs._he) && !Less_than_handle()(rhs._he, _he); } - }; #define FIRST_LOOP 0 @@ -236,7 +233,6 @@ public: Arrangement_history_2 *_arr; Minkowski_sum_by_convolution_lien_2 *_mink; ConvSegMapper(Arrangement_history_2 *arr, Minkowski_sum_by_convolution_lien_2 *mink): _arr(arr), _mink(mink) { - } ConvSegment getSegment(const Halfedge_handle &he) { @@ -349,7 +345,6 @@ public: removeSegFromArr(*itr); } } - }; class TraversalManager; @@ -377,7 +372,6 @@ public: /* if (outList.size()>1) { drawTraversal(); - }*/ if (checkCloseLoop()) { closeLoopEvent(filteredSegments); @@ -462,7 +456,6 @@ public: global_graphics->draw_edge((itr->_he)->curve(),QColor(0,255,0),true); } global_graphics->display(); - } */ @@ -506,7 +499,6 @@ public: startEdge = edges_db.getEdge(); traceLoop(edges_db, startEdge, false); } - } void traceLoop(EdgesStore &edgesDB, ConvSegment &startSeg, bool isOuter) { @@ -650,7 +642,6 @@ public: //std::list _nonLoopSegmentsList(*_segmentsList); _loopSegmentsList.splice(_loopSegmentsList.begin(), _nonLoopSegmentsList, loop_begin, ++loop_end); } - } bool hasLoops() { @@ -687,7 +678,6 @@ public: for (InputIterator itr = start; itr != end; ++itr) { _edgesSet->erase(*itr); } - } template void removeRange_bak(InputIterator start, InputIterator end) { @@ -719,7 +709,6 @@ public: friend class DegenerateCassesManager; struct DegenerateCassesManager { DegenerateCassesManager(Arrangement_history_2 *arr, Minkowski_sum_by_convolution_lien_2 *mink, Polygon_2 *poly1, Polygon_2 *poly2, bool isActive): _arr(arr), _mink(mink), _poly1(poly1), _poly2(poly2), _active(isActive) { - } /* @@ -744,7 +733,6 @@ public: } else { _mink->setEdgeDegenerate(*itr, false); } - } } @@ -803,7 +791,6 @@ public: for (; itr != _degenerate_points_list.end(); ++itr) { CGAL::insert_point(*_arr, *itr); - } } @@ -1075,7 +1062,6 @@ public: setEdgeVisited(*circ, true, 0); ++circ; } while (circ != circ_start); - } void markOutsideLoop(Arrangement_history_2 &arr, Polygon_2 &out_bound) { @@ -1089,7 +1075,6 @@ public: out_bound.push_back(circ->source()->point()); --circ; } while (circ != circ_start); - } /* void handleFace(Arrangement_history_2& arr,Face_handle itr,const Polygon_2& reverse_pgn1,const Polygon_2& pgn2) @@ -1121,7 +1106,6 @@ public: // pgn_hole.push_back (circ->source()->point()); --circ; }while (circ!=start); - }*/ template @@ -1166,7 +1150,6 @@ public: *holes = pgn_hole; ++holes; // } - } /*! @@ -1224,7 +1207,6 @@ public: for (int i = 0; i < (n1 - 1); ++i) { outVec[i] = f_direction(f_vector(pgn1[i], pgn1[i + 1])); - } outVec[n1 - 1] = f_direction(f_vector(pgn1[n1 - 1], pgn1[0])); @@ -1347,14 +1329,12 @@ public: prev_p2 = vert_p2; vert_p2 = next_p2; ++next_p2; - } prev_p1 = vert_p1; vert_p1 = next_p1; ++next_p1; } - } // Increse a cyclic integer counter with limit lim. @@ -1483,7 +1463,6 @@ public: } } } - } private: @@ -1504,7 +1483,6 @@ private: Halfedge_handle inside_face_edge = hi->twin(); Face_handle container_face = inside_face_edge->face(); - } */ /* @@ -1573,7 +1551,6 @@ private: int bla = holesEdges.size(); std::cout << "in holes: " << bla << "\n"; }*/ - } Hole_iterator hi; @@ -1620,7 +1597,6 @@ private: int bla = holesEdges.size(); std::cout << "in holes: " << bla << "\n"; }*/ - } // std::list semi_holes; @@ -1769,7 +1745,6 @@ private: Face_handle inside_face = inside_face_edge->face(); Faces_set visited_faces;*/ - } bool removeAllNonConformingLoops(Arrangement_history_2 &arr, Halfedge_handle &handle, bool inwards, std::list &holesEdges, const Polygon_2 &pgn1, const Polygon_2 &pgn2) const { @@ -1809,7 +1784,6 @@ private: } return false; - } Polygon_2 revPoly(const Polygon_2 &input) const { @@ -1830,13 +1804,11 @@ private: */ return out; - } /*void buildCollisionDetector(const Polygon_2& pgn1,const Polygon_2& pgn2) { q = revPoly(pgn2); - }*/ /*ICollisionDetector* getColDetect() const @@ -1934,7 +1906,6 @@ private: if (f_compare_x(best_edge_curve.min(), circ_curve.min()) != f_compare_x(best_edge_curve.max(), circ_curve.min())) { under_best = f_compare_y_at_x(circ_curve.min(), best_edge_curve) == SMALLER; - } else { under_best = f_compare_y_at_x(best_edge_curve.min(), circ_curve) != SMALLER; } @@ -2058,7 +2029,6 @@ private: for (itr = arr.edges_begin();itr!=arr.edges_end();++itr){ setEdgeVisited(*itr,false,-1); edges_set.insert(itr); - } // trace orientable loops: @@ -2074,7 +2044,6 @@ private: printHe(itr); }*/ //typename iterator_traits::value_type seg; - } bool checkDegenerateEdgeOppositeSegments(Arrangement_history_2 &arr, Halfedge_handle he) const { @@ -2092,7 +2061,6 @@ private: Direction_2 seg_dir = f_direction(f_vector(segment.source(), segment.target())); segments_dir_list.push_back(seg_dir); //Direction_2 start_he_dir = f_direction((f_vector(he->source()->point(),he->target()->point()))); - } //Direction_2 start_dir = segments_dir_list.begin(); @@ -2100,7 +2068,6 @@ private: typename std::list::iterator end = unique(segments_dir_list.begin(), segments_dir_list.end()); int i = distance(segments_dir_list.begin(), end); return i > 1; - } bool checkDegenarateVertexIsIntersectionOfThreeSegments(Arrangement_history_2 &arr, Vertex_handle vh) { @@ -2154,9 +2121,7 @@ private: //orig_segments_list.push_back(&(*segment_itr)); Direction_2 seg_dir = f_direction(f_vector(segment.source(), segment.target())); segments_dir_list.push_back(seg_dir); - } - } while (++itr != start); segments_dir_list.sort(); @@ -2197,7 +2162,6 @@ private: } else { inList.push_back(curr_edge); } - } while (++itr != start); } @@ -2274,20 +2238,17 @@ private: removeHalfEdgesArrPart(arr,edges_set,temp_segments,loop_start_handle); //removeHalfEdgesArrPart(arr,edges_set,temp_segments,curr_halfedge); nextLoop(temp_segments, arr,edges_set, curr_halfedge,start_halfedge,done,loop_counter); - } } } else { - } } } */ Halfedge_handle traverseNextHalfedge() { - } void traceOrientableLoops(Arrangement_history_2 &arr, Edges_set &edges_set) const { @@ -2335,7 +2296,6 @@ private: printHe(curr_halfedge); /*for (Originating_curve_iterator itr = arr.originating_curves_begin ( curr_halfedge);itr!=arr.originating_curves_end( curr_halfedge);++itr ){ Segment_2 segment = *itr; - }*/ /////////////////////////DEBUG //Segment_2 temp = curr_halfedge->curve(); @@ -2472,11 +2432,9 @@ private: } } } - } //printHe(curr_halfedge); - } void nextLoop(std::list &temp_segments, Arrangement_history_2 &arr, Edges_set &edges_set, Halfedge_iterator &curr_halfedge, Halfedge_iterator &start_halfedge, bool &isOrientable, int &loop_counter) const { @@ -2723,7 +2681,6 @@ private: next_edge_found = true; return itr->twin(); - } //bool isDirImproving(Direction_2& min_edge_dir,Direction_2& entering_dir,Direction_2& new_edge_dir) const @@ -2794,7 +2751,6 @@ private: if (start_seg_dir == start_he_dir) { return true; - } } @@ -2829,7 +2785,6 @@ private: if (same_dir) { return true; } - } return false; @@ -2864,7 +2819,6 @@ private: if (same_dir) { return true; } - } return false; @@ -2942,7 +2896,6 @@ private: for (Edge_iterator itr = arr.edges_begin(); itr != arr.edges_end(); ++itr) { printSegment(itr->curve()); //global_graphics->draw_edge(itr->curve(),c,true); - } // draw isolated vertices @@ -2962,11 +2915,8 @@ private: if (vit->is_isolated()) { //global_graphics->draw_cross(vit->point(),c2,0.1); } - } - } - }; template @@ -2987,7 +2937,6 @@ minkowski_sum_2_(const Polygon_2 &pgn1, sum_holes.begin(), sum_holes.end())); } - }; #endif diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/NaiveCollisionDetector.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/NaiveCollisionDetector.h index 39b825a92c6..d12e8f360f1 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/NaiveCollisionDetector.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/NaiveCollisionDetector.h @@ -47,14 +47,12 @@ public: if (intersect) return intersect; } - } if (p.bounded_side(*q.vertices_begin())== CGAL::ON_BOUNDED_SIDE || q.bounded_side(*p.vertices_begin())== CGAL::ON_BOUNDED_SIDE) return true; return intersect; */ - } }; diff --git a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/SweepCollisionDetection.h b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/SweepCollisionDetection.h index 7001cb0b63a..63313642636 100644 --- a/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/SweepCollisionDetection.h +++ b/Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/SweepCollisionDetection.h @@ -129,7 +129,6 @@ public: } //m_found_x = true; - } bool after_handle_event(Event *event , @@ -210,7 +209,6 @@ public: return true; } } - } } else { // Maybe a bug here when we have 2 overlap not overlapping and two outgoing which cause overlap. @@ -223,7 +221,6 @@ public: ++k; */ } - } return true; @@ -300,7 +297,6 @@ public: //if (xcv1.color() == RB_OVERLAP || xcv2.color() == RB_OVERLAP) return (oi); } - }; /*! Obtain an Intersect_2 functor object. */ @@ -350,7 +346,6 @@ public: operator Base_p &() { return (m_base_pt); } - }; typedef Ex_point_2 Point_2; @@ -482,7 +477,6 @@ public: return (Construct_max_vertex_2(((Base *)this)->construct_max_vertex_2_object())); } - }; template class SweepCollisionDetector : public ICollisionDetector< Kernel_, Container_> { @@ -539,7 +533,6 @@ public: edges.push_back(Colored_segment_2(*itr, Segment_Data(MY_RED, i, i + 1))); } } - } itr = q.edges_begin(); @@ -622,17 +615,13 @@ public: if (intersect) return intersect; } - } if (p.bounded_side(*q.vertices_begin())== CGAL::ON_BOUNDED_SIDE || q.bounded_side(*p.vertices_begin())== CGAL::ON_BOUNDED_SIDE) return true; return intersect; */ - } - }; - } #endif