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

renaming Orthtree_traits_base_for_dimension to Orthtree_traits_base 

removing left-over Locate_halfspace
This commit is contained in:
Sven Oesau 2024-02-01 09:46:06 +01:00
parent 7bf9672226
commit c8661d0fa8
5 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Orthtree/doc/Orthtree/Concepts/OrthtreeTraits.h
View File

@ -8,7 +8,7 @@
\cgalHasModelsBegin \cgalHasModelsBegin
\cgalHasModels{CGAL::Orthtree_traits_point<GeomTraits, PointRange, PointMap, dimension >} \cgalHasModels{CGAL::Orthtree_traits_point<GeomTraits, PointRange, PointMap, dimension >}
\cgalHasModels{CGAL::Orthtree_traits_face_graph<PolygonMesh, VPM>} \cgalHasModels{CGAL::Orthtree_traits_face_graph<PolygonMesh, VPM>}
\cgalHasModels{CGAL::Orthtree_traits_base_for_dimension< K, dimension >} \cgalHasModels{CGAL::Orthtree_traits_base< K, dimension >}
\cgalHasModelsEnd \cgalHasModelsEnd
*/ */
class OrthtreeTraits class OrthtreeTraits

4
Orthtree/examples/Orthtree/quadtree_build_manually.cpp
View File

@ -4,7 +4,7 @@
#include <CGAL/Dimension.h> #include <CGAL/Dimension.h>
#include <CGAL/Orthtree.h> #include <CGAL/Orthtree.h>
#include <CGAL/Orthtree_traits_base_for_dimension.h> #include <CGAL/Orthtree_traits_base.h>
using Kernel = CGAL::Simple_cartesian<double>; using Kernel = CGAL::Simple_cartesian<double>;
@ -14,7 +14,7 @@ struct empty_type {
}; };
template <typename K, int dimension> template <typename K, int dimension>
struct Orthtree_traits_empty : public Orthtree_traits_base_for_dimension<K, dimension> { struct Orthtree_traits_empty : public Orthtree_traits_base<K, dimension> {
using Self = Orthtree_traits_empty<K, dimension>; using Self = Orthtree_traits_empty<K, dimension>;
using Tree = Orthtree<Self>; using Tree = Orthtree<Self>;

32
Orthtree/include/CGAL/Orthtree_traits_base_for_dimension.h → Orthtree/include/CGAL/Orthtree_traits_base.h
View File

@ -9,8 +9,8 @@
// //
// Author(s) : Jackson Campolattaro // Author(s) : Jackson Campolattaro
#ifndef ORTHTREE_ORTHTREE_TRAITS_BASE_FOR_DIMENSION_H #ifndef ORTHTREE_ORTHTREE_TRAITS_BASE_H
#define ORTHTREE_ORTHTREE_TRAITS_BASE_FOR_DIMENSION_H #define ORTHTREE_ORTHTREE_TRAITS_BASE_H
#include <CGAL/license/Orthtree.h> #include <CGAL/license/Orthtree.h>
@ -24,7 +24,7 @@ namespace CGAL {
/*! /*!
\ingroup PkgOrthtreeTraits \ingroup PkgOrthtreeTraits
The class `Orthtree_traits_base_for_dimension` is a base class providing common choices for types and functors. The class `Orthtree_traits_base` is a base class providing common choices for types and functors.
The base class is extended by `CGAL::Orthtree_traits_point<GeomTraits, PointRange, PointMap, dimension>` and by `CGAL::Orthtree_traits_face_graph<PolygonMesh, VertexPointMap>`. The base class is extended by `CGAL::Orthtree_traits_point<GeomTraits, PointRange, PointMap, dimension>` and by `CGAL::Orthtree_traits_face_graph<PolygonMesh, VertexPointMap>`.
\tparam K a model of `Kernel`. \tparam K a model of `Kernel`.
@ -35,7 +35,7 @@ namespace CGAL {
*/ */
template <typename K, int dim> template <typename K, int dim>
struct Orthtree_traits_base_for_dimension { struct Orthtree_traits_base {
/// \name Types /// \name Types
/// @{ /// @{
using Node_index = std::size_t; using Node_index = std::size_t;
@ -97,16 +97,10 @@ struct Orthtree_traits_base_for_dimension {
return Point_d{static_cast<int>(args_list.size()), args_list.begin(), args_list.end()}; return Point_d{static_cast<int>(args_list.size()), args_list.begin(), args_list.end()};
}; };
} }
auto locate_halfspace_object() const {
return [](const FT& a, const FT& b) -> bool {
return a < b;
};
}
}; };
template <typename K> template <typename K>
struct Orthtree_traits_base_for_dimension<K, 2> { struct Orthtree_traits_base<K, 2> {
using Node_index = std::size_t; using Node_index = std::size_t;
using Kernel = K; using Kernel = K;
static constexpr int dimension = 2; static constexpr int dimension = 2;
@ -128,16 +122,10 @@ struct Orthtree_traits_base_for_dimension<K, 2> {
return {x, y}; return {x, y};
}; };
} }
auto locate_halfspace_object() const {
return [](const FT& a, const FT& b) -> bool {
return a < b;
};
}
}; };
template <typename K> template <typename K>
struct Orthtree_traits_base_for_dimension<K, 3> { struct Orthtree_traits_base<K, 3> {
using Node_index = std::size_t; using Node_index = std::size_t;
using Kernel = K; using Kernel = K;
static constexpr int dimension = 3; static constexpr int dimension = 3;
@ -172,14 +160,8 @@ struct Orthtree_traits_base_for_dimension<K, 3> {
return {x, y, z}; return {x, y, z};
}; };
} }
auto locate_halfspace_object() const {
return [](const FT& a, const FT& b) -> bool {
return a < b;
};
}
}; };
} }
#endif //ORTHTREE_ORTHTREE_TRAITS_BASE_FOR_DIMENSION_H #endif //ORTHTREE_ORTHTREE_TRAITS_BASE_H

