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

Add notes from skype meeting.

This commit is contained in:
Martin Skrodzki 2019-10-14 00:32:55 +02:00
parent 16e0a475f4
commit fed345c07a
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h
View File

@ -34,6 +34,7 @@
#include <CGAL/Polygon_mesh_processing/internal/named_function_params.h> #include <CGAL/Polygon_mesh_processing/internal/named_function_params.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h> #include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/point_generators_3.h> #include <CGAL/point_generators_3.h>
#include <CGAL/Real_timer.h>
#include <CGAL/Spatial_sort_traits_adapter_3.h> #include <CGAL/Spatial_sort_traits_adapter_3.h>
#include <CGAL/spatial_sort.h> #include <CGAL/spatial_sort.h>
@ -882,7 +883,11 @@ double bounded_error_Hausdorff_impl(
// Build traversal traits for tm1_tree // Build traversal traits for tm1_tree
Hausdorff_primitive_traits_tm1<Tree_traits, Point_3, Kernel, TriangleMesh, VPM1, VPM2> traversal_traits_tm1( tm1_tree.traits(), tm2_tree, tm1, tm2, vpm1, vpm2, hint.first ); Hausdorff_primitive_traits_tm1<Tree_traits, Point_3, Kernel, TriangleMesh, VPM1, VPM2> traversal_traits_tm1( tm1_tree.traits(), tm2_tree, tm1, tm2, vpm1, vpm2, hint.first );
// Find candidate triangles in TM1 which might realise the Hausdorff bound // Find candidate triangles in TM1 which might realise the Hausdorff bound
// TODO Initialize the distances on all the vertices first and store those.
// TODO Do not traverse TM1, but only TM2, i.e. reduce to Culling on TM2 (Can do this for all triangles in TM1 in parallel)
tm1_tree.traversal_with_priority( Point_3(0,0,0), traversal_traits_tm1 ); // dummy point given as query as not needed tm1_tree.traversal_with_priority( Point_3(0,0,0), traversal_traits_tm1 ); // dummy point given as query as not needed
// TODO Is there a better/faster data structure than the Heap used here? // TODO Is there a better/faster data structure than the Heap used here?

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/AABB_traversal_traits_with_Hausdorff_distance.h
View File

@ -91,6 +91,7 @@ namespace CGAL {
void intersection(const Query& query, const Primitive& primitive) void intersection(const Query& query, const Primitive& primitive)
{ {
/* Have reached a single triangle, process it */ /* Have reached a single triangle, process it */
// TODO Already perform these computations once we have <=k
/* /*
/ Determine the distance accroding to / Determine the distance accroding to
@ -285,6 +286,7 @@ namespace CGAL {
std::numeric_limits<double>::infinity(), std::numeric_limits<double>::infinity(),
std::numeric_limits<double>::infinity() std::numeric_limits<double>::infinity()
); );
// TODO Pass on the current global bounds to the TM2 tree traversal. There, only enter subtrees that can still be better than the current global bound.
m_tm2_tree.traversal_with_priority(candidate_triangle, traversal_traits_tm2); m_tm2_tree.traversal_with_priority(candidate_triangle, traversal_traits_tm2);
// Update global Hausdorff bounds according to the obtained local bounds // Update global Hausdorff bounds according to the obtained local bounds