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

removal of orientation L2 from traits 

Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
This commit is contained in:
Panagiotis Cheilaris 2013-02-19 20:02:31 +01:00
parent ab6dcab6ea
commit e7edff87ca
3 changed files with 18 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Filtered_traits_base_2.h
View File

@ -233,7 +233,6 @@ private:
// Predicates for the filtering kernel
typedef typename FK_traits::Compare_x_2 FK_Compare_x_2;
typedef typename FK_traits::Compare_y_2 FK_Compare_y_2;
typedef typename FK_traits::Orientation_L2_2 FK_Orientation_L2_2;
typedef typename FK_traits::Orientation_2 FK_Orientation_2;
typedef typename FK_traits::Equal_2 FK_Equal_2;
typedef typename FK_traits::Are_parallel_2 FK_Are_parallel_2;
@ -258,7 +257,6 @@ private:
// Predicates for the exact kernel
typedef typename EK_traits::Compare_x_2 EK_Compare_x_2;
typedef typename EK_traits::Compare_y_2 EK_Compare_y_2;
typedef typename EK_traits::Orientation_L2_2 EK_Orientation_L2_2;
typedef typename EK_traits::Orientation_2 EK_Orientation_2;
typedef typename EK_traits::Equal_2 EK_Equal_2;
typedef typename EK_traits::Are_parallel_2 EK_Are_parallel_2;
@ -284,7 +282,6 @@ private:
// Predicates for the filtering kernel
typedef Sdg_compare_x_2<FK> FK_Compare_x_2;
typedef Sdg_compare_y_2<FK> FK_Compare_y_2;
typedef Sdg_orientation_L2_C2<FK> FK_Orientation_L2_2;
typedef Sdg_orientation_C2<FK> FK_Orientation_2;
typedef Sdg_are_same_points_C2<FK> FK_Equal_2;
typedef Sdg_are_parallel_C2<FK> FK_Are_parallel_2;
@ -307,7 +304,6 @@ private:
// Predicates for the exact kernel
typedef Sdg_compare_x_2<EK> EK_Compare_x_2;
typedef Sdg_compare_y_2<EK> EK_Compare_y_2;
typedef Sdg_orientation_L2_C2<EK> EK_Orientation_L2_2;
typedef Sdg_orientation_C2<EK> EK_Orientation_2;
typedef Sdg_are_same_points_C2<EK> EK_Equal_2;
typedef Sdg_are_parallel_C2<EK> EK_Are_parallel_2;
@ -339,10 +335,6 @@ public:
//Filtered_predicate<EK_Compare_y_2, FK_Compare_y_2, C2E, C2F>
//Compare_y_2;
typedef
Filtered_predicate<EK_Orientation_L2_2, FK_Orientation_L2_2, C2E, C2F>
Orientation_L2_2;
typedef
Filtered_predicate<EK_Orientation_2, FK_Orientation_2, C2E, C2F>
Orientation_2;
@ -449,15 +441,10 @@ public:
// return Compare_y_2();
//}
Orientation_L2_2
orientation_L2_2_object() const {
return Orientation_L2_2();
}
Orientation_2
orientation_2_object() const {
return Orientation_2();
}
//Orientation_2
//orientation_2_object() const {
// return Orientation_2();
//}
//Equal_2
//equal_2_object() const {

27
Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Filtered_traits_base_hv_2.h
View File

