diff options
Diffstat (limited to 'GudhUI/utils')
-rw-r--r-- | GudhUI/utils/Bar_code_persistence.h | 23 | ||||
-rw-r--r-- | GudhUI/utils/Critical_points.h | 4 | ||||
-rw-r--r-- | GudhUI/utils/Edge_collapsor.h | 2 | ||||
-rw-r--r-- | GudhUI/utils/Edge_contractor.h | 2 | ||||
-rw-r--r-- | GudhUI/utils/Furthest_point_epsilon_net.h | 2 | ||||
-rw-r--r-- | GudhUI/utils/Is_manifold.h | 2 | ||||
-rw-r--r-- | GudhUI/utils/K_nearest_builder.h | 4 | ||||
-rw-r--r-- | GudhUI/utils/Lloyd_builder.h | 2 | ||||
-rw-r--r-- | GudhUI/utils/MClock.h | 2 | ||||
-rw-r--r-- | GudhUI/utils/Persistence_compute.h | 2 | ||||
-rw-r--r-- | GudhUI/utils/Rips_builder.h | 4 | ||||
-rw-r--r-- | GudhUI/utils/UI_utils.h | 2 | ||||
-rw-r--r-- | GudhUI/utils/Vertex_collapsor.h | 2 |
13 files changed, 38 insertions, 15 deletions
diff --git a/GudhUI/utils/Bar_code_persistence.h b/GudhUI/utils/Bar_code_persistence.h index b527d684..49c87b3c 100644 --- a/GudhUI/utils/Bar_code_persistence.h +++ b/GudhUI/utils/Bar_code_persistence.h @@ -1,3 +1,26 @@ +/* This file is part of the Gudhi Library. The Gudhi library + * (Geometric Understanding in Higher Dimensions) is a generic C++ + * library for computational topology. + * + * Author(s): David Salinas + * + * Copyright (C) 2014 Inria + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + #include <math.h> // isfinite #include <QtGui/QApplication> diff --git a/GudhUI/utils/Critical_points.h b/GudhUI/utils/Critical_points.h index 2a18e079..fbd690f8 100644 --- a/GudhUI/utils/Critical_points.h +++ b/GudhUI/utils/Critical_points.h @@ -4,7 +4,7 @@ * * Author(s): David Salinas * - * Copyright (C) 2014 INRIA Sophia Antipolis-Mediterranee (France) + * Copyright (C) 2014 Inria * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -79,7 +79,7 @@ template<typename SkBlComplex> class Critical_points { unsigned pos = 0; for (Edge e : edges) { std::cout << "edge " << pos++ << "/" << edges.size() << "\n"; - auto eh = filled_complex_.add_edge(e.first, e.second); + auto eh = filled_complex_.add_edge_without_blockers(e.first, e.second); int is_contractible(is_link_reducible(eh)); switch (is_contractible) { diff --git a/GudhUI/utils/Edge_collapsor.h b/GudhUI/utils/Edge_collapsor.h index 151e9b01..b3cc7df7 100644 --- a/GudhUI/utils/Edge_collapsor.h +++ b/GudhUI/utils/Edge_collapsor.h @@ -4,7 +4,7 @@ * * Author(s): David Salinas * - * Copyright (C) 2014 INRIA Sophia Antipolis-Mediterranee (France) + * Copyright (C) 2014 Inria * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/GudhUI/utils/Edge_contractor.h b/GudhUI/utils/Edge_contractor.h index 8a29ff4b..090baabe 100644 --- a/GudhUI/utils/Edge_contractor.h +++ b/GudhUI/utils/Edge_contractor.h @@ -4,7 +4,7 @@ * * Author(s): David Salinas * - * Copyright (C) 2014 INRIA Sophia Antipolis-Mediterranee (France) + * Copyright (C) 2014 Inria * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/GudhUI/utils/Furthest_point_epsilon_net.h b/GudhUI/utils/Furthest_point_epsilon_net.h index 98346daa..dbb6661c 100644 --- a/GudhUI/utils/Furthest_point_epsilon_net.h +++ b/GudhUI/utils/Furthest_point_epsilon_net.h @@ -4,7 +4,7 @@ * * Author(s): David Salinas * - * Copyright (C) 2014 INRIA Sophia Antipolis-Mediterranee (France) + * Copyright (C) 2014 Inria * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/GudhUI/utils/Is_manifold.h b/GudhUI/utils/Is_manifold.h index d0974463..732df607 100644 --- a/GudhUI/utils/Is_manifold.h +++ b/GudhUI/utils/Is_manifold.h @@ -7,7 +7,7 @@ * * Author(s): David Salinas * - * Copyright (C) 2014 INRIA Sophia Antipolis-Mediterranee (France) + * Copyright (C) 2014 Inria * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/GudhUI/utils/K_nearest_builder.h b/GudhUI/utils/K_nearest_builder.h index 7be0a4f4..14851d96 100644 --- a/GudhUI/utils/K_nearest_builder.h +++ b/GudhUI/utils/K_nearest_builder.h @@ -4,7 +4,7 @@ * * Author(s): David Salinas * - * Copyright (C) 2014 INRIA Sophia Antipolis-Mediterranee (France) + * Copyright (C) 2014 Inria * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -81,7 +81,7 @@ template<typename SkBlComplex> class K_nearest_builder { for (auto it = ++search.begin(); it != search.end(); ++it) { Vertex_handle q(std::get<1>(it->first)); if (p != q && complex_.contains_vertex(p) && complex_.contains_vertex(q)) - complex_.add_edge(p, q); + complex_.add_edge_without_blockers(p, q); } } } diff --git a/GudhUI/utils/Lloyd_builder.h b/GudhUI/utils/Lloyd_builder.h index 18ec9fac..67595d33 100644 --- a/GudhUI/utils/Lloyd_builder.h +++ b/GudhUI/utils/Lloyd_builder.h @@ -4,7 +4,7 @@ * * Author(s): David Salinas * - * Copyright (C) 2014 INRIA Sophia Antipolis-Mediterranee (France) + * Copyright (C) 2014 Inria * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/GudhUI/utils/MClock.h b/GudhUI/utils/MClock.h index e8d8918a..992f6fa5 100644 --- a/GudhUI/utils/MClock.h +++ b/GudhUI/utils/MClock.h @@ -4,7 +4,7 @@ * * Author(s): David Salinas * - * Copyright (C) 2014 INRIA Sophia Antipolis-Mediterranee (France) + * Copyright (C) 2014 Inria * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/GudhUI/utils/Persistence_compute.h b/GudhUI/utils/Persistence_compute.h index 2dc03c8e..c8afded9 100644 --- a/GudhUI/utils/Persistence_compute.h +++ b/GudhUI/utils/Persistence_compute.h @@ -4,7 +4,7 @@ * * Author(s): David Salinas * - * Copyright (C) 2014 INRIA Sophia Antipolis-Mediterranee (France) + * Copyright (C) 2014 Inria * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/GudhUI/utils/Rips_builder.h b/GudhUI/utils/Rips_builder.h index b22f4db6..ed62c1c0 100644 --- a/GudhUI/utils/Rips_builder.h +++ b/GudhUI/utils/Rips_builder.h @@ -4,7 +4,7 @@ * * Author(s): David Salinas * - * Copyright (C) 2014 INRIA Sophia Antipolis-Mediterranee (France) + * Copyright (C) 2014 Inria * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ template<typename SkBlComplex> class Rips_builder { std::cout.flush(); for (auto q = p; ++q != vertices.end(); /**/) if (squared_eucl_distance(complex_.point(*p), complex_.point(*q)) < 4 * alpha * alpha) - complex_.add_edge(*p, *q); + complex_.add_edge_without_blockers(*p, *q); } std::cout << std::endl; } diff --git a/GudhUI/utils/UI_utils.h b/GudhUI/utils/UI_utils.h index 9cc209d3..67a02869 100644 --- a/GudhUI/utils/UI_utils.h +++ b/GudhUI/utils/UI_utils.h @@ -4,7 +4,7 @@ * * Author(s): David Salinas * - * Copyright (C) 2014 INRIA Sophia Antipolis-Mediterranee (France) + * Copyright (C) 2014 Inria * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/GudhUI/utils/Vertex_collapsor.h b/GudhUI/utils/Vertex_collapsor.h index 568dab2f..fca57f7d 100644 --- a/GudhUI/utils/Vertex_collapsor.h +++ b/GudhUI/utils/Vertex_collapsor.h @@ -4,7 +4,7 @@ * * Author(s): David Salinas * - * Copyright (C) 2014 INRIA Sophia Antipolis-Mediterranee (France) + * Copyright (C) 2014 Inria * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |