summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Glisse <marc.glisse@inria.fr>2020-07-30 19:45:36 +0200
committerMarc Glisse <marc.glisse@inria.fr>2020-07-30 19:45:36 +0200
commit31acee0a124afc628b906349e468a9aa9fac4a2a (patch)
treef1d267376ea748f5298a655cdac3e5e2dbfc9e19
parent83acc2e74cd8a34f34d0082c85ea85b3260d2458 (diff)
Review comments
-rw-r--r--src/python/gudhi/simplex_tree.pyx5
-rw-r--r--src/python/include/Simplex_tree_interface.h6
2 files changed, 4 insertions, 7 deletions
diff --git a/src/python/gudhi/simplex_tree.pyx b/src/python/gudhi/simplex_tree.pyx
index 9d2c30a9..1df2420e 100644
--- a/src/python/gudhi/simplex_tree.pyx
+++ b/src/python/gudhi/simplex_tree.pyx
@@ -233,10 +233,7 @@ cdef class SimplexTree:
"""
# TODO: optimize this
for edge in zip(edges.row, edges.col, edges.data):
- if edge[0] == edge[1]:
- self.get_ptr().insert((edge[0],), edge[2])
- else:
- self.get_ptr().insert((edge[0], edge[1]), edge[2])
+ self.get_ptr().insert((edge[0], edge[1]), edge[2])
def get_simplices(self):
"""This function returns a generator with simplices and their given
diff --git a/src/python/include/Simplex_tree_interface.h b/src/python/include/Simplex_tree_interface.h
index f570c5fc..3061884f 100644
--- a/src/python/include/Simplex_tree_interface.h
+++ b/src/python/include/Simplex_tree_interface.h
@@ -64,14 +64,14 @@ class Simplex_tree_interface : public Simplex_tree<SimplexTreeOptions> {
// and this is a bit more efficient.
auto& rm = this->root()->members_;
for(int i=0; i<n; ++i) {
- char* p = (char*)filtrations + i * stride0;
- double fv = *(double*)(p + i * stride1);
+ char* p = reinterpret_cast<char*>(filtrations) + i * stride0;
+ double fv = *reinterpret_cast<double*>(p + i * stride1);
if(fv > max_filtration) continue;
auto sh = rm.emplace_hint(rm.end(), i, Node(this->root(), fv));
Siblings* children = nullptr;
// Should we make a first pass to count the number of edges so we can reserve the right space?
for(int j=i+1; j<n; ++j) {
- double fe = *(double*)(p + j * stride1);
+ double fe = *reinterpret_cast<double*>(p + j * stride1);
if(fe > max_filtration) continue;
if(!children) {
children = new Siblings(this->root(), i);