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

Merge pull request #5571 from sgiraudot/Classification-Sanitize_addresses-GF 

Classification: Sanitize addresses
This commit is contained in:
Laurent Rineau 2021-04-06 15:12:45 +02:00
parent 6f953265e2 e0ee8aaf42
commit 473d30bc43
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Classification/examples/Classification/example_cluster_classification.cpp
View File

@ -86,7 +86,12 @@ int main (int argc, char** argv)
#endif #endif
generator.generate_point_based_features (pointwise_features); generator.generate_point_based_features (pointwise_features);
generator.generate_normal_based_features (pointwise_features, pts.normal_map());
// Generator should only be used with variables defined at the scope
// of the generator object, thus we instantiate the normal map
// outside of the function
Vmap normal_map = pts.normal_map();
generator.generate_normal_based_features (pointwise_features, normal_map);
#ifdef CGAL_LINKED_WITH_TBB #ifdef CGAL_LINKED_WITH_TBB
pointwise_features.end_parallel_additions(); pointwise_features.end_parallel_additions();
@ -156,8 +161,8 @@ int main (int argc, char** argv)
// First, compute means of features. // First, compute means of features.
features.begin_parallel_additions(); features.begin_parallel_additions();
for (Feature_handle fh : pointwise_features) for (std::size_t i = 0; i < pointwise_features.size(); ++ i)
features.add<Feature::Cluster_mean_of_feature> (clusters, fh); features.add<Feature::Cluster_mean_of_feature> (clusters, pointwise_features[i]);
features.end_parallel_additions(); features.end_parallel_additions();
// Then, compute variances of features (and remaining cluster features). // Then, compute variances of features (and remaining cluster features).

2
Classification/include/CGAL/Classification/Feature_set.h
View File

@ -228,7 +228,7 @@ public:
{ {
#ifdef CGAL_LINKED_WITH_TBB #ifdef CGAL_LINKED_WITH_TBB
m_tasks->wait(); m_tasks->wait();
m_tasks.release(); m_tasks.reset();
m_adders.clear(); m_adders.clear();
#endif #endif
} }