diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-09-27 07:44:40 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-09-27 07:44:40 +0000 |
commit | 2f0d4a7a06f8fde904b75b27c3836e362f549707 (patch) | |
tree | e1522803404837c461756715629cf9647eef9317 /src/GudhUI | |
parent | 9ffc108705ace9910cabc79225d984fe1d15b794 (diff) | |
parent | a138c9ed4fb9770a3612ff4ee0f914942bbe9724 (diff) |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1568 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 14c192615a0b9b79121a8395e721978b72272536
Diffstat (limited to 'src/GudhUI')
-rw-r--r-- | src/GudhUI/model/Model.h | 4 | ||||
-rw-r--r-- | src/GudhUI/utils/Edge_contractor.h | 2 | ||||
-rw-r--r-- | src/GudhUI/utils/Furthest_point_epsilon_net.h | 2 | ||||
-rw-r--r-- | src/GudhUI/view/FirstCoordProjector.h | 6 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/GudhUI/model/Model.h b/src/GudhUI/model/Model.h index 1c39c0d7..77e37b6c 100644 --- a/src/GudhUI/model/Model.h +++ b/src/GudhUI/model/Model.h @@ -72,8 +72,8 @@ class CGAL_geometric_flag_complex_wrapper { void maximal_face(std::vector<int> vertices) { if (!load_only_points_) { // std::cout << "size:" << vertices.size() << std::endl; - for (int i = 0; i < vertices.size(); ++i) - for (int j = i + 1; j < vertices.size(); ++j) + for (std::size_t i = 0; i < vertices.size(); ++i) + for (std::size_t j = i + 1; j < vertices.size(); ++j) complex_.add_edge(Vertex_handle(vertices[i]), Vertex_handle(vertices[j])); } } diff --git a/src/GudhUI/utils/Edge_contractor.h b/src/GudhUI/utils/Edge_contractor.h index 45079a40..8a29ff4b 100644 --- a/src/GudhUI/utils/Edge_contractor.h +++ b/src/GudhUI/utils/Edge_contractor.h @@ -65,7 +65,7 @@ template<typename SkBlComplex> class Edge_contractor { Placement_type operator()(const EdgeProfile& profile) const override { std::vector<double> mid_coords(profile.p0().dimension(), 0); - for (size_t i = 0; i < profile.p0().dimension(); ++i) { + for (int i = 0; i < profile.p0().dimension(); ++i) { mid_coords[i] = (profile.p0()[i] + profile.p1()[i]) / 2.; } return Point(profile.p0().dimension(), mid_coords.begin(), mid_coords.end()); diff --git a/src/GudhUI/utils/Furthest_point_epsilon_net.h b/src/GudhUI/utils/Furthest_point_epsilon_net.h index f2a216f6..98346daa 100644 --- a/src/GudhUI/utils/Furthest_point_epsilon_net.h +++ b/src/GudhUI/utils/Furthest_point_epsilon_net.h @@ -73,7 +73,7 @@ template<typename SkBlComplex> class Furthest_point_epsilon_net { complex_(complex) { if (!complex.empty()) { init_filtration(); - for (int k = 2; k < net_filtration_.size(); ++k) { + for (std::size_t k = 2; k < net_filtration_.size(); ++k) { update_radius_value(k); } } diff --git a/src/GudhUI/view/FirstCoordProjector.h b/src/GudhUI/view/FirstCoordProjector.h index a4027b7f..1333f5d3 100644 --- a/src/GudhUI/view/FirstCoordProjector.h +++ b/src/GudhUI/view/FirstCoordProjector.h @@ -33,9 +33,11 @@ class FirstCoordProjector3D : public Projector3D { Point_3 operator()(const Point& p) const { if (p.dimension() >= 3) - return Point_3(p.x(), p.y(), p.z()); + return Point_3(p.x(), p.y(), p.z()); else if (p.dimension() >= 2) - return Point_3(p.x(), p.y(), 0.0); + return Point_3(p.x(), p.y(), 0.0); + else + return Point_3(0.0, 0.0, 0.0); } }; |