summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2015-06-30 05:59:11 +0000
committerfgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2015-06-30 05:59:11 +0000
commit936b0edbee931d8145729e08bbde2b053c82e637 (patch)
tree4b44d312ee6c97513bbf8dea0fd8a7e2aa6f7b35
parentc0543ba5794592af4b0ea01d35710d44e206a8a3 (diff)
non du namespace
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneckDistance@662 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 889d4646f58d2eec59f790bc2a101d1e0e7a87b7
-rw-r--r--src/Bipartite_graph_matching/include/gudhi/Graph_matching.h4
-rw-r--r--src/Bipartite_graph_matching/include/gudhi/Grid_cell.h4
-rw-r--r--src/Bipartite_graph_matching/include/gudhi/Layered_neighbors_finder.h4
-rw-r--r--src/Bipartite_graph_matching/include/gudhi/Neighbors_finder.h4
-rw-r--r--src/Bipartite_graph_matching/include/gudhi/Persistence_diagrams_graph.h4
-rw-r--r--src/Bipartite_graph_matching/include/gudhi/Planar_neighbors_finder.h4
6 files changed, 12 insertions, 12 deletions
diff --git a/src/Bipartite_graph_matching/include/gudhi/Graph_matching.h b/src/Bipartite_graph_matching/include/gudhi/Graph_matching.h
index 2bcc6a61..46a5f375 100644
--- a/src/Bipartite_graph_matching/include/gudhi/Graph_matching.h
+++ b/src/Bipartite_graph_matching/include/gudhi/Graph_matching.h
@@ -31,7 +31,7 @@
namespace Gudhi {
-namespace bottleneck {
+namespace bipartite_graph_matching {
/** \brief Function to use in order to compute the Bottleneck distance between two persistence diagrams.
*
@@ -209,7 +209,7 @@ double bottleneck_distance(const Persistence_diagram1 &diag1, const Persistence_
return sd->at(idmin);
}
-} // namespace bottleneck
+} // namespace bipartite_graph_matching
} // namespace Gudhi
diff --git a/src/Bipartite_graph_matching/include/gudhi/Grid_cell.h b/src/Bipartite_graph_matching/include/gudhi/Grid_cell.h
index eee938cb..e9cf08b9 100644
--- a/src/Bipartite_graph_matching/include/gudhi/Grid_cell.h
+++ b/src/Bipartite_graph_matching/include/gudhi/Grid_cell.h
@@ -31,7 +31,7 @@
namespace Gudhi {
-namespace bottleneck {
+namespace bipartite_graph_matching {
/** \internal \brief TODO
*
@@ -181,7 +181,7 @@ inline int Grid_cell::pull_xi_yi(int u_point_index){
return null_point_index();
}
-} // namespace bottleneck
+} // namespace bipartite_graph_matching
} // namespace Gudhi
diff --git a/src/Bipartite_graph_matching/include/gudhi/Layered_neighbors_finder.h b/src/Bipartite_graph_matching/include/gudhi/Layered_neighbors_finder.h
index 58805b86..8303627a 100644
--- a/src/Bipartite_graph_matching/include/gudhi/Layered_neighbors_finder.h
+++ b/src/Bipartite_graph_matching/include/gudhi/Layered_neighbors_finder.h
@@ -29,7 +29,7 @@
namespace Gudhi {
-namespace bottleneck {
+namespace bipartite_graph_matching {
/** \internal \brief data structure used to find any point (including projections) in V near to a query point from U
* (which can be a projection) in a layered graph layer given as parmeter.
@@ -73,7 +73,7 @@ inline int Layered_neighbors_finder::vlayers_number() const {
return static_cast<int>(neighbors_finder.size());
}
-} // namespace bottleneck
+} // namespace bipartite_graph_matching
} // namespace Gudhi
diff --git a/src/Bipartite_graph_matching/include/gudhi/Neighbors_finder.h b/src/Bipartite_graph_matching/include/gudhi/Neighbors_finder.h
index be81877a..879ba300 100644
--- a/src/Bipartite_graph_matching/include/gudhi/Neighbors_finder.h
+++ b/src/Bipartite_graph_matching/include/gudhi/Neighbors_finder.h
@@ -30,7 +30,7 @@
namespace Gudhi {
-namespace bottleneck {
+namespace bipartite_graph_matching {
/** \internal \brief data structure used to find any point (including projections) in V near to a query point from U
* (which can be a projection).
@@ -107,7 +107,7 @@ inline std::unique_ptr< std::list<int> > Neighbors_finder::pull_all_near(int u_p
return all_pull;
}
-} // namespace bottleneck
+} // namespace bipartite_graph_matching
} // namespace Gudhi
diff --git a/src/Bipartite_graph_matching/include/gudhi/Persistence_diagrams_graph.h b/src/Bipartite_graph_matching/include/gudhi/Persistence_diagrams_graph.h
index aed328e2..1b23a1b2 100644
--- a/src/Bipartite_graph_matching/include/gudhi/Persistence_diagrams_graph.h
+++ b/src/Bipartite_graph_matching/include/gudhi/Persistence_diagrams_graph.h
@@ -32,7 +32,7 @@
namespace Gudhi {
-namespace bottleneck {
+namespace bipartite_graph_matching {
/** \internal \brief Returns the used index for encoding none of the points */
int null_point_index();
@@ -183,7 +183,7 @@ inline bool G::Compare_y::operator()(const int point_index_1, const int point_in
return y1 < y2;
}
-} // namespace bottleneck
+} // namespace bipartite_graph_matching
} // namespace Gudhi
diff --git a/src/Bipartite_graph_matching/include/gudhi/Planar_neighbors_finder.h b/src/Bipartite_graph_matching/include/gudhi/Planar_neighbors_finder.h
index e403735c..60a1dd96 100644
--- a/src/Bipartite_graph_matching/include/gudhi/Planar_neighbors_finder.h
+++ b/src/Bipartite_graph_matching/include/gudhi/Planar_neighbors_finder.h
@@ -31,7 +31,7 @@
namespace Gudhi {
-namespace bottleneck {
+namespace bipartite_graph_matching {
/** \internal \brief Structure used to find any point in V near (according to the planar distance) to a query point from U.
*
@@ -125,7 +125,7 @@ inline int Naive_pnf::pull_near(int u_point_index) {
return null_point_index();
}
-} // namespace bottleneck
+} // namespace bipartite_graph_matching
} // namespace Gudhi