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

make changes towards removing types from the traits class and also 

to comply with Nested_iterator
This commit is contained in:
Menelaos Karavelas 2003-05-07 08:14:34 +00:00
parent 50dd8d3d1e
commit 970756df1a
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h
View File

@ -153,7 +153,7 @@ protected:
}
protected:
// Less_than comparator for weights of weighted points;
// Less_than comparator for site weights;
// used to sort sites by decreasing weight when a sequence of sites
// is inserted
class Site_less_than_comparator
@ -587,7 +587,7 @@ public:
protected:
template < class Stream >
Stream& draw_dual_weighted_points(Stream &str) const
Stream& draw_dual_sites(Stream &str) const
{
All_faces_iterator fit = all_faces_begin();
for (; fit != all_faces_end(); ++fit) {
@ -633,7 +633,6 @@ public:
// MK: THE FOLLOWING ARE NOT IN THE SPEC
//======================================
// Primal
// Weighted_point primal(const Face_handle& f) const;
typename Gt::Object_2 primal(const Edge e) const;
typename Gt::Object_2 primal(const Edge_circulator& ec) const {
return primal(*ec);

20
Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_euclidean_traits_2.h
View File

@ -28,7 +28,6 @@
#define CGAL_APOLLONIUS_GRAPH_EUCLIDEAN_TRAITS_2_H
#include <CGAL/Triangulation_euclidean_traits_2.h>
#include <CGAL/Weighted_point.h>
#include <CGAL/Parabola_segment_2.h>
#include <CGAL/Hyperbola_2.h>
#include <CGAL/Hyperbola_segment_2.h>
@ -55,9 +54,10 @@
#include <CGAL/Kernel_traits.h>
#include <CGAL/Number_type_traits.h>
#include <CGAL/Apollonius_graph_kernel_wrapper_2.h>
#include <CGAL/Apollonius_graph_euclidean_traits_2.C>
#include <CGAL/Apollonius_graph_kernel_wrapper_2.h>
#define KEEP_MOST_TYPES_IN_TRAITS 1
@ -111,7 +111,7 @@ public:
// CONSTRUCTIONS
//--------------
// vertex and weighted point
// vertex and dual site
typedef CGAL::Construct_Apollonius_vertex_2<Kernel>
/* */ Construct_Apollonius_vertex_2;
typedef CGAL::Construct_Apollonius_site_2<Kernel>
@ -273,8 +273,6 @@ class Apollonius_graph_euclidean_traits_2<
Filtered_kernel<_CK,_EK,_FK,_C2E,_C2F>, MTag>
{
private:
// add the wrappers; these should be removed once weighted points
// find their way into the kernel
typedef Apollonius_graph_kernel_wrapper_2<_CK> CK;
typedef Apollonius_graph_kernel_wrapper_2<_EK> EK;
typedef Apollonius_graph_kernel_wrapper_2<_FK> FK;
@ -308,11 +306,11 @@ public:
public:
// CONSTRUCTIONS
//--------------
// vertex and weighted point
// vertex and dual site
typedef CGAL::Construct_Apollonius_vertex_2<Kernel>
/* */ Construct_Apollonius_vertex_2;
typedef CGAL::Construct_Apollonius_weighted_point_2<Kernel>
/* */ Construct_Apollonius_weighted_point_2;
typedef CGAL::Construct_Apollonius_site_2<Kernel>
/* */ Construct_Apollonius_site_2;
// bisectors and subsets
typedef CGAL::Construct_Apollonius_bisector_2<Kernel>
@ -401,9 +399,9 @@ public:
return Construct_Apollonius_vertex_2();
}
inline Construct_Apollonius_weighted_point_2
construct_Apollonius_weighted_point_2_object() const {
return Construct_Apollonius_weighted_point_2();
inline Construct_Apollonius_site_2
construct_Apollonius_site_2_object() const {
return Construct_Apollonius_site_2();
}
inline Construct_Apollonius_bisector_2

8
Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_vertex_base_2.h
View File

@ -37,16 +37,16 @@ CGAL_BEGIN_NAMESPACE
template <class AGVB2_Iterator>
struct Apollonius_graph_vertex_base_nested_iterator_traits
{
typedef AGVB2_Iterator Base_iterator;
typedef AGVB2_Iterator Base_iterator;
typedef typename
Base_iterator::value_type::Hidden_sites_iterator Nested_iterator;
Base_iterator::value_type::Hidden_sites_iterator Iterator;
Nested_iterator begin(Base_iterator it) const
Iterator begin(Base_iterator it) const
{
return it->hidden_sites_begin();
}
Nested_iterator end(Base_iterator it) const
Iterator end(Base_iterator it) const
{
return it->hidden_sites_end();
}