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

Fix compilation with homogeneous exact number types

This commit is contained in:
Mael Rouxel-Labbé 2023-01-23 11:30:49 +01:00
parent efa486ca1c
commit fca313bba9
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3/internal/Periodic_3_triangulation_dummy_generator.h
View File

@ -65,7 +65,7 @@ insert_generic_dummy_points()
std::array<FT, 3> steps; std::array<FT, 3> steps;
// Min: // Min:
// this doesn't work for P3M3 + sharp features due to weights having a hard constraint of 1/64th domain_size² // this doesn't work for P3M3 + sharp features due to weights creating a harder constraint of 1/64th domain_size²
// #define CGAL_P3T3_USE_EXPERIMENTAL_LARGE_STEP_IN_DUMMY_GENERATION // #define CGAL_P3T3_USE_EXPERIMENTAL_LARGE_STEP_IN_DUMMY_GENERATION
#ifdef CGAL_P3T3_USE_EXPERIMENTAL_LARGE_STEP_IN_DUMMY_GENERATION #ifdef CGAL_P3T3_USE_EXPERIMENTAL_LARGE_STEP_IN_DUMMY_GENERATION
nums_steps[min_pos] = 3; nums_steps[min_pos] = 3;
@ -75,7 +75,7 @@ insert_generic_dummy_points()
steps[min_pos] = spans[min_pos] / nums_steps[min_pos]; steps[min_pos] = spans[min_pos] / nums_steps[min_pos];
// Mid: do not use the min step, but redistribute the error between nums_steps[mid_pos] * min_step and the actual span // Mid: do not use the min step, but redistribute the error between nums_steps[mid_pos] * min_step and the actual span
nums_steps[mid_pos] = spans[mid_pos] / steps[min_pos]; // implicit floor(), "min" is not a typo nums_steps[mid_pos] = int(to_interval(spans[mid_pos] / steps[min_pos]).first); // flooring, "min" is not a typo
steps[mid_pos] = spans[mid_pos] / nums_steps[mid_pos]; steps[mid_pos] = spans[mid_pos] / nums_steps[mid_pos];
// Max: smaller step in the max span direction as to avoid cospherical configurations // Max: smaller step in the max span direction as to avoid cospherical configurations
@ -84,7 +84,7 @@ insert_generic_dummy_points()
#else #else
const FT minor_step = spans[min_pos] / FT(8); // a ratio of 6:8 makes for nicely shaped tetrahedra const FT minor_step = spans[min_pos] / FT(8); // a ratio of 6:8 makes for nicely shaped tetrahedra
#endif #endif
nums_steps[max_pos] = spans[max_pos] / minor_step; // implicit floor() nums_steps[max_pos] = int(to_interval(spans[max_pos] / minor_step).first); // flooring
CGAL_assertion(nums_steps[max_pos] >= steps[min_pos]); CGAL_assertion(nums_steps[max_pos] >= steps[min_pos]);
// Important! Consecutive levels in the max length have a shift (that's the `k % 2 != 0` part). // Important! Consecutive levels in the max length have a shift (that's the `k % 2 != 0` part).
@ -176,7 +176,7 @@ insert_generic_dummy_points()
DT3 dt3; DT3 dt3;
#endif #endif
std::array<float, 3> coords; std::array<FT, 3> coords;
for(int i=0; i<nums_steps[min_pos]; ++i) for(int i=0; i<nums_steps[min_pos]; ++i)
{ {
for(int j=0; j<nums_steps[mid_pos]; ++j) for(int j=0; j<nums_steps[mid_pos]; ++j)
@ -188,8 +188,8 @@ insert_generic_dummy_points()
if(k % 2 != 0) if(k % 2 != 0)
{ {
coords[min_pos] += 0.5 * steps[min_pos]; coords[min_pos] += steps[min_pos] / FT(2);
coords[mid_pos] += 0.5 * steps[mid_pos]; coords[mid_pos] += steps[mid_pos] / FT(2);
} }
coords[max_pos] = domain().min_coord(max_pos) + k * steps[max_pos]; coords[max_pos] = domain().min_coord(max_pos) + k * steps[max_pos];

8
Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_delaunay_3.cpp
View File

@ -1,10 +1,9 @@
#include <iostream> #include <CGAL/Periodic_3_Delaunay_triangulation_3.h>
#include <fstream> #include <CGAL/Periodic_3_Delaunay_triangulation_traits_3.h>
#include <CGAL/Timer.h> #include <CGAL/Timer.h>
#include <CGAL/Periodic_3_Delaunay_triangulation_3.h> #include <iostream>
#include <CGAL/Periodic_3_Delaunay_triangulation_traits_3.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
typedef CGAL::Exact_predicates_inexact_constructions_kernel K1; typedef CGAL::Exact_predicates_inexact_constructions_kernel K1;
@ -22,6 +21,7 @@ template class CGAL::Periodic_3_Delaunay_triangulation_3<PTT2>;
#include <CGAL/Simple_homogeneous.h> #include <CGAL/Simple_homogeneous.h>
typedef CGAL::Simple_homogeneous<CGAL::MP_Float> K3; typedef CGAL::Simple_homogeneous<CGAL::MP_Float> K3;
typedef CGAL::Periodic_3_Delaunay_triangulation_traits_3<K3> PTT3; typedef CGAL::Periodic_3_Delaunay_triangulation_traits_3<K3> PTT3;
// Explicit instantiation of the whole class: // Explicit instantiation of the whole class:
template class CGAL::Periodic_3_Delaunay_triangulation_3<PTT3>; template class CGAL::Periodic_3_Delaunay_triangulation_3<PTT3>;

10
Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/test_periodic_3_triangulation_3.cpp
View File

@ -1,13 +1,12 @@
#include <iostream>
#include <CGAL/Timer.h>
#include <CGAL/Periodic_3_Delaunay_triangulation_3.h> #include <CGAL/Periodic_3_Delaunay_triangulation_3.h>
#include <CGAL/Periodic_3_Delaunay_triangulation_traits_3.h> #include <CGAL/Periodic_3_Delaunay_triangulation_traits_3.h>
#include <CGAL/Periodic_3_triangulation_3.h> #include <CGAL/Periodic_3_triangulation_3.h>
#include <CGAL/Periodic_3_triangulation_traits_3.h> #include <CGAL/Periodic_3_triangulation_traits_3.h>
#include <CGAL/Timer.h>
#include <iostream>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
typedef CGAL::Exact_predicates_inexact_constructions_kernel K1; typedef CGAL::Exact_predicates_inexact_constructions_kernel K1;
typedef CGAL::Periodic_3_Delaunay_triangulation_traits_3<K1> PDTT1; typedef CGAL::Periodic_3_Delaunay_triangulation_traits_3<K1> PDTT1;
@ -20,6 +19,7 @@ typedef CGAL::Periodic_3_Delaunay_triangulation_traits_3<K2> PDTT2;
#include <CGAL/Simple_homogeneous.h> #include <CGAL/Simple_homogeneous.h>
typedef CGAL::Simple_homogeneous<CGAL::MP_Float> K3; typedef CGAL::Simple_homogeneous<CGAL::MP_Float> K3;
typedef CGAL::Periodic_3_Delaunay_triangulation_traits_3<K3> PDTT3; typedef CGAL::Periodic_3_Delaunay_triangulation_traits_3<K3> PDTT3;
// Explicit instantiation of the whole class: // Explicit instantiation of the whole class:
template class CGAL::Periodic_3_triangulation_3<PDTT3>; template class CGAL::Periodic_3_triangulation_3<PDTT3>;