mirror of https://github.com/CGAL/cgal
changed Apollonius_site_2 to Site_2 in examples
This commit is contained in:
parent
ad02a802b6
commit
94e331f049
|
|
@ -63,7 +63,7 @@ CGAL::Apollonius_graph_euclidean_traits_2<Rep,CGAL::Ring_tag> Gt;
|
|||
|
||||
typedef Gt::Point_2 Point_2;
|
||||
typedef Rep::Circle_2 Circle_2;
|
||||
typedef Gt::Apollonius_site_2 Apollonius_site_2;
|
||||
typedef Gt::Site_2 Apollonius_site_2;
|
||||
typedef Gt::Kernel::RT Weight;
|
||||
|
||||
//typedef CGAL::Apollonius_graph_2<Gt> AG_2;
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ int main()
|
|||
assert( ifs );
|
||||
|
||||
Apollonius_graph ag;
|
||||
Apollonius_graph::Apollonius_site_2 site;
|
||||
Apollonius_graph::Site_2 site;
|
||||
|
||||
// read the weighted points and insert them in the Apollonius graph
|
||||
while ( ifs >> site ) {
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ int main()
|
|||
assert( ifs );
|
||||
|
||||
Apollonius_graph ag;
|
||||
Apollonius_graph::Apollonius_site_2 site;
|
||||
Apollonius_graph::Site_2 site;
|
||||
|
||||
// read the weighted points and insert them in the Apollonius graph
|
||||
while ( ifs >> site ) {
|
||||
|
|
|
|||
|
|
@ -26,15 +26,22 @@ typedef CGAL::Filtered_kernel<CK> Kernel;
|
|||
// typedefs for the traits and the algorithm
|
||||
|
||||
#include <CGAL/Apollonius_graph_2.h>
|
||||
#include <CGAL/Apollonius_graph_data_structure_2.h>
|
||||
#include <CGAL/Apollonius_graph_vertex_base_2.h>
|
||||
#include <CGAL/Apollonius_graph_face_base_2.h>
|
||||
#include <CGAL/Apollonius_graph_euclidean_traits_2.h>
|
||||
|
||||
typedef CGAL::Apollonius_graph_euclidean_traits_2<Kernel> Traits;
|
||||
|
||||
// with the second template argument being false, we indicate that
|
||||
// there is no need to store that hidden weighted points;
|
||||
// with the second template argument in the vertex base class being
|
||||
// false, we indicate that there is no need to store that hidden
|
||||
// weighted points;
|
||||
// one case where this is indeed not needed is when we only do
|
||||
// insertions, like in the main program below.
|
||||
typedef CGAL::Apollonius_graph_2<Traits,false> Apollonius_graph;
|
||||
typedef CGAL::Apollonius_graph_vertex_base_2<Traits,false> Vb;
|
||||
typedef CGAL::Apollonius_graph_face_base_2<Traits> Fb;
|
||||
typedef CGAL::Apollonius_graph_data_structure_2<Vb,Fb> Agds;
|
||||
typedef CGAL::Apollonius_graph_2<Traits,Agds> Apollonius_graph;
|
||||
|
||||
|
||||
|
||||
|
|
@ -44,7 +51,7 @@ int main()
|
|||
assert( ifs );
|
||||
|
||||
Apollonius_graph ag;
|
||||
Apollonius_graph::Apollonius_site_2 site;
|
||||
Apollonius_graph::Site_2 site;
|
||||
|
||||
// read the weighted points and insert them in the Apollonius graph
|
||||
while ( ifs >> site ) {
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ int main()
|
|||
assert( ifs );
|
||||
|
||||
Apollonius_graph ag;
|
||||
Apollonius_graph::Apollonius_site_2 site;
|
||||
Apollonius_graph::Site_2 site;
|
||||
|
||||
// read the weighted points and insert them in the Apollonius graph
|
||||
while ( ifs >> site ) {
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
|
||||
#include <CGAL/Iterator_project.h>
|
||||
#include <CGAL/Nested_iterator.h>
|
||||
#include <CGAL/Combined_iterator.h>
|
||||
#include <CGAL/Concatenate_iterator.h>
|
||||
|
||||
|
||||
CGAL_BEGIN_NAMESPACE
|
||||
|
|
@ -117,8 +117,8 @@ public:
|
|||
Hidden_sites_nested_iterator_traits>
|
||||
/* */ Hidden_sites_iterator;
|
||||
|
||||
typedef Combined_iterator<Visible_sites_iterator,
|
||||
Hidden_sites_iterator> Sites_iterator;
|
||||
typedef Concatenate_iterator<Visible_sites_iterator,
|
||||
Hidden_sites_iterator> Sites_iterator;
|
||||
|
||||
typedef Site_2 value_type; // to have a back_inserter
|
||||
typedef const value_type& const_reference;
|
||||
|
|
|
|||
Loading…
Reference in New Issue