summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-12-12 15:36:28 +0000
committervrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-12-12 15:36:28 +0000
commit911370db9608601cce5aaf9ec91f2a0ca08eb9d7 (patch)
tree587dc30c29c9e46f0708303e9c7d34b64dd0c426
parentfc454f6135bc6f63a6eb859f58835fe653eb073d (diff)
rename simplex_tree variable names
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/distance_matrix_in_rips_module@1856 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: aa283b26d5c31577698dcec271e7b0ef95b4bd0f
-rw-r--r--src/Rips_complex/example/example_one_skeleton_rips_from_distance_matrix.cpp16
-rw-r--r--src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp16
-rw-r--r--src/Rips_complex/example/example_rips_complex_from_csv_distance_matrix_file.cpp16
-rw-r--r--src/Rips_complex/example/example_rips_complex_from_off_file.cpp16
4 files changed, 32 insertions, 32 deletions
diff --git a/src/Rips_complex/example/example_one_skeleton_rips_from_distance_matrix.cpp b/src/Rips_complex/example/example_one_skeleton_rips_from_distance_matrix.cpp
index 4d577822..02bffe0d 100644
--- a/src/Rips_complex/example/example_one_skeleton_rips_from_distance_matrix.cpp
+++ b/src/Rips_complex/example/example_one_skeleton_rips_from_distance_matrix.cpp
@@ -44,23 +44,23 @@ int main(int argc, char **argv) {
// ----------------------------------------------------------------------------
Rips_complex rips_complex_from_points(distances, threshold);
- Simplex_tree simplex;
- if (rips_complex_from_points.create_complex(simplex, 1)) {
+ Simplex_tree stree;
+ if (rips_complex_from_points.create_complex(stree, 1)) {
// ----------------------------------------------------------------------------
// Display information about the one skeleton rips complex
// ----------------------------------------------------------------------------
- std::cout << "Rips complex is of dimension " << simplex.dimension() <<
- " - " << simplex.num_simplices() << " simplices - " <<
- simplex.num_vertices() << " vertices." << std::endl;
+ std::cout << "Rips complex is of dimension " << stree.dimension() <<
+ " - " << stree.num_simplices() << " simplices - " <<
+ stree.num_vertices() << " vertices." << std::endl;
std::cout << "Iterator on rips complex simplices in the filtration order, with [filtration value]:" <<
std::endl;
- for (auto f_simplex : simplex.filtration_simplex_range()) {
+ for (auto f_simplex : stree.filtration_simplex_range()) {
std::cout << " ( ";
- for (auto vertex : simplex.simplex_vertex_range(f_simplex)) {
+ for (auto vertex : stree.simplex_vertex_range(f_simplex)) {
std::cout << vertex << " ";
}
- std::cout << ") -> " << "[" << simplex.filtration(f_simplex) << "] ";
+ std::cout << ") -> " << "[" << stree.filtration(f_simplex) << "] ";
std::cout << std::endl;
}
}
diff --git a/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp b/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp
index 9e90c72e..efbcd88e 100644
--- a/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp
+++ b/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp
@@ -39,23 +39,23 @@ int main(int argc, char **argv) {
// ----------------------------------------------------------------------------
Rips_complex rips_complex_from_points(points, threshold, Euclidean_distance());
- Simplex_tree simplex;
- if (rips_complex_from_points.create_complex(simplex, 1)) {
+ Simplex_tree stree;
+ if (rips_complex_from_points.create_complex(stree, 1)) {
// ----------------------------------------------------------------------------
// Display information about the one skeleton rips complex
// ----------------------------------------------------------------------------
- std::cout << "Rips complex is of dimension " << simplex.dimension() <<
- " - " << simplex.num_simplices() << " simplices - " <<
- simplex.num_vertices() << " vertices." << std::endl;
+ std::cout << "Rips complex is of dimension " << stree.dimension() <<
+ " - " << stree.num_simplices() << " simplices - " <<
+ stree.num_vertices() << " vertices." << std::endl;
std::cout << "Iterator on rips complex simplices in the filtration order, with [filtration value]:" <<
std::endl;
- for (auto f_simplex : simplex.filtration_simplex_range()) {
+ for (auto f_simplex : stree.filtration_simplex_range()) {
std::cout << " ( ";
- for (auto vertex : simplex.simplex_vertex_range(f_simplex)) {
+ for (auto vertex : stree.simplex_vertex_range(f_simplex)) {
std::cout << vertex << " ";
}
- std::cout << ") -> " << "[" << simplex.filtration(f_simplex) << "] ";
+ std::cout << ") -> " << "[" << stree.filtration(f_simplex) << "] ";
std::cout << std::endl;
}
}
diff --git a/src/Rips_complex/example/example_rips_complex_from_csv_distance_matrix_file.cpp b/src/Rips_complex/example/example_rips_complex_from_csv_distance_matrix_file.cpp
index 93160b1b..7cdaffdf 100644
--- a/src/Rips_complex/example/example_rips_complex_from_csv_distance_matrix_file.cpp
+++ b/src/Rips_complex/example/example_rips_complex_from_csv_distance_matrix_file.cpp
@@ -45,25 +45,25 @@ int main(int argc, char **argv) {
streambufffer = std::cout.rdbuf();
}
- Simplex_tree simplex;
- if (rips_complex_from_file.create_complex(simplex, dim_max)) {
+ Simplex_tree stree;
+ if (rips_complex_from_file.create_complex(stree, dim_max)) {
std::ostream output_stream(streambufffer);
// ----------------------------------------------------------------------------
// Display information about the rips complex
// ----------------------------------------------------------------------------
- output_stream << "Rips complex is of dimension " << simplex.dimension() <<
- " - " << simplex.num_simplices() << " simplices - " <<
- simplex.num_vertices() << " vertices." << std::endl;
+ output_stream << "Rips complex is of dimension " << stree.dimension() <<
+ " - " << stree.num_simplices() << " simplices - " <<
+ stree.num_vertices() << " vertices." << std::endl;
output_stream << "Iterator on rips complex simplices in the filtration order, with [filtration value]:" <<
std::endl;
- for (auto f_simplex : simplex.filtration_simplex_range()) {
+ for (auto f_simplex : stree.filtration_simplex_range()) {
output_stream << " ( ";
- for (auto vertex : simplex.simplex_vertex_range(f_simplex)) {
+ for (auto vertex : stree.simplex_vertex_range(f_simplex)) {
output_stream << vertex << " ";
}
- output_stream << ") -> " << "[" << simplex.filtration(f_simplex) << "] ";
+ output_stream << ") -> " << "[" << stree.filtration(f_simplex) << "] ";
output_stream << std::endl;
}
}
diff --git a/src/Rips_complex/example/example_rips_complex_from_off_file.cpp b/src/Rips_complex/example/example_rips_complex_from_off_file.cpp
index 23e49add..8849d784 100644
--- a/src/Rips_complex/example/example_rips_complex_from_off_file.cpp
+++ b/src/Rips_complex/example/example_rips_complex_from_off_file.cpp
@@ -44,25 +44,25 @@ int main(int argc, char **argv) {
streambufffer = std::cout.rdbuf();
}
- Simplex_tree simplex;
- if (rips_complex_from_file.create_complex(simplex, dim_max)) {
+ Simplex_tree stree;
+ if (rips_complex_from_file.create_complex(stree, dim_max)) {
std::ostream output_stream(streambufffer);
// ----------------------------------------------------------------------------
// Display information about the rips complex
// ----------------------------------------------------------------------------
- output_stream << "Rips complex is of dimension " << simplex.dimension() <<
- " - " << simplex.num_simplices() << " simplices - " <<
- simplex.num_vertices() << " vertices." << std::endl;
+ output_stream << "Rips complex is of dimension " << stree.dimension() <<
+ " - " << stree.num_simplices() << " simplices - " <<
+ stree.num_vertices() << " vertices." << std::endl;
output_stream << "Iterator on rips complex simplices in the filtration order, with [filtration value]:" <<
std::endl;
- for (auto f_simplex : simplex.filtration_simplex_range()) {
+ for (auto f_simplex : stree.filtration_simplex_range()) {
output_stream << " ( ";
- for (auto vertex : simplex.simplex_vertex_range(f_simplex)) {
+ for (auto vertex : stree.simplex_vertex_range(f_simplex)) {
output_stream << vertex << " ";
}
- output_stream << ") -> " << "[" << simplex.filtration(f_simplex) << "] ";
+ output_stream << ") -> " << "[" << stree.filtration(f_simplex) << "] ";
output_stream << std::endl;
}
}