diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-07-01 07:06:29 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-07-01 07:06:29 +0000 |
| commit | e5085c7eeacb09696d415a2877855b989262e454 (patch) | |
| tree | 3725fb00557ba4b2652c0e2fd33f6ac4e86bd924 /src/Contraction | |
| parent | 335269117566c598b38b55345ad1ceef0b4f45e2 (diff) | |
| parent | 0ba8c838da6c82e9ff26e787e32057c803996b40 (diff) | |
Merge of fix_naming branch
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1373 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: cdd9722e1d58fca13de0f9a9cf0404eb3a22d98d
Diffstat (limited to 'src/Contraction')
| -rw-r--r-- | src/Contraction/example/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Contraction/example/Garland_heckbert.cpp | 2 | ||||
| -rw-r--r-- | src/Contraction/example/Rips_contraction.cpp | 2 | ||||
| -rw-r--r-- | src/Contraction/include/gudhi/Edge_contraction.h | 2 | ||||
| -rw-r--r-- | src/Contraction/include/gudhi/Skeleton_blocker_contractor.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/Contraction/example/CMakeLists.txt b/src/Contraction/example/CMakeLists.txt index 00dea98d..4c09a0a7 100644 --- a/src/Contraction/example/CMakeLists.txt +++ b/src/Contraction/example/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.6) -project(GUDHIskbl) +project(Contraction_examples) add_executable(RipsContraction Rips_contraction.cpp) diff --git a/src/Contraction/example/Garland_heckbert.cpp b/src/Contraction/example/Garland_heckbert.cpp index b545a066..cbc46e91 100644 --- a/src/Contraction/example/Garland_heckbert.cpp +++ b/src/Contraction/example/Garland_heckbert.cpp @@ -37,7 +37,7 @@ using namespace std; using namespace Gudhi; -using namespace skbl; +using namespace skeleton_blocker; using namespace contraction; struct Geometry_trait { diff --git a/src/Contraction/example/Rips_contraction.cpp b/src/Contraction/example/Rips_contraction.cpp index f80cc2dc..978dd1cb 100644 --- a/src/Contraction/example/Rips_contraction.cpp +++ b/src/Contraction/example/Rips_contraction.cpp @@ -29,7 +29,7 @@ using namespace std; using namespace Gudhi; -using namespace skbl; +using namespace skeleton_blocker; using namespace contraction; struct Geometry_trait { diff --git a/src/Contraction/include/gudhi/Edge_contraction.h b/src/Contraction/include/gudhi/Edge_contraction.h index 1b2cdee9..5af13c3e 100644 --- a/src/Contraction/include/gudhi/Edge_contraction.h +++ b/src/Contraction/include/gudhi/Edge_contraction.h @@ -127,7 +127,7 @@ while ensuring its homotopy type is preserved during the contraction (edge are c using namespace std; using namespace Gudhi; -using namespace skbl; +using namespace skeleton_blocker; using namespace contraction; struct Geometry_trait{ diff --git a/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h b/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h index f650473a..df884c93 100644 --- a/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h +++ b/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h @@ -100,7 +100,7 @@ Contraction_visitor<Profile>* make_remove_popable_blockers_visitor() { * */ template<class GeometricSimplifiableComplex, class EdgeProfile = Edge_profile<GeometricSimplifiableComplex>> -class Skeleton_blocker_contractor : private skbl::Dummy_complex_visitor< +class Skeleton_blocker_contractor : private skeleton_blocker::Dummy_complex_visitor< typename GeometricSimplifiableComplex::Vertex_handle> { GeometricSimplifiableComplex& complex_; |