Reuse top_dimensional_cells instead of numpy_array argument to create a cubical

1 files changed, 13 insertions, 12 deletions

diff --git a/src/python/gudhi/cubical_complex.pyx b/src/python/gudhi/cubical_complex.pyx
index 2ec0146a..1aa1164c 100644
--- a/src/python/gudhi/cubical_complex.pyx
+++ b/src/python/gudhi/cubical_complex.pyx
@@ -47,7 +47,7 @@ cdef class CubicalComplex:
 
     # Fake constructor that does nothing but documenting the constructor
     def __init__(self, dimensions=None, top_dimensional_cells=None,
-                 numpy_array=None, perseus_file=''):
+                 perseus_file=''):
         """CubicalComplex constructor from dimensions and
         top_dimensional_cells or from a Perseus-style file name.
 
@@ -58,8 +58,9 @@ cdef class CubicalComplex:
 
         Or
 
-        :param numpy_array: Filtration values in a d-array.
-        :type numpy_array: numpy ndarray
+        :param top_dimensional_cells: A multidimensional array of cells
+            filtration values.
+        :type top_dimensional_cells: numpy ndarray
 
         Or
 
@@ -69,20 +70,20 @@ cdef class CubicalComplex:
 
     # The real cython constructor
     def __cinit__(self, dimensions=None, top_dimensional_cells=None,
-                  numpy_array=None, perseus_file=''):
+                  perseus_file=''):
         if ((dimensions is not None) and (top_dimensional_cells is not None)
-            and (numpy_array is None) and (perseus_file == '')):
+            and (perseus_file == '')):
             self.thisptr = new Bitmap_cubical_complex_base_interface(dimensions, top_dimensional_cells)
-        elif ((dimensions is None) and (top_dimensional_cells is None)
-            and (numpy_array is not None) and (perseus_file == '')):
-            if isinstance(numpy_array, np.ndarray):
-                dimensions = list(numpy_array.shape)
-                top_dimensional_cells = numpy_array.flatten().tolist()
+        elif ((dimensions is None) and (top_dimensional_cells is not None)
+            and (perseus_file == '')):
+            if isinstance(top_dimensional_cells, np.ndarray):
+                dimensions = list(top_dimensional_cells.shape)
+                top_dimensional_cells = top_dimensional_cells.flatten().tolist()
                 self.thisptr = new Bitmap_cubical_complex_base_interface(dimensions, top_dimensional_cells)
             else:
-                print("numpy_array is not an instance of ndarray. It is a " + type(numpy_array))
+                print("top_dimensional_cells is not an instance of ndarray. It is a " + type(top_dimensional_cells))
         elif ((dimensions is None) and (top_dimensional_cells is None)
-            and (numpy_array is None) and (perseus_file != '')):
+            and (perseus_file != '')):
             if os.path.isfile(perseus_file):
                 self.thisptr = new Bitmap_cubical_complex_base_interface(str.encode(perseus_file))
             else: