mirror of https://github.com/CGAL/cgal
new version of filtered traits using predicates based on Uncertain<>
This commit is contained in:
Menelaos Karavelas
parent
c398d68f86
commit
8059590bee
|
|
@ -53,6 +53,7 @@ Apollonius_graph_2/doc_tex/Apollonius_graph_2_ref/insert_degree_2.gif -text svne
|
|||
Apollonius_graph_2/doc_tex/Apollonius_graph_2_ref/insert_degree_2.png -text svneol=unset#image/png
|
||||
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_new_filtered_traits_2.h -text
|
||||
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/new_traits/Apollonius_graph_new_traits_2.h -text
|
||||
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Apollonius_graph_uncertain_filtered_traits_2.h -text
|
||||
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/uncertain/Uncertain_vertex_conflict_2.h -text
|
||||
Apollonius_graph_2/test/Apollonius_graph_2/test_ag_new_traits_2.cpp -text
|
||||
Approximate_min_ellipsoid_d/documentation/boundingbox.mw -text svneol=native#application/octet-stream
|
||||
|
|
|
|||
|
|
@ -0,0 +1,467 @@
|
|||
// Copyright (c) 2003,2004 INRIA Sophia-Antipolis (France).
|
||||
// All rights reserved.
|
||||
//
|
||||
// This file is part of CGAL (www.cgal.org); you may redistribute it under
|
||||
// the terms of the Q Public License version 1.0.
|
||||
// See the file LICENSE.QPL distributed with CGAL.
|
||||
//
|
||||
// Licensees holding a valid commercial license may use this file in
|
||||
// accordance with the commercial license agreement provided with the software.
|
||||
//
|
||||
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
||||
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
//
|
||||
// $URL: svn+ssh://mkaravel@scm.gforge.inria.fr/svn/cgal/trunk/Apollonius_graph_2/include/CGAL/Apollonius_graph_filtered_traits_2.h $
|
||||
// $Id: Apollonius_graph_filtered_traits_2.h 28567 2006-02-16 14:30:13Z lsaboret $
|
||||
//
|
||||
//
|
||||
// Author(s) : Menelaos Karavelas <mkaravel@cse.nd.edu>
|
||||
|
||||
|
||||
|
||||
#ifndef CGAL_APOLLONIUS_GRAPH_UNCERTAIN_FILTERED_TRAITS_2_H
|
||||
#define CGAL_APOLLONIUS_GRAPH_UNCERTAIN_FILTERED_TRAITS_2_H
|
||||
|
||||
|
||||
#include <CGAL/Apollonius_graph_traits_2.h>
|
||||
|
||||
#include <CGAL/Filtered_predicate.h>
|
||||
#include <CGAL/Filtered_construction.h>
|
||||
|
||||
// includes for the default parameters of the filtered traits
|
||||
#include <CGAL/Simple_cartesian.h>
|
||||
#include <CGAL/MP_Float.h>
|
||||
#include <CGAL/Interval_arithmetic.h>
|
||||
#include <CGAL/Cartesian_converter.h>
|
||||
#include <CGAL/number_utils_classes.h>
|
||||
|
||||
|
||||
// new includes
|
||||
|
||||
#include <CGAL/Apollonius_graph_2/My_filtered_predicate.h>
|
||||
#include <CGAL/Apollonius_graph_2/Uncertain_is_hidden_C2.h>
|
||||
#include <CGAL/Apollonius_graph_2/Uncertain_oriented_side_of_bisector_C2.h>
|
||||
#include <CGAL/Apollonius_graph_2/Uncertain_vertex_conflict_2.h>
|
||||
|
||||
|
||||
CGAL_BEGIN_NAMESPACE
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
//-----------------------------------------------------------------------
|
||||
//-----------------------------------------------------------------------
|
||||
//-----------------------------------------------------------------------
|
||||
// the filtered Traits class
|
||||
//-----------------------------------------------------------------------
|
||||
//-----------------------------------------------------------------------
|
||||
//-----------------------------------------------------------------------
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
|
||||
#if defined(__sun) && defined(__SUNPRO_CC)
|
||||
// workaround for the Sun CC-5.30 compiler; it does not like default
|
||||
// template parameters that are themselves templates and have
|
||||
// templated classes as parameters, which have then nested types as
|
||||
// arguments... oooof!!!
|
||||
//
|
||||
// In case you did understand what I just described you are most
|
||||
// probably crazy... If you did not, look below to see what kind of
|
||||
// code CC-5.30 did not like.
|
||||
namespace CGALi {
|
||||
|
||||
template<class CK, class FK>
|
||||
struct AG_SUNPRO_CC_Interval_converter
|
||||
: public Cartesian_converter<CK, FK,
|
||||
To_interval< typename CK::RT > >
|
||||
{
|
||||
};
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
template<class CK_t,
|
||||
class CK_MTag = Ring_tag,
|
||||
class EK_t = Simple_cartesian< MP_Float >,
|
||||
class EK_MTag = CK_MTag,
|
||||
class FK_t = Simple_cartesian< Interval_nt<false> >,
|
||||
class FK_MTag = CK_MTag,
|
||||
class C2E_t = Cartesian_converter<CK_t, EK_t>,
|
||||
#if defined(__sun) && defined(__SUNPRO_CC)
|
||||
class C2F_t = CGALi::AG_SUNPRO_CC_Interval_converter<CK_t, FK_t> >
|
||||
#else
|
||||
class C2F_t =
|
||||
Cartesian_converter<CK_t, FK_t, To_interval<typename CK_t::RT> > >
|
||||
#endif
|
||||
class Apollonius_graph_filtered_traits_2
|
||||
{
|
||||
private:
|
||||
typedef Apollonius_graph_traits_2<CK_t, CK_MTag> CK_traits;
|
||||
typedef Apollonius_graph_traits_2<FK_t, FK_MTag> FK_traits;
|
||||
typedef Apollonius_graph_traits_2<EK_t, EK_MTag> EK_traits;
|
||||
|
||||
typedef Apollonius_graph_kernel_wrapper_2<CK_t> CK;
|
||||
typedef Apollonius_graph_kernel_wrapper_2<FK_t> FK;
|
||||
typedef Apollonius_graph_kernel_wrapper_2<EK_t> EK;
|
||||
|
||||
typedef
|
||||
Apollonius_graph_cartesian_converter<CK, EK, C2E_t> C2E;
|
||||
typedef
|
||||
Apollonius_graph_cartesian_converter<CK, FK, C2F_t> C2F;
|
||||
|
||||
#if 0
|
||||
// the following typedefs have been made in the direction of
|
||||
// providing filtered constructions; however, there is a problem,
|
||||
// namely, the Construct_Apollonius_site_2 functor has two
|
||||
// different operator()'s with two different return types; this
|
||||
// functor should be split in two (along with the appropriate
|
||||
// changes in the spec/concept); see also changes needed for the
|
||||
// filtered construction below.
|
||||
typedef Cartesian_converter<FK, CK, To_double<typename FK::RT> > F2C_t;
|
||||
typedef Cartesian_converter<EK, CK, To_double<typename EK::RT> > E2C_t;
|
||||
|
||||
typedef
|
||||
Apollonius_graph_cartesian_converter<FK, CK, F2C_t> F2C;
|
||||
typedef
|
||||
Apollonius_graph_cartesian_converter<EK, CK, E2C_t> E2C;
|
||||
#endif
|
||||
|
||||
// Types for the construction kernel
|
||||
typedef typename CK::Point_2 CK_Point_2;
|
||||
typedef typename CK::Site_2 CK_Site_2;
|
||||
|
||||
typedef typename CK::Line_2 CK_Line_2;
|
||||
typedef typename CK::Ray_2 CK_Ray_2;
|
||||
typedef typename CK::Segment_2 CK_Segment_2;
|
||||
|
||||
typedef typename CK::FT CK_FT;
|
||||
typedef typename CK::RT CK_RT;
|
||||
|
||||
// Types for the exact kernel
|
||||
typedef typename EK::Point_2 EK_Point_2;
|
||||
typedef typename EK::Site_2 EK_Site_2;
|
||||
|
||||
typedef typename EK::Line_2 EK_Line_2;
|
||||
typedef typename EK::Ray_2 EK_Ray_2;
|
||||
typedef typename EK::Segment_2 EK_Segment_2;
|
||||
|
||||
typedef typename EK::FT EK_FT;
|
||||
typedef typename EK::RT EK_RT;
|
||||
|
||||
// Types for the filtering kernel
|
||||
typedef typename FK::Point_2 FK_Point_2;
|
||||
typedef typename FK::Site_2 FK_Site_2;
|
||||
|
||||
typedef typename FK::Line_2 FK_Line_2;
|
||||
typedef typename FK::Ray_2 FK_Ray_2;
|
||||
typedef typename FK::Segment_2 FK_Segment_2;
|
||||
|
||||
typedef typename FK::FT FK_FT;
|
||||
typedef typename FK::RT FK_RT;
|
||||
|
||||
public:
|
||||
//-----------------------------------------------------------------------
|
||||
// TYPE DEFINITIONS
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
// BASIC TYPES
|
||||
//------------
|
||||
typedef CK_t R;
|
||||
typedef CK_MTag Method_tag;
|
||||
|
||||
typedef CK_traits Construction_traits;
|
||||
typedef FK_traits Filtering_traits;
|
||||
typedef EK_traits Exact_traits;
|
||||
|
||||
typedef CK_MTag Construction_traits_method_tag;
|
||||
typedef FK_MTag Filtering_traits_method_tag;
|
||||
typedef EK_MTag Exact_traits_method_tag;
|
||||
|
||||
typedef typename CK::Point_2 Point_2;
|
||||
typedef typename CK::Site_2 Site_2;
|
||||
|
||||
typedef typename CK::Line_2 Line_2;
|
||||
typedef typename CK::Ray_2 Ray_2;
|
||||
typedef typename CK::Segment_2 Segment_2;
|
||||
|
||||
typedef typename CK::Object_2 Object_2;
|
||||
typedef typename CK::FT FT;
|
||||
typedef typename CK::RT RT;
|
||||
|
||||
|
||||
public:
|
||||
// OBJECT CONSTRUCTION & ASSIGNMENT
|
||||
//---------------------------------
|
||||
typedef typename CK_traits::Construct_object_2 Construct_object_2;
|
||||
typedef typename CK_traits::Assign_2 Assign_2;
|
||||
|
||||
// CONSTRUCTIONS
|
||||
//--------------
|
||||
// vertex and dual site
|
||||
protected:
|
||||
typedef typename CK_traits::Construct_Apollonius_vertex_2
|
||||
CK_Construct_Apollonius_vertex_2;
|
||||
|
||||
typedef typename CK_traits::Construct_Apollonius_site_2
|
||||
CK_Construct_Apollonius_site_2;
|
||||
|
||||
typedef typename FK_traits::Construct_Apollonius_vertex_2
|
||||
FK_Construct_Apollonius_vertex_2;
|
||||
|
||||
typedef typename FK_traits::Construct_Apollonius_site_2
|
||||
FK_Construct_Apollonius_site_2;
|
||||
|
||||
typedef typename EK_traits::Construct_Apollonius_vertex_2
|
||||
EK_Construct_Apollonius_vertex_2;
|
||||
|
||||
typedef typename EK_traits::Construct_Apollonius_site_2
|
||||
EK_Construct_Apollonius_site_2;
|
||||
|
||||
public:
|
||||
#if 0
|
||||
// the following typedefs have been made in the direction of
|
||||
// providing filtered constructions; however, there is a problem,
|
||||
// namely, the Construct_Apollonius_site_2 functor has two
|
||||
// different operator()'s with two different return types; this
|
||||
// functor should be split in two (along with the appropriate
|
||||
// changes in the spec/concept); see also changes needed for the
|
||||
// filtered construction above.
|
||||
typedef Filtered_construction<CK_Construct_Apollonius_vertex_2,
|
||||
EK_Construct_Apollonius_vertex_2,
|
||||
FK_Construct_Apollonius_vertex_2,
|
||||
C2E, C2F, E2C, F2C>
|
||||
Construct_Apollonius_vertex_2;
|
||||
|
||||
typedef Filtered_construction<CK_Construct_Apollonius_site_2,
|
||||
EK_Construct_Apollonius_site_2,
|
||||
FK_Construct_Apollonius_site_2,
|
||||
C2E, C2F, E2C, F2C>
|
||||
Construct_Apollonius_site_2;
|
||||
#else
|
||||
typedef typename CK_traits::Construct_Apollonius_vertex_2
|
||||
Construct_Apollonius_vertex_2;
|
||||
|
||||
typedef typename CK_traits::Construct_Apollonius_site_2
|
||||
Construct_Apollonius_site_2;
|
||||
#endif
|
||||
|
||||
private:
|
||||
// PREDICATES FOR THE TWO KERNELS
|
||||
//-------------------------------
|
||||
|
||||
#if 0
|
||||
// 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::Compare_weight_2 FK_Compare_weight_2;
|
||||
typedef typename FK_traits::Orientation_2 FK_Orientation_2;
|
||||
typedef typename FK_traits::Is_hidden_2 FK_Is_hidden_2;
|
||||
|
||||
typedef typename FK_traits::Oriented_side_of_bisector_2
|
||||
FK_Oriented_side_of_bisector_2;
|
||||
|
||||
typedef typename FK_traits::Vertex_conflict_2 FK_Vertex_conflict_2;
|
||||
|
||||
typedef typename FK_traits::Finite_edge_interior_conflict_2
|
||||
FK_Finite_edge_interior_conflict_2;
|
||||
|
||||
typedef typename FK_traits::Infinite_edge_interior_conflict_2
|
||||
FK_Infinite_edge_interior_conflict_2;
|
||||
|
||||
typedef typename FK_traits::Is_degenerate_edge_2
|
||||
FK_Is_degenerate_edge_2;
|
||||
|
||||
|
||||
// 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::Compare_weight_2 EK_Compare_weight_2;
|
||||
typedef typename EK_traits::Orientation_2 EK_Orientation_2;
|
||||
typedef typename EK_traits::Is_hidden_2 EK_Is_hidden_2;
|
||||
|
||||
typedef typename EK_traits::Oriented_side_of_bisector_2
|
||||
EK_Oriented_side_of_bisector_2;
|
||||
|
||||
typedef typename EK_traits::Vertex_conflict_2 EK_Vertex_conflict_2;
|
||||
|
||||
typedef typename EK_traits::Finite_edge_interior_conflict_2
|
||||
EK_Finite_edge_interior_conflict_2;
|
||||
|
||||
typedef typename EK_traits::Infinite_edge_interior_conflict_2
|
||||
EK_Infinite_edge_interior_conflict_2;
|
||||
|
||||
typedef typename EK_traits::Is_degenerate_edge_2
|
||||
EK_Is_degenerate_edge_2;
|
||||
#else
|
||||
// Predicates for the filtering kernel
|
||||
typedef Ag2_compare_x_2<FK> FK_Compare_x_2;
|
||||
typedef Ag2_compare_y_2<FK> FK_Compare_y_2;
|
||||
typedef Ag2_compare_weight_2<FK> FK_Compare_weight_2;
|
||||
typedef Ag2_orientation_2<FK,FK_MTag> FK_Orientation_2;
|
||||
typedef Ag2_uncertain_is_hidden_C2<FK,FK_MTag> FK_Is_hidden_2;
|
||||
// typedef Incircle_test<FK,FK_MTag> FK_Vertex_conflict_2;
|
||||
typedef Uncertain_vertex_conflict_new_2<FK,FK_MTag>
|
||||
/* */ FK_Vertex_conflict_2;
|
||||
typedef Ag2_uncertain_oriented_side_of_bisector_C2<FK,FK_MTag>
|
||||
/* */ FK_Oriented_side_of_bisector_2;
|
||||
typedef Ag2_finite_edge_test_C2<FK,FK_MTag>
|
||||
/* */ FK_Finite_edge_interior_conflict_2;
|
||||
typedef Infinite_edge_test<FK,FK_MTag>
|
||||
/* */ FK_Infinite_edge_interior_conflict_2;
|
||||
typedef Is_degenerate_edge_test<FK,FK_MTag> FK_Is_degenerate_edge_2;
|
||||
|
||||
// Predicates for the exact kernel
|
||||
typedef Ag2_compare_x_2<EK> EK_Compare_x_2;
|
||||
typedef Ag2_compare_y_2<EK> EK_Compare_y_2;
|
||||
typedef Ag2_compare_weight_2<EK> EK_Compare_weight_2;
|
||||
typedef Ag2_orientation_2<EK,EK_MTag> EK_Orientation_2;
|
||||
typedef Ag2_uncertain_is_hidden_C2<EK,EK_MTag> EK_Is_hidden_2;
|
||||
typedef Incircle_test<EK,EK_MTag> EK_Vertex_conflict_2;
|
||||
typedef Ag2_uncertain_oriented_side_of_bisector_C2<EK,EK_MTag>
|
||||
/* */ EK_Oriented_side_of_bisector_2;
|
||||
typedef Ag2_finite_edge_test_C2<EK,EK_MTag>
|
||||
/* */ EK_Finite_edge_interior_conflict_2;
|
||||
typedef Infinite_edge_test<EK,EK_MTag>
|
||||
/* */ EK_Infinite_edge_interior_conflict_2;
|
||||
typedef Is_degenerate_edge_test<EK,EK_MTag> EK_Is_degenerate_edge_2;
|
||||
#endif
|
||||
|
||||
public:
|
||||
// PREDICATES
|
||||
//-----------
|
||||
|
||||
typedef
|
||||
Filtered_predicate<EK_Compare_x_2, FK_Compare_x_2, C2E, C2F>
|
||||
Compare_x_2;
|
||||
|
||||
typedef
|
||||
Filtered_predicate<EK_Compare_y_2, FK_Compare_y_2, C2E, C2F>
|
||||
Compare_y_2;
|
||||
|
||||
typedef
|
||||
Filtered_predicate<EK_Compare_weight_2, FK_Compare_weight_2,
|
||||
C2E, C2F>
|
||||
Compare_weight_2;
|
||||
|
||||
typedef
|
||||
Filtered_predicate<EK_Orientation_2, FK_Orientation_2, C2E, C2F>
|
||||
Orientation_2;
|
||||
|
||||
typedef
|
||||
My_filtered_predicate<EK_Is_hidden_2, FK_Is_hidden_2, C2E, C2F>
|
||||
Is_hidden_2;
|
||||
|
||||
typedef
|
||||
My_filtered_predicate<EK_Oriented_side_of_bisector_2,
|
||||
FK_Oriented_side_of_bisector_2, C2E, C2F>
|
||||
Oriented_side_of_bisector_2;
|
||||
|
||||
typedef
|
||||
Filtered_predicate<EK_Vertex_conflict_2,
|
||||
FK_Vertex_conflict_2, C2E, C2F>
|
||||
Vertex_conflict_2;
|
||||
|
||||
typedef
|
||||
Filtered_predicate<EK_Finite_edge_interior_conflict_2,
|
||||
FK_Finite_edge_interior_conflict_2, C2E, C2F>
|
||||
Finite_edge_interior_conflict_2;
|
||||
|
||||
typedef
|
||||
Filtered_predicate<EK_Infinite_edge_interior_conflict_2,
|
||||
FK_Infinite_edge_interior_conflict_2, C2E, C2F>
|
||||
Infinite_edge_interior_conflict_2;
|
||||
|
||||
typedef
|
||||
Filtered_predicate<EK_Is_degenerate_edge_2,
|
||||
FK_Is_degenerate_edge_2, C2E, C2F>
|
||||
Is_degenerate_edge_2;
|
||||
|
||||
public:
|
||||
//-----------------------------------------------------------------------
|
||||
// ACCESS TO OBJECTS
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
// OBJECT CONSTRUCTION & ASSIGNMENT
|
||||
Assign_2
|
||||
assign_2_object() const {
|
||||
return Assign_2();
|
||||
}
|
||||
|
||||
Construct_object_2
|
||||
construct_object_2_object() const {
|
||||
return Construct_object_2();
|
||||
}
|
||||
|
||||
|
||||
// CONSTRUCTIONS
|
||||
//--------------
|
||||
Construct_Apollonius_vertex_2
|
||||
construct_Apollonius_vertex_2_object() const {
|
||||
return Construct_Apollonius_vertex_2();
|
||||
}
|
||||
|
||||
Construct_Apollonius_site_2
|
||||
construct_Apollonius_site_2_object() const {
|
||||
return Construct_Apollonius_site_2();
|
||||
}
|
||||
|
||||
// PREDICATES
|
||||
//-----------
|
||||
Compare_x_2
|
||||
compare_x_2_object() const {
|
||||
return Compare_x_2();
|
||||
}
|
||||
|
||||
Compare_y_2
|
||||
compare_y_2_object() const {
|
||||
return Compare_y_2();
|
||||
}
|
||||
|
||||
Compare_weight_2
|
||||
compare_weight_2_object() const {
|
||||
return Compare_weight_2();
|
||||
}
|
||||
|
||||
Orientation_2
|
||||
orientation_2_object() const {
|
||||
return Orientation_2();
|
||||
}
|
||||
|
||||
Is_hidden_2
|
||||
is_hidden_2_object() const {
|
||||
return Is_hidden_2();
|
||||
}
|
||||
|
||||
Oriented_side_of_bisector_2
|
||||
oriented_side_of_bisector_2_object() const {
|
||||
return Oriented_side_of_bisector_2();
|
||||
}
|
||||
|
||||
Vertex_conflict_2
|
||||
vertex_conflict_2_object() const {
|
||||
return Vertex_conflict_2();
|
||||
}
|
||||
|
||||
Finite_edge_interior_conflict_2
|
||||
finite_edge_interior_conflict_2_object() const {
|
||||
return Finite_edge_interior_conflict_2();
|
||||
}
|
||||
|
||||
Infinite_edge_interior_conflict_2
|
||||
infinite_edge_interior_conflict_2_object() const {
|
||||
return Infinite_edge_interior_conflict_2();
|
||||
}
|
||||
|
||||
Is_degenerate_edge_2
|
||||
is_degenerate_edge_2_object() const {
|
||||
return Is_degenerate_edge_2();
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
CGAL_END_NAMESPACE
|
||||
|
||||
|
||||
#endif // CGAL_APOLLONIUS_GRAPH_UNCERTAIN_FILTERED_TRAITS_2_H
|
||||
Loading…
Reference in New Issue