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

- moved predicate files into the Apollonius_graph_2 subdir 

- moved the *.C files to Apollonius_graph_2/*_impl.h
- removed automatic template inclusion macros related to the *.C files
This commit is contained in:
Menelaos Karavelas 2006-05-25 11:28:23 +00:00
parent 045a61dbc6
commit ae6b0f6faa
30 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Apollonius_graph_2/changes.txt
View File

@ -1,3 +1,8 @@
25 May 2006: Menelaos Karavelas
- moved predicate files into the Apollonius_graph_2 subdir
- moved the *.C files to Apollonius_graph_2/*_impl.h
- removed automatic template inclusion macros related to the *.C files
2 May 2006: Menelaos Karavelas
- fixed bug in drawing routine of Parabola_segment_2; in somes cases
the drawing routine was producing some points twice. Thanks to

10
Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h
View File

@ -28,7 +28,7 @@
#include <boost/tuple/tuple.hpp>
#include <CGAL/Apollonius_graph_short_names_2.h>
#include <CGAL/Apollonius_graph_2/short_names_2.h>
#include <CGAL/Triangulation_2.h>
#include <CGAL/Triangulation_data_structure_2.h>
@ -37,9 +37,9 @@
#include <CGAL/in_place_edge_list.h>
#include <CGAL/Segment_Delaunay_graph_2/edge_list.h>
#include <CGAL/Apollonius_graph_traits_wrapper_2.h>
#include <CGAL/Apollonius_graph_2/Traits_wrapper_2.h>
#include <CGAL/Apollonius_graph_constructions_C2.h>
#include <CGAL/Apollonius_graph_2/Constructions_C2.h>
#include <CGAL/iterator.h>
#include <CGAL/Iterator_project.h>
@ -1337,9 +1337,7 @@ std::istream& operator>>(std::istream& is,
CGAL_END_NAMESPACE
#ifdef CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
#include <CGAL/Apollonius_graph_2.C>
#endif
#include <CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h>
#endif // CGAL_APOLLONIUS_GRAPH_2_H

0
Apollonius_graph_2/include/CGAL/Apollonius_graph_2.C → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h
View File

0
Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_2.C → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_hierarchy_2_impl.h
View File

0
Apollonius_graph_2/include/CGAL/predicates/Ag2_bounded_side_of_ccw_circle_C2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Bounded_side_of_ccw_circle_C2.h
View File

0
Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_weight_2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_weight_2.h
View File

0
Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_x_2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_x_2.h
View File

0
Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_y_2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Compare_y_2.h
View File

8
Apollonius_graph_2/include/CGAL/Apollonius_graph_constructions_C2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_C2.h
View File

@ -19,8 +19,8 @@
#ifndef CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_2_H
#define CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_2_H
#ifndef CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_2_H
#define CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_2_H
#include <CGAL/Parabola_segment_2.h>
#include <CGAL/Hyperbola_2.h>
@ -28,7 +28,7 @@
#include <CGAL/Hyperbola_ray_2.h>
#include <CGAL/Apollonius_graph_constructions_ftC2.h>
#include <CGAL/Apollonius_graph_2/Constructions_ftC2.h>
@ -427,4 +427,4 @@ public:
CGAL_END_NAMESPACE
#endif // CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_C2_H
#endif // CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_C2_H

6
Apollonius_graph_2/include/CGAL/Apollonius_graph_constructions_ftC2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_ftC2.h
View File

@ -19,8 +19,8 @@
#ifndef CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_FTC2_H
#define CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_FTC2_H
#ifndef CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_FTC2_H
#define CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_FTC2_H
#include <CGAL/determinant.h>
@ -180,4 +180,4 @@ ad_left_bitangent_lineC2(const FT &x1, const FT &y1, const FT &w1,
CGAL_END_NAMESPACE
#endif // CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_FTC2_H
#endif // CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_FTC2_H

8
Apollonius_graph_2/include/CGAL/Apollonius_graph_constructions_rtH2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Constructions_rtH2.h
View File

@ -19,12 +19,12 @@
#ifndef CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_RTH2_H
#define CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_RTH2_H
#ifndef CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_RTH2_H
#define CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_RTH2_H
#include <CGAL/determinant.h>
#include <CGAL/Apollonius_graph_constructions_ftC2.h>
#include <CGAL/Apollonius_graph_2/Constructions_ftC2.h>
CGAL_BEGIN_NAMESPACE
@ -80,4 +80,4 @@ ad_left_bitangent_lineH2(const FT &hx1, const FT &hy1, const We &w1,
CGAL_END_NAMESPACE
#endif // CGAL_APOLLONIUS_GRAPH_CONSTRUCTIONS_RTH2_H
#endif // CGAL_APOLLONIUS_GRAPH_2_CONSTRUCTIONS_RTH2_H

0
Apollonius_graph_2/include/CGAL/predicates/Ag2_finite_edge_test_C2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h
View File

0
Apollonius_graph_2/include/CGAL/predicates/Ag2_incircle_C2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Incircle_C2.h
View File

0
Apollonius_graph_2/include/CGAL/predicates/Ag2_infinite_edge_test_C2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Infinite_edge_test_C2.h
View File

0
Apollonius_graph_2/include/CGAL/predicates/Ag2_is_degenerate_edge_C2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_degenerate_edge_C2.h
View File

0
Apollonius_graph_2/include/CGAL/predicates/Ag2_is_hidden_C2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Is_hidden_C2.h
View File

8
Apollonius_graph_2/include/CGAL/Apollonius_graph_kernel_wrapper_2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Kernel_wrapper_2.h
View File

@ -19,10 +19,10 @@
#ifndef CGAL_APOLLONIUS_GRAPH_KERNEL_WRAPPER_2_H
#define CGAL_APOLLONIUS_GRAPH_KERNEL_WRAPPER_2_H
#ifndef CGAL_APOLLONIUS_GRAPH_2_KERNEL_WRAPPER_2_H
#define CGAL_APOLLONIUS_GRAPH_2_KERNEL_WRAPPER_2_H
#include <CGAL/Apollonius_graph_short_names_2.h>
#include <CGAL/Apollonius_graph_2/short_names_2.h>
#include <CGAL/Apollonius_site_2.h>
#include <CGAL/Cartesian_converter.h>
@ -80,4 +80,4 @@ public:
CGAL_END_NAMESPACE
#endif // CGAL_APOLLONIUS_GRAPH_KERNEL_WRAPPER_2_H
#endif // CGAL_APOLLONIUS_GRAPH_2_KERNEL_WRAPPER_2_H

0
Apollonius_graph_2/include/CGAL/predicates/Ag2_orientation_2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Orientation_2.h
View File

0
Apollonius_graph_2/include/CGAL/predicates/Ag2_oriented_side_of_bisector_C2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Oriented_side_of_bisector_C2.h
View File

0
Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicate_constructions_C2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Predicate_constructions_C2.h
View File

0
Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicates_C2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Predicates_C2.h
View File

0
Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_ftC2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Predicates_ftC2.h
View File

8
Apollonius_graph_2/include/CGAL/Apollonius_graph_traits_wrapper_2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Traits_wrapper_2.h
View File

@ -19,11 +19,11 @@
#ifndef CGAL_APOLLONIUS_GRAPH_TRAITS_WRAPPER_2_H
#define CGAL_APOLLONIUS_GRAPH_TRAITS_WRAPPER_2_H
#ifndef CGAL_APOLLONIUS_GRAPH_2_TRAITS_WRAPPER_2_H
#define CGAL_APOLLONIUS_GRAPH_2_TRAITS_WRAPPER_2_H
#include <CGAL/Apollonius_graph_short_names_2.h>
#include <CGAL/Apollonius_graph_2/short_names_2.h>
@ -49,4 +49,4 @@ public:
CGAL_END_NAMESPACE
#endif // CGAL_APOLLONIUS_GRAPH_TRAITS_WRAPPER_2_H
#endif // CGAL_APOLLONIUS_GRAPH_2_TRAITS_WRAPPER_2_H

0
Apollonius_graph_2/include/CGAL/predicates/check_filter.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/check_filter.h
View File

0
Apollonius_graph_2/include/CGAL/predicates/comparator_profiler.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/comparator_profiler.h
View File

0
Apollonius_graph_2/include/CGAL/predicates/compare_quadratic.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/compare_quadratic.h
View File

0
Apollonius_graph_2/include/CGAL/predicates/predicate_profiler.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/predicate_profiler.h
View File

6
Apollonius_graph_2/include/CGAL/Apollonius_graph_short_names_2.h → Apollonius_graph_2/include/CGAL/Apollonius_graph_2/short_names_2.h
View File

@ -19,8 +19,8 @@
#ifndef CGAL_APOLLONIUS_GRAPH_SHORT_NAMES_2_H
#define CGAL_APOLLONIUS_GRAPH_SHORT_NAMES_2_H
#ifndef CGAL_APOLLONIUS_GRAPH_2_SHORT_NAMES_2_H
#define CGAL_APOLLONIUS_GRAPH_2_SHORT_NAMES_2_H
#define Apollonius_site_2 As2
@ -35,4 +35,4 @@
#define Apollonius_graph_kernel_wrapper_2 Agkw2
#endif //CGAL_APOLLONIUS_GRAPH_SHORT_NAMES_2_H
#endif //CGAL_APOLLONIUS_GRAPH_2_SHORT_NAMES_2_H

8
Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_2.h
View File

@ -24,7 +24,7 @@
#include <map>
#include <CGAL/Apollonius_graph_short_names_2.h>
#include <CGAL/Apollonius_graph_2/short_names_2.h>
#include <CGAL/Random.h>
@ -34,7 +34,7 @@
#include <CGAL/Triangulation_face_base_2.h>
#include <CGAL/Apollonius_graph_hierarchy_vertex_base_2.h>
#include <CGAL/Apollonius_graph_traits_wrapper_2.h>
#include <CGAL/Apollonius_graph_2/Traits_wrapper_2.h>
CGAL_BEGIN_NAMESPACE
@ -347,9 +347,7 @@ std::istream& operator>>(std::istream& is,
CGAL_END_NAMESPACE
#ifdef CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
#include <CGAL/Apollonius_graph_hierarchy_2.C>
#endif
#include <CGAL/Apollonius_graph_2/Apollonius_graph_hierarchy_2_impl.h>
#endif // CGAL_APOLLONIUS_GRAPH_HIERARCHY_2_H

4
Apollonius_graph_2/include/CGAL/Apollonius_graph_traits_2.h
View File

@ -28,11 +28,11 @@
#endif // CGAL_REP_CLASS_DEFINED
#if defined CGAL_CARTESIAN_H || defined CGAL_SIMPLE_CARTESIAN_H
#include <CGAL/predicates/Apollonius_graph_ftC2.h>
#include <CGAL/Apollonius_graph_2/Predicates_ftC2.h>
#endif
#include <CGAL/Number_type_traits.h>
#include <CGAL/Apollonius_graph_kernel_wrapper_2.h>
#include <CGAL/Apollonius_graph_2/Kernel_wrapper_2.h>