@ -207,7 +207,6 @@ private:
// Predicates for the filtering kernel
typedef typename FK_traits::Compare_x_2 FK_Compare_x_2;
typedef typename FK_traits::Compare_y_2 FK_Compare_y_2;
typedef typename FK_traits::Orientation_L2_2 FK_Orientation_L2_2;
typedef typename FK_traits::Orientation_2 FK_Orientation_2;
typedef typename FK_traits::Equal_2 FK_Equal_2;
typedef typename FK_traits::Are_parallel_2 FK_Are_parallel_2;
@ -232,7 +231,6 @@ private:
// Predicates for the exact kernel
typedef typename EK_traits::Compare_x_2 EK_Compare_x_2;
typedef typename EK_traits::Compare_y_2 EK_Compare_y_2;
typedef typename EK_traits::Orientation_L2_2 EK_Orientation_L2_2;
typedef typename EK_traits::Orientation_2 EK_Orientation_2;
typedef typename EK_traits::Equal_2 EK_Equal_2;
typedef typename EK_traits::Are_parallel_2 EK_Are_parallel_2;
@ -258,7 +256,6 @@ private:
// Predicates for the filtering kernel
typedef Sdg_compare_x_2<FK> FK_Compare_x_2;
typedef Sdg_compare_y_2<FK> FK_Compare_y_2;
typedef Sdg_orientation_L2_C2<FK> FK_Orientation_L2_2;
typedef Sdg_orientation_C2<FK> FK_Orientation_2;
typedef Sdg_are_same_points_C2<FK> FK_Equal_2;
typedef Sdg_are_parallel_C2<FK> FK_Are_parallel_2;
@ -281,7 +278,6 @@ private:
// Predicates for the exact kernel
typedef Sdg_compare_x_2<EK> EK_Compare_x_2;
typedef Sdg_compare_y_2<EK> EK_Compare_y_2;
typedef Sdg_orientation_L2_C2<EK> EK_Orientation_L2_2;
typedef Sdg_orientation_C2<EK> EK_Orientation_2;
typedef Sdg_are_same_points_C2<EK> EK_Equal_2;
typedef Sdg_are_parallel_C2<EK> EK_Are_parallel_2;
@ -313,13 +309,9 @@ public:
//Filtered_predicate<EK_Compare_y_2, FK_Compare_y_2, C2E, C2F>
//Compare_y_2;
typedef
Filtered_predicate<EK_Orientation_L2_2, FK_Orientation_L2_2, C2E, C2F>
Orientation_L2_2;
typedef
Filtered_predicate<EK_Orientation_2, FK_Orientation_2, C2E, C2F>
Orientation_2;
//typedef
//Filtered_predicate<EK_Orientation_2, FK_Orientation_2, C2E, C2F>
//Orientation_2;
//typedef
//Filtered_predicate<EK_Equal_2, FK_Equal_2, C2E, C2F>
@ -423,15 +415,10 @@ public:
// return Compare_y_2();
//}
Orientation_L2_2
orientation_L2_2_object() const {
return Orientation_L2_2();
}
Orientation_2
orientation_2_object() const {
return Orientation_2();
}
//Orientation_2
//orientation_2_object() const {
// return Orientation_2();
//}
//Equal_2
//equal_2_object() const {

21
Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Traits_base_2.h
View File

@ -49,14 +49,11 @@ public:
// PREDICATES
//-----------
typedef
CGAL_SEGMENT_DELAUNAY_GRAPH_2_NS::Orientation_C2<K>
Orientation_L2_2;
// used by triangulation
typedef
CGAL_SEGMENT_DELAUNAY_GRAPH_LINF_2_NS::Orientation_Linf_C2<K>
Orientation_2;
//typedef
//CGAL_SEGMENT_DELAUNAY_GRAPH_LINF_2_NS::Orientation_Linf_C2<K>
//Orientation_2;
typedef
CGAL_SEGMENT_DELAUNAY_GRAPH_LINF_2_NS::Oriented_side_of_bisector_C2<K,MTag>
@ -97,15 +94,11 @@ public:
// PREDICATES
//-----------
Orientation_L2_2
orientation_L2_2_object() const {
return Orientation_L2_2();
}
Orientation_2
orientation_2_object() const {
return Orientation_2();
}
//Orientation_2
//orientation_2_object() const {
// return Orientation_2();
//}
Oriented_side_of_bisector_2
oriented_side_of_bisector_2_object() const {