6
Orthtree/include/CGAL/Orthtree_traits_face_graph.h
View File

@ -15,7 +15,7 @@
#include <CGAL/license/Orthtree.h> #include <CGAL/license/Orthtree.h>
#include <CGAL/Orthtree_traits_base_for_dimension.h> #include <CGAL/Orthtree_traits_base.h>
#include <boost/graph/graph_traits.hpp> #include <boost/graph/graph_traits.hpp>
#include <CGAL/Dimension.h> #include <CGAL/Dimension.h>
@ -38,7 +38,7 @@ to which the minimal extend of a node should be provided.
\cgalModels{OrthtreeTraits} \cgalModels{OrthtreeTraits}
*/ */
template <class TriangleMesh, class VertexPointMap> template <class TriangleMesh, class VertexPointMap>
struct Orthtree_traits_face_graph : public Orthtree_traits_base_for_dimension< struct Orthtree_traits_face_graph : public Orthtree_traits_base<
typename Kernel_traits<typename boost::property_traits<VertexPointMap>::value_type>::type, 3 > { typename Kernel_traits<typename boost::property_traits<VertexPointMap>::value_type>::type, 3 > {
Orthtree_traits_face_graph(const TriangleMesh& pm, VertexPointMap vpm) Orthtree_traits_face_graph(const TriangleMesh& pm, VertexPointMap vpm)
@ -47,7 +47,7 @@ struct Orthtree_traits_face_graph : public Orthtree_traits_base_for_dimension<
/// \name Types /// \name Types
/// @{ /// @{
using Base = Orthtree_traits_base_for_dimension< using Base = Orthtree_traits_base<
typename Kernel_traits<typename boost::property_traits<VertexPointMap>::value_type>::type, 3 >; typename Kernel_traits<typename boost::property_traits<VertexPointMap>::value_type>::type, 3 >;
using Node_index = typename Base::Node_index; using Node_index = typename Base::Node_index;
using Self = Orthtree_traits_face_graph<TriangleMesh, VertexPointMap>; using Self = Orthtree_traits_face_graph<TriangleMesh, VertexPointMap>;

8
Orthtree/include/CGAL/Orthtree_traits_point.h
View File

@ -19,7 +19,7 @@
#include <CGAL/Point_set_2.h> #include <CGAL/Point_set_2.h>
#include <CGAL/Orthtree/Cartesian_ranges.h> #include <CGAL/Orthtree/Cartesian_ranges.h>
#include <CGAL/Orthtree_traits_base_for_dimension.h> #include <CGAL/Orthtree_traits_base.h>
namespace CGAL { namespace CGAL {
@ -74,7 +74,7 @@ void reassign_points(
\cgalModels{OrthtreeTraits} \cgalModels{OrthtreeTraits}
\sa `CGAL::Octree` \sa `CGAL::Octree`
\sa `CGAL::Quadtree` \sa `CGAL::Quadtree`
\sa `CGAL::Orthtree_traits_base_for_dimension<GeomTraits, DimensionTag>` \sa `CGAL::Orthtree_traits_base<GeomTraits, DimensionTag>`
*/ */
template < template <
typename GeomTraits, typename GeomTraits,
@ -85,14 +85,14 @@ template <
GeomTraits GeomTraits
>::value >::value
> >
struct Orthtree_traits_point : public Orthtree_traits_base_for_dimension<GeomTraits, dimension> { struct Orthtree_traits_point : public Orthtree_traits_base<GeomTraits, dimension> {
public: public:
/// \name Types /// \name Types
/// @{ /// @{
using Node_data = boost::iterator_range<typename PointRange::iterator>; using Node_data = boost::iterator_range<typename PointRange::iterator>;
/// @} /// @}
using Base = Orthtree_traits_base_for_dimension<GeomTraits, dimension>; using Base = Orthtree_traits_base<GeomTraits, dimension>;
using Self = Orthtree_traits_point<GeomTraits, PointRange, PointMap, dimension>; using Self = Orthtree_traits_point<GeomTraits, PointRange, PointMap, dimension>;
using Tree = Orthtree<Self>; using Tree = Orthtree<Self>;