songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed the curve from being a templated parameter of point_node 

and curve_node.
Updated the rest of the code accordingly.
This commit is contained in:
Tali Zvi 2002-11-03 13:51:25 +00:00
parent 7be4ae113a
commit 0497f28142
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Packages/Planar_map/include/CGAL/Planar_map_2.h
View File

@ -131,18 +131,18 @@ protected:
// sweep related types
typedef Pm_less_point_xy<Point, Traits> PointLessFunctor;
typedef typename X_curve_2_container::iterator X_curve_2_container_iterator;
typedef Point_plus_handle<Traits, Vertex_handle> Point_plus;
typedef Point_plus_handle<Traits, Vertex_handle>
Point_plus;
typedef typename std::map<Point_2, Point_plus, PointLessFunctor>
PointContainer;
typedef typename PointContainer::value_type PointContainer_value_type;
typedef typename PointContainer::iterator PointContainer_iterator;
typedef Pm_point_node<Traits, Point_plus, X_curve_2>
Point_node;
typedef Pm_point_node<Traits, Point_plus> Point_node;
typedef typename std::map<Point_2,Point_node, PointLessFunctor >
Event_queue;
typedef typename Event_queue::value_type Event_queue_value_type;
typedef typename Event_queue::iterator Event_queue_iterator;
typedef Pm_curve_node<Traits, Point_plus, X_curve> Curve_node_;
typedef Pm_curve_node<Traits, Point_plus> Curve_node_;
typedef typename Point_node::Curve_node_iterator
Curve_node_iterator;

23
Packages/Planar_map/include/CGAL/Pm_insert_utils.h
View File

@ -31,19 +31,19 @@
CGAL_BEGIN_NAMESPACE
template <class SweepLineTraits_2,
class Point_plus_,
class X_curve_plus_>
class Pm_curve_node : public Handle_for< X_curve_plus_ >
class Point_plus_>
class Pm_curve_node : public Handle_for< typename SweepLineTraits_2::X_curve >
{
typedef Handle_for<X_curve_plus_> Handle_for_curve;
typedef Pm_curve_node Self;
typedef SweepLineTraits_2 Traits;
typedef X_curve_plus_ X_curve_plus;
typedef typename Traits::X_curve X_curve;
typedef Handle_for<X_curve> Handle_for_curve;
typedef Pm_curve_node Self;
typedef Point_plus_ Point_plus;
public:
Pm_curve_node(const X_curve_plus& cv, const Point_plus& p, Traits* traits_) :
Pm_curve_node(const X_curve& cv, const Point_plus& p, Traits* traits_) :
Handle_for_curve(cv), m_point(p), m_traits(traits_)
{}
@ -57,8 +57,7 @@ class Pm_curve_node : public Handle_for< X_curve_plus_ >
bool operator!=(const Pm_curve_node& cv_node) const {
return !operator==(cv_node);
}
const X_curve_plus& get_curve() const {
const X_curve& get_curve() const {
return *ptr();
}
@ -84,8 +83,7 @@ class Pm_curve_node : public Handle_for< X_curve_plus_ >
compare_at_x and compare_at_x_right of the traits.
*/
template <class SweepLineTraits_2,
class Point_plus_,
class X_curve_plus_>
class Point_plus_>
class Pm_point_node
{
@ -97,9 +95,8 @@ class Pm_point_node
typedef typename Traits::Point Point;
typedef Point_plus_ Point_plus;
typedef X_curve_plus_ X_curve_plus;
typedef Pm_curve_node<SweepLineTraits_2,Point_plus_,X_curve_plus_>
typedef Pm_curve_node<SweepLineTraits_2,Point_plus_>
Curve_node_;
typedef std::vector<Curve_node_> Curve_node_container;
typedef typename Curve_node_container::iterator Curve_node_iterator;