summaryrefslogtreecommitdiff
path: root/src/Simplex_tree/include/gudhi/Simplex_tree
diff options
context:
space:
mode:
authorvrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2014-12-10 14:04:18 +0000
committervrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2014-12-10 14:04:18 +0000
commit429d4f06cede4d97144592eff91689fc1c707474 (patch)
tree10cbfc316b7445b887672b8b70a39b763d65fe9a /src/Simplex_tree/include/gudhi/Simplex_tree
parente8cca67a337b9d4bdbd1a8558ad99862862145f3 (diff)
Add persistent unit test - warning fix - cpplint fix
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/cpplint_test@346 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 9ef774de762c68a449b2a9791085f58c39a0705e
Diffstat (limited to 'src/Simplex_tree/include/gudhi/Simplex_tree')
-rw-r--r--src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h15
-rw-r--r--src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h25
-rw-r--r--src/Simplex_tree/include/gudhi/Simplex_tree/indexing_tag.h7
3 files changed, 20 insertions, 27 deletions
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h
index 54d4d296..06462c88 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_iterators.h
@@ -20,12 +20,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SIMPLEX_TREE_ITERATORS_H
-#define SIMPLEX_TREE_ITERATORS_H
+#ifndef SRC_SIMPLEX_TREE_INCLUDE_GUDHI_SIMPLEX_TREE_SIMPLEX_TREE_ITERATORS_H_
+#define SRC_SIMPLEX_TREE_INCLUDE_GUDHI_SIMPLEX_TREE_SIMPLEX_TREE_ITERATORS_H_
-#include <vector>
#include <boost/iterator/iterator_facade.hpp>
+#include <vector>
+
namespace Gudhi {
/* \addtogroup simplex_tree
@@ -47,7 +48,7 @@ class Simplex_tree_simplex_vertex_iterator : public boost::iterator_facade<
typedef typename SimplexTree::Siblings Siblings;
typedef typename SimplexTree::Vertex_handle Vertex_handle;
- Simplex_tree_simplex_vertex_iterator(SimplexTree * st)
+ explicit Simplex_tree_simplex_vertex_iterator(SimplexTree * st)
: // any end() iterator
sib_(NULL),
v_(st->null_vertex()) {
@@ -93,7 +94,7 @@ class Simplex_tree_boundary_simplex_iterator : public boost::iterator_facade<
typedef typename SimplexTree::Siblings Siblings;
// any end() iterator
- Simplex_tree_boundary_simplex_iterator(SimplexTree * st)
+ explicit Simplex_tree_boundary_simplex_iterator(SimplexTree * st)
: last_(st->null_vertex()),
sib_(NULL) {
}
@@ -166,7 +167,7 @@ class Simplex_tree_complex_simplex_iterator : public boost::iterator_facade<
: st_(NULL) {
}
- Simplex_tree_complex_simplex_iterator(SimplexTree * st)
+ explicit Simplex_tree_complex_simplex_iterator(SimplexTree * st)
: st_(st) {
if (st == NULL || st->root() == NULL || st->root()->members().empty()) {
st_ = NULL;
@@ -302,4 +303,4 @@ class Simplex_tree_skeleton_simplex_iterator : public boost::iterator_facade<
/* @} */ // end addtogroup simplex_tree
} // namespace Gudhi
-#endif // SIMPLEX_TREE_ITERATORS_H
+#endif // SRC_SIMPLEX_TREE_INCLUDE_GUDHI_SIMPLEX_TREE_SIMPLEX_TREE_ITERATORS_H_
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h
index 27120f00..1f1a34cc 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h
@@ -20,11 +20,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef GUDHI_SIMPLEX_TREE_NODE_EXPLICIT_STORAGE_H
-#define GUDHI_SIMPLEX_TREE_NODE_EXPLICIT_STORAGE_H
+#ifndef SRC_SIMPLEX_TREE_INCLUDE_GUDHI_SIMPLEX_TREE_SIMPLEX_TREE_NODE_EXPLICIT_STORAGE_H_
+#define SRC_SIMPLEX_TREE_INCLUDE_GUDHI_SIMPLEX_TREE_SIMPLEX_TREE_NODE_EXPLICIT_STORAGE_H_
#include <vector>
-#include <iostream>
namespace Gudhi {
@@ -42,14 +41,10 @@ namespace Gudhi {
template<class SimplexTree>
class Simplex_tree_node_explicit_storage {
public:
-// friend SimplexTree;
-
typedef typename SimplexTree::Siblings Siblings;
typedef typename SimplexTree::Filtration_value Filtration_value;
typedef typename SimplexTree::Simplex_key Simplex_key;
- //private:
- //friend class Simplex_tree;
// Default constructor.
Simplex_tree_node_explicit_storage()
: children_(NULL),
@@ -69,13 +64,6 @@ class Simplex_tree_node_explicit_storage {
}
/*
- * Return true if the node has children,
- * false otherwise.
- */
- //bool has_children(Vertex label)
- //{ //if(children_ == NULL) return false; //for root simplices
- // return (children_->parent() == label);}
- /*
* Assign a children to the node
*/
void assign_children(Siblings * children) {
@@ -92,7 +80,7 @@ class Simplex_tree_node_explicit_storage {
return filtration_;
}
- /* Careful -> has_children() must be true*/
+ /* Careful -> children_ can be NULL*/
Siblings * children() {
return children_;
}
@@ -106,11 +94,10 @@ class Simplex_tree_node_explicit_storage {
// Data attached to simplex, explicit storage
Simplex_key simplex_key_;
- Filtration_value filtration_; //value in the filtration
-
+ Filtration_value filtration_; // value in the filtration
};
/* @} */ // end addtogroup simplex_tree
-}// namespace Gudhi
+} // namespace Gudhi
-#endif // GUDHI_SIMPLEX_TREE_NODE_EXPLICIT_STORAGE_H
+#endif // SRC_SIMPLEX_TREE_INCLUDE_GUDHI_SIMPLEX_TREE_SIMPLEX_TREE_NODE_EXPLICIT_STORAGE_H_
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree/indexing_tag.h b/src/Simplex_tree/include/gudhi/Simplex_tree/indexing_tag.h
index 680458a5..69ffa44b 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree/indexing_tag.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree/indexing_tag.h
@@ -20,6 +20,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef SRC_SIMPLEX_TREE_INCLUDE_GUDHI_SIMPLEX_TREE_INDEXING_TAG_H_
+#define SRC_SIMPLEX_TREE_INCLUDE_GUDHI_SIMPLEX_TREE_INDEXING_TAG_H_
+
namespace Gudhi {
/** \brief Tag for a linear ordering of simplices.
@@ -31,4 +34,6 @@ struct linear_indexing_tag {
/* \brief Tag for a zigzag ordering of simplices. */
// struct zigzag_indexing_tag {};
-}// namespace Gudhi
+} // namespace Gudhi
+
+#endif // SRC_SIMPLEX_TREE_INCLUDE_GUDHI_SIMPLEX_TREE_INDEXING_TAG_H_