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

fixed exact corners, multi dimension example 

removed warnings
This commit is contained in:
Sven Oesau 2024-01-10 16:34:55 +01:00
parent 24a937e185
commit 626a23a49a
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Orthtree/examples/Orthtree/orthtree_build.cpp
View File

@ -12,14 +12,15 @@ using Kernel = CGAL::Epick_d<Dimension>;
using Point_d = Kernel::Point_d;
using Point_vector = std::vector<Point_d>;
using Traits = CGAL::Orthtree_traits_point<Kernel, Point_vector>;
using Orthtree = CGAL::Orthtree<Traits>;
using Traits2 = CGAL::Orthtree_traits_point<Kernel, Point_vector, CGAL::Identity_property_map<typename std::iterator_traits<typename Point_vector::iterator>::value_type>, CGAL::Dimension_tag<4>>;
using Orthtree = CGAL::Orthtree<Traits2>;
int main()
{
CGAL::Random r;
Point_vector points_dd;
for (std::size_t i = 0; i < 5; ++ i)
for (std::size_t i = 0; i < 500; ++ i)
{
std::array<double, Dimension::value> init{};
for (double& v : init)

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

@ -21,6 +21,7 @@
#include <CGAL/Orthtree/IO.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/NT_converter.h>
#include <CGAL/Cartesian_converter.h>
#include <CGAL/Property_container.h>
#include <CGAL/property_map.h>
@ -167,6 +168,7 @@ private: // data members :
Node_property_container::Array <Maybe_node_index>& m_node_children;
using Bbox_dimensions = std::array<CGAL::Exact_predicates_exact_constructions_kernel::FT, Dimension::value>;
CGAL::NT_converter<CGAL::Exact_predicates_exact_constructions_kernel::FT, typename Traits::Kernel::FT> conv;
Bbox_dimensions m_bbox_min;
std::vector<Bbox_dimensions> m_side_per_depth; /* side length per node's depth */
@ -473,7 +475,7 @@ public:
using Cartesian_coordinate = std::array<FT, Dimension::value>;
Cartesian_coordinate min_corner, max_corner;
Bbox_dimensions size = m_side_per_depth[depth(n)];
CGAL::Cartesian_converter<CGAL::Exact_predicates_exact_constructions_kernel, typename Traits::Kernel> conv;
for (int i = 0; i < Dimension::value; i++) {
min_corner[i] = conv(m_bbox_min[i] + int(global_coordinates(n)[i]) * size[i]);
max_corner[i] = conv(m_bbox_min[i] + int(global_coordinates(n)[i] + 1) * size[i]);
@ -971,7 +973,7 @@ public:
bary[i] = FT(global_coordinates(n)[i]) * size[i] + size[i] / FT(2) + m_bbox_min[i];
// Convert that location into a point
CGAL::Cartesian_converter<CGAL::Exact_predicates_exact_constructions_kernel, typename Traits::Kernel> conv;
std::array<typename Traits::Kernel::FT, Dimension::value> tmp;
for (std::size_t i = 0; i < Dimension::value; i++)
tmp[i] = conv(bary[i]);

2
Orthtree/include/CGAL/Orthtree_traits_base_for_dimension.h
View File

@ -54,7 +54,7 @@ struct Orthtree_traits_base_for_dimension {
auto construct_point_d_object() const {
return [](auto... Args) -> Point_d {
std::initializer_list<FT> args_list{Args...};
return Point_d{args_list.size(), args_list.begin(), args_list.end()};
return Point_d{static_cast<int>(args_list.size()), args_list.begin(), args_list.end()};
};
}
/// @}