diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-16 17:04:09 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-16 17:04:09 +0000 |
| commit | 30a66f9431d059eed620e0535583e914fa5a3c74 (patch) | |
| tree | 76e276b2eba432560ed161b2510711536eb5357c /src | |
| parent | 47b59d173b6c396a40558ac15fc252e18e035c2c (diff) | |
| parent | a0685fdfba0e6fb210468726ca45ce5dff8672ff (diff) | |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@1910 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 1f6716dcc5c0ad17abe248bdeddb868e04a94fc0
Diffstat (limited to 'src')
| -rw-r--r-- | src/Alpha_complex/include/gudhi/Alpha_complex.h | 8 | ||||
| -rw-r--r-- | src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h | 2 | ||||
| -rw-r--r-- | src/Subsampling/example/example_custom_kernel.cpp | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/Alpha_complex/include/gudhi/Alpha_complex.h b/src/Alpha_complex/include/gudhi/Alpha_complex.h index 9d5a9bad..1ff95c3d 100644 --- a/src/Alpha_complex/include/gudhi/Alpha_complex.h +++ b/src/Alpha_complex/include/gudhi/Alpha_complex.h @@ -193,17 +193,17 @@ class Alpha_complex { triangulation_ = new Delaunay_triangulation(point_dimension(*first)); std::vector<Point_d> point_cloud(first, last); - + // Creates a vector {0, 1, ..., N-1} std::vector<std::ptrdiff_t> indices(boost::counting_iterator<std::ptrdiff_t>(0), boost::counting_iterator<std::ptrdiff_t>(point_cloud.size())); - + typedef boost::iterator_property_map<typename std::vector<Point_d>::iterator, CGAL::Identity_property_map<std::ptrdiff_t>> Point_property_map; typedef CGAL::Spatial_sort_traits_adapter_d<Kernel, Point_property_map> Search_traits_d; - + CGAL::spatial_sort(indices.begin(), indices.end(), Search_traits_d(std::begin(point_cloud))); - + typename Delaunay_triangulation::Full_cell_handle hint; for (auto index : indices) { typename Delaunay_triangulation::Vertex_handle pos = triangulation_->insert(point_cloud[index], hint); diff --git a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h index cabd0a86..8e7901cc 100644 --- a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h +++ b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h @@ -110,7 +110,7 @@ class Persistent_cohomology { cell_pool_() { if (cpx_->num_simplices() > std::numeric_limits<Simplex_key>::max()) { // num_simplices must be strictly lower than the limit, because a value is reserved for null_key. - throw std::out_of_range ("The number of simplices is more than Simplex_key type numeric limit."); + throw std::out_of_range("The number of simplices is more than Simplex_key type numeric limit."); } Simplex_key idx_fil = 0; for (auto sh : cpx_->filtration_simplex_range()) { diff --git a/src/Subsampling/example/example_custom_kernel.cpp b/src/Subsampling/example/example_custom_kernel.cpp index f87ef0b3..25b5bf6c 100644 --- a/src/Subsampling/example/example_custom_kernel.cpp +++ b/src/Subsampling/example/example_custom_kernel.cpp @@ -26,10 +26,10 @@ class Kernel { public: Squared_distance_d() { - matrix_.push_back(std::vector<FT>({0,1,2,4})); - matrix_.push_back(std::vector<FT>({1,0,4,2})); - matrix_.push_back(std::vector<FT>({2,4,0,1})); - matrix_.push_back(std::vector<FT>({4,2,1,0})); + matrix_.push_back(std::vector<FT>({0, 1, 2, 4})); + matrix_.push_back(std::vector<FT>({1, 0, 4, 2})); + matrix_.push_back(std::vector<FT>({2, 4, 0, 1})); + matrix_.push_back(std::vector<FT>({4, 2, 1, 0})); } FT operator()(Point_d p1, Point_d p2) { |