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/Contraction | |
| 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/Contraction')
| -rw-r--r-- | src/Contraction/example/Garland_heckbert.cpp | 1 | ||||
| -rw-r--r-- | src/Contraction/example/Rips_contraction.cpp | 1 | ||||
| -rw-r--r-- | src/Contraction/include/gudhi/Edge_contraction.h | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/Contraction/example/Garland_heckbert.cpp b/src/Contraction/example/Garland_heckbert.cpp index cbc46e91..5347830c 100644 --- a/src/Contraction/example/Garland_heckbert.cpp +++ b/src/Contraction/example/Garland_heckbert.cpp @@ -35,7 +35,6 @@ #include "Garland_heckbert/Error_quadric.h" -using namespace std; using namespace Gudhi; using namespace skeleton_blocker; using namespace contraction; diff --git a/src/Contraction/example/Rips_contraction.cpp b/src/Contraction/example/Rips_contraction.cpp index 978dd1cb..7f19e239 100644 --- a/src/Contraction/example/Rips_contraction.cpp +++ b/src/Contraction/example/Rips_contraction.cpp @@ -27,7 +27,6 @@ #include <boost/timer/timer.hpp> #include <iostream> -using namespace std; using namespace Gudhi; using namespace skeleton_blocker; using namespace contraction; diff --git a/src/Contraction/include/gudhi/Edge_contraction.h b/src/Contraction/include/gudhi/Edge_contraction.h index 5af13c3e..61f2d945 100644 --- a/src/Contraction/include/gudhi/Edge_contraction.h +++ b/src/Contraction/include/gudhi/Edge_contraction.h @@ -41,7 +41,7 @@ namespace contraction { \author David Salinas -\section Introduction +\section edgecontractionintroduction Introduction The purpose of this package is to offer a user-friendly interface for edge contraction simplification of huge simplicial complexes. It uses the \ref skbl data-structure whose size remains small during simplification |