diff options
author | fgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-16 15:39:25 +0000 |
---|---|---|
committer | fgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-16 15:39:25 +0000 |
commit | 7363fb3c4001d1761524ec65f38847c7fe7fb8f2 (patch) | |
tree | 766ee2ae38b09fc735f5a9af4095faae6c8745a1 /src | |
parent | b6b00e19be498e039ac40368157b3b7e10da4a0b (diff) | |
parent | c8dbfc68cca3c5462226e5d953f721143fc645f0 (diff) |
merge trunk
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1904 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: aaea6ba58156f8c35f80674834520220891fc32e
Diffstat (limited to 'src')
5 files changed, 22 insertions, 31 deletions
diff --git a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h index c3a1535a..681de8c6 100644 --- a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h +++ b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h @@ -699,12 +699,13 @@ class Persistent_cohomology { std::vector< std::pair< Filtration_value , Filtration_value > > result; // auto && pair, to avoid unnecessary copying for (auto && pair : persistent_pairs_) { - if (cpx_->dimension( get<0>(pair)) == dimension ) { + if (cpx_->dimension(get<0>(pair)) == dimension) { result.emplace_back(cpx_->filtration(get<0>(pair)), cpx_->filtration(get<1>(pair))); } } return result; } + private: /* * Structure representing a cocycle. diff --git a/src/Persistent_cohomology/test/betti_numbers_unit_test.cpp b/src/Persistent_cohomology/test/betti_numbers_unit_test.cpp index b98a3765..0ed3fddf 100644 --- a/src/Persistent_cohomology/test/betti_numbers_unit_test.cpp +++ b/src/Persistent_cohomology/test/betti_numbers_unit_test.cpp @@ -124,7 +124,7 @@ BOOST_AUTO_TEST_CASE( plain_homology_betti_numbers ) auto intervals_in_dimension_0 = pcoh.intervals_in_dimension(0); std::cout << "intervals_in_dimension_0.size() = " << intervals_in_dimension_0.size() << std::endl; - for (int i = 0; i < intervals_in_dimension_0.size(); i++) + for (std::size_t i = 0; i < intervals_in_dimension_0.size(); i++) std::cout << "intervals_in_dimension_0[" << i << "] = [" << intervals_in_dimension_0[i].first << "," << intervals_in_dimension_0[i].second << "]" << std::endl; BOOST_CHECK(intervals_in_dimension_0.size() == 2); @@ -136,7 +136,7 @@ BOOST_AUTO_TEST_CASE( plain_homology_betti_numbers ) auto intervals_in_dimension_1 = pcoh.intervals_in_dimension(1); std::cout << "intervals_in_dimension_1.size() = " << intervals_in_dimension_1.size() << std::endl; - for (int i = 0; i < intervals_in_dimension_1.size(); i++) + for (std::size_t i = 0; i < intervals_in_dimension_1.size(); i++) std::cout << "intervals_in_dimension_1[" << i << "] = [" << intervals_in_dimension_1[i].first << "," << intervals_in_dimension_1[i].second << "]" << std::endl; BOOST_CHECK(intervals_in_dimension_1.size() == 1); @@ -267,7 +267,7 @@ BOOST_AUTO_TEST_CASE( betti_numbers ) auto intervals_in_dimension_0 = pcoh.intervals_in_dimension(0); std::cout << "intervals_in_dimension_0.size() = " << intervals_in_dimension_0.size() << std::endl; - for (int i = 0; i < intervals_in_dimension_0.size(); i++) + for (std::size_t i = 0; i < intervals_in_dimension_0.size(); i++) std::cout << "intervals_in_dimension_0[" << i << "] = [" << intervals_in_dimension_0[i].first << "," << intervals_in_dimension_0[i].second << "]" << std::endl; BOOST_CHECK(intervals_in_dimension_0.size() == 2); @@ -278,7 +278,7 @@ BOOST_AUTO_TEST_CASE( betti_numbers ) auto intervals_in_dimension_1 = pcoh.intervals_in_dimension(1); std::cout << "intervals_in_dimension_1.size() = " << intervals_in_dimension_1.size() << std::endl; - for (int i = 0; i < intervals_in_dimension_1.size(); i++) + for (std::size_t i = 0; i < intervals_in_dimension_1.size(); i++) std::cout << "intervals_in_dimension_1[" << i << "] = [" << intervals_in_dimension_1[i].first << "," << intervals_in_dimension_1[i].second << "]" << std::endl; BOOST_CHECK(intervals_in_dimension_1.size() == 1); diff --git a/src/Subsampling/example/example_custom_kernel.cpp b/src/Subsampling/example/example_custom_kernel.cpp index 05797ebe..f87ef0b3 100644 --- a/src/Subsampling/example/example_custom_kernel.cpp +++ b/src/Subsampling/example/example_custom_kernel.cpp @@ -7,7 +7,7 @@ #include <iterator> -/* The class Kernel contains a distance function defined on the set of points {0,1,2,3} +/* The class Kernel contains a distance function defined on the set of points {0, 1, 2, 3} * and computes a distance according to the matrix: * 0 1 2 4 * 1 0 4 2 @@ -15,41 +15,35 @@ * 4 2 1 0 */ class Kernel { -public: + public: typedef double FT; typedef unsigned Point_d; // Class Squared_distance_d class Squared_distance_d { - private: + private: std::vector<std::vector<FT>> matrix_; - - 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})); - } - - FT operator()(Point_d p1, Point_d p2) - { + 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})); + } + + FT operator()(Point_d p1, Point_d p2) { return matrix_[p1][p2]; } }; // Constructor - Kernel() - {} + Kernel() {} // Object of type Squared_distance_d - Squared_distance_d squared_distance_d_object() const - { + Squared_distance_d squared_distance_d_object() const { return Squared_distance_d(); } - }; int main(void) { @@ -57,9 +51,9 @@ int main(void) { typedef typename K::Point_d Point_d; K k; - std::vector<Point_d> points = {0,1,2,3}; + std::vector<Point_d> points = {0, 1, 2, 3}; std::vector<Point_d> results; - + Gudhi::subsampling::choose_n_farthest_points(k, points, 2, std::back_inserter(results)); std::cout << "Before sparsification: " << points.size() << " points.\n"; std::cout << "After sparsification: " << results.size() << " points.\n"; diff --git a/src/Subsampling/include/gudhi/sparsify_point_set.h b/src/Subsampling/include/gudhi/sparsify_point_set.h index 7ff11b4c..507f8c79 100644 --- a/src/Subsampling/include/gudhi/sparsify_point_set.h +++ b/src/Subsampling/include/gudhi/sparsify_point_set.h @@ -64,8 +64,6 @@ sparsify_point_set( typedef typename Gudhi::spatial_searching::Kd_tree_search< Kernel, Point_range> Points_ds; - typename Kernel::Squared_distance_d sqdist = k.squared_distance_d_object(); - #ifdef GUDHI_SUBSAMPLING_PROFILING Gudhi::Clock t; #endif diff --git a/src/common/include/gudhi/random_point_generators.h b/src/common/include/gudhi/random_point_generators.h index 3050b7ea..c643a1e3 100644 --- a/src/common/include/gudhi/random_point_generators.h +++ b/src/common/include/gudhi/random_point_generators.h @@ -338,8 +338,6 @@ std::vector<typename Kernel::Point_d> generate_points_on_3sphere_and_circle(std: std::vector<Point> points; points.reserve(num_points); - typename Kernel::Translated_point_d k_transl = - k.translated_point_d_object(); typename Kernel::Compute_coordinate_d k_coord = k.compute_coordinate_d_object(); for (std::size_t i = 0; i < num_points;) { |