diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-04 06:15:47 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-04 06:15:47 +0000 |
| commit | 67c34d7b506efe6445a24380b3ad0743e09ef334 (patch) | |
| tree | 7504f217a3a52df7c9d2157850a28d4b5972750a /src/Tangential_complex | |
| parent | 7363fb3c4001d1761524ec65f38847c7fe7fb8f2 (diff) | |
| parent | a0685fdfba0e6fb210468726ca45ce5dff8672ff (diff) | |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1919 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 1dc74b80bb4ad02dd49664f6d703abd4b304e4ec
Diffstat (limited to 'src/Tangential_complex')
| -rw-r--r-- | src/Tangential_complex/include/gudhi/Tangential_complex.h | 10 | ||||
| -rw-r--r-- | src/Tangential_complex/test/test_tangential_complex.cpp | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/src/Tangential_complex/include/gudhi/Tangential_complex.h b/src/Tangential_complex/include/gudhi/Tangential_complex.h index 65de2743..cfc82eb1 100644 --- a/src/Tangential_complex/include/gudhi/Tangential_complex.h +++ b/src/Tangential_complex/include/gudhi/Tangential_complex.h @@ -1314,14 +1314,6 @@ class Tangential_complex { m_k.construct_vector_d_object(); typename K::Compute_coordinate_d coord = m_k.compute_coordinate_d_object(); - typename K::Squared_length_d sqlen = - m_k.squared_length_d_object(); - typename K::Scaled_vector_d scaled_vec = - m_k.scaled_vector_d_object(); - typename K::Scalar_product_d scalar_pdct = - m_k.scalar_product_d_object(); - typename K::Difference_of_vectors_d diff_vec = - m_k.difference_of_vectors_d_object(); #ifdef GUDHI_TC_USE_ANOTHER_POINT_SET_FOR_TANGENT_SPACE_ESTIM KNS_range kns_range = m_points_ds_for_tse.query_k_nearest_neighbors( @@ -2159,7 +2151,7 @@ class Tangential_complex { typedef std::vector<Simplex> Triangles; Triangles triangles; - std::size_t num_vertices = c.size(); + int num_vertices = static_cast<int>(c.size()); // Do not export smaller dimension simplices if (num_vertices < m_intrinsic_dim + 1) continue; diff --git a/src/Tangential_complex/test/test_tangential_complex.cpp b/src/Tangential_complex/test/test_tangential_complex.cpp index ebe5cdb4..48156440 100644 --- a/src/Tangential_complex/test/test_tangential_complex.cpp +++ b/src/Tangential_complex/test/test_tangential_complex.cpp @@ -71,9 +71,7 @@ BOOST_AUTO_TEST_CASE(test_Spatial_tree_data_structure) { BOOST_AUTO_TEST_CASE(test_mini_tangential) { typedef CGAL::Epick_d<CGAL::Dynamic_dimension_tag> Kernel; - typedef Kernel::FT FT; typedef Kernel::Point_d Point; - typedef Kernel::Vector_d Vector; typedef tc::Tangential_complex<Kernel, CGAL::Dynamic_dimension_tag, CGAL::Parallel_tag> TC; |