P3RT_traits_3 is filtered.

Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_filtered_traits_3.h

@@ -0,0 +1,162 @@
+// Copyright (c) 2004,2006-2009   INRIA Sophia-Antipolis (France).
+// All rights reserved.
+//
+// This file is part of CGAL (www.cgal.org).
+// You can redistribute it and/or modify it under the terms of the GNU
+// General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
+//
+// 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$
+// $Id$
+// 
+//
+// Author(s)     : Sylvain Pion <Sylvain.Pion@sophia.inria.fr>
+//                 Nico Kruithof <Nico.Kruithof@sophia.inria.fr>
+//                 Manuel Caroli <Manuel.Caroli@sophia.inria.fr>
+
+
+#ifndef CGAL_PERIODIC_3_REGULAR_TRIANGULATION_FILTERED_TRAITS_3_H
+#define CGAL_PERIODIC_3_REGULAR_TRIANGULATION_FILTERED_TRAITS_3_H
+
+#include <string>
+#include <CGAL/basic.h>
+#include <CGAL/config.h>
+#include <CGAL/Interval_nt.h>
+#include <CGAL/Uncertain.h>
+#include <CGAL/Profile_counter.h>
+#include <CGAL/Periodic_3_triangulation_filtered_traits_3.h>
+#include <CGAL/Periodic_3_regular_triangulation_traits_3.h>
+
+namespace CGAL {
+
+// The argument is supposed to be a Filtered_kernel like kernel.
+template < typename K, typename Off >
+class Periodic_3_regular_triangulation_filtered_traits_base_3
+  : public Periodic_3_regular_triangulation_traits_base_3<K, Off>
+{
+  typedef Periodic_3_regular_triangulation_traits_base_3<K, Off> Base;
+
+  // Exact traits is based on the exact kernel.
+  typedef Periodic_3_regular_triangulation_traits_3<typename K::Exact_kernel,
+                                            Off>
+                                                   Exact_traits;
+  // Filtering traits is based on the filtering kernel.
+  typedef Periodic_3_regular_triangulation_traits_3<typename K::Approximate_kernel,
+                                            Off>
+                                                   Filtering_traits;
+private:
+  typedef typename K::C2E C2E;
+  typedef typename K::C2F C2F;
+
+  typedef typename C2E::Target_kernel::Iso_cuboid_3 Exact_iso_cuboid_3;
+  typedef typename C2F::Target_kernel::Iso_cuboid_3 Approximate_iso_cuboid_3;
+ 
+public:
+  typedef typename K::Iso_cuboid_3 Iso_cuboid_3;
+
+  void set_domain(const Iso_cuboid_3& domain) {
+    C2E c2e;
+    C2F c2f;
+    this->_domain = domain;
+    this->_domain_e = c2e(this->_domain);
+    this->_domain_f = c2f(this->_domain);
+  }
+
+  typedef Filtered_periodic_predicate<
+            typename Exact_traits::Compare_xyz_3,
+            typename Filtering_traits::Compare_xyz_3,
+            Offset_converter_3<C2E>,
+            Offset_converter_3<C2F> >  Compare_xyz_3;
+
+  typedef Filtered_periodic_predicate<
+            typename Exact_traits::Coplanar_orientation_3,
+            typename Filtering_traits::Coplanar_orientation_3,
+            Offset_converter_3<C2E>,
+            Offset_converter_3<C2F> >  Coplanar_orientation_3;
+
+  typedef Filtered_periodic_predicate<
+            typename Exact_traits::Orientation_3,
+            typename Filtering_traits::Orientation_3,
+            Offset_converter_3<C2E>,
+            Offset_converter_3<C2F> >  Orientation_3;
+
+  typedef Filtered_periodic_predicate<
+            typename Exact_traits::Coplanar_side_of_bounded_circle_3,
+            typename Filtering_traits::Coplanar_side_of_bounded_circle_3,
+            Offset_converter_3<C2E>,
+            Offset_converter_3<C2F> >  Coplanar_side_of_bounded_circle_3;
+
+  typedef Filtered_periodic_predicate<
+            typename Exact_traits::Side_of_oriented_sphere_3,
+            typename Filtering_traits::Side_of_oriented_sphere_3,
+            Offset_converter_3<C2E>,
+            Offset_converter_3<C2F> >  Side_of_oriented_sphere_3;
+
+  typedef Filtered_periodic_predicate<
+            typename Exact_traits::Compare_distance_3,
+            typename Filtering_traits::Compare_distance_3,
+            Offset_converter_3<C2E>,
+            Offset_converter_3<C2F> >  Compare_distance_3;
+
+  typedef Filtered_periodic_predicate<
+            typename Exact_traits::Side_of_bounded_sphere_3,
+            typename Filtering_traits::Side_of_bounded_sphere_3,
+            Offset_converter_3<C2E>,
+            Offset_converter_3<C2F> >  Side_of_bounded_sphere_3;
+
+
+  Compare_xyz_3 compare_xyz_3_object() const
+  { return Compare_xyz_3(&_domain_e,&_domain_f);}
+
+  Coplanar_orientation_3 coplanar_orientation_3_object() const
+  { return Coplanar_orientation_3(&_domain_e,&_domain_f); }
+
+  Orientation_3 orientation_3_object() const
+  { return Orientation_3(&_domain_e,&_domain_f);}
+
+  Coplanar_side_of_bounded_circle_3
+  coplanar_side_of_bounded_circle_3_object() const 
+  { return Coplanar_side_of_bounded_circle_3(&_domain_e,&_domain_f); }
+
+  Side_of_oriented_sphere_3 side_of_oriented_sphere_3_object() const
+  { return Side_of_oriented_sphere_3(&_domain_e,&_domain_f);}
+
+  Compare_distance_3 compare_distance_3_object() const
+  { return Compare_distance_3(&_domain_e,&_domain_f);}
+
+  Side_of_bounded_sphere_3 side_of_bounded_sphere_3_object() const
+  { return Side_of_bounded_sphere_3(&_domain_e,&_domain_f);}
+
+  // The following are inherited since they are constructions :
+  // Construct_segment_3
+  // Construct_triangle_3
+  // Construct_tetrahedron_3
+  // Construct_circumcenter_3
+
+ protected:
+  Exact_iso_cuboid_3 _domain_e;
+  Approximate_iso_cuboid_3 _domain_f;
+};
+
+} //namespace CGAL
+
+//#include <CGAL/Periodic_3_regular_triangulation_statically_filtered_traits_3.h>
+
+namespace CGAL {
+
+template < typename K, typename Off = typename CGAL::Periodic_3_offset_3 >
+class Periodic_3_regular_triangulation_filtered_traits_3
+: public Periodic_3_regular_triangulation_traits_base_3<K, Off>
+//    : public Periodic_3_regular_triangulation_filtered_traits_base_3<K, Off>
+{
+};
+
+} //namespace CGAL
+
+#endif // CGAL_PERIODIC_3_REGULAR_TRIANGULATION_FILTERED_TRAITS_3_H

Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_traits_3.h

@@ -183,7 +183,7 @@ class Periodic_3_regular_triangulation_traits_3;
 // Partial specialization for Filtered_kernel<CK>.
 #include <CGAL/Filtered_kernel.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-//#include <CGAL/Periodic_3_Delaunay_triangulation_filtered_traits_3.h>
+#include <CGAL/Periodic_3_regular_triangulation_filtered_traits_3.h>
 
 namespace CGAL
 {

Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_filtered_traits_3.h

@@ -108,11 +108,11 @@ class Periodic_3_triangulation_filtered_traits_base_3
   typedef Periodic_3_triangulation_traits_base_3<K, Off> Base;
 
   // Exact traits is based on the exact kernel.
-  typedef future_release::Periodic_3_triangulation_traits_3<typename K::Exact_kernel,
+  typedef Periodic_3_triangulation_traits_3<typename K::Exact_kernel,
                                             Off>
                                                    Exact_traits;
   // Filtering traits is based on the filtering kernel.
-  typedef future_release::Periodic_3_triangulation_traits_3<typename K::Approximate_kernel,
+  typedef Periodic_3_triangulation_traits_3<typename K::Approximate_kernel,
                                             Off>
                                                    Filtering_traits;
 private:

Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_traits_3.h

@@ -111,11 +111,8 @@ protected:
   Iso_cuboid_3 _domain;
 };
 
-namespace future_release
-{
 template < typename K, typename Off = CGAL::Periodic_3_offset_3 >
 class Periodic_3_triangulation_traits_3;
-}
 
 } //namespace CGAL
 
@@ -129,7 +126,6 @@ namespace CGAL {
 template < typename K, typename Off >
 class Periodic_3_triangulation_filtered_traits_3;
 
-namespace future_release {
 template < class K, class Off>
 class Periodic_3_triangulation_traits_3
   : public Periodic_3_triangulation_traits_base_3<K, Off>
@@ -152,22 +148,6 @@ class Periodic_3_triangulation_traits_3<CGAL::Epick, Off>
   typedef CGAL::Epick Kernel;
 };
 
-}
 } //namespace CGAL
 
-#include <CGAL/Periodic_3_Delaunay_triangulation_traits_3.h>
-
-
-namespace CGAL
-{
-template < typename K, typename Off >
-class Periodic_3_Delaunay_triangulation_traits_3;
-
-// Periodic_3_triangulation_traits_3 should not be used as traits for Periodic_3_Delaunay_triangulation_3 anymore.
-template < class Kernel, class Off = typename CGAL::Periodic_3_offset_3 >
-class CGAL_DEPRECATED Periodic_3_triangulation_traits_3 : public Periodic_3_Delaunay_triangulation_traits_3<Kernel, Off>
-{
-};
-}
-
 #endif // CGAL_PERIODIC_3_TRIANGULATION_TRAITS_3_H