summaryrefslogtreecommitdiff
path: root/src/cython/example/persistence_representations_landscapes_example.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/cython/example/persistence_representations_landscapes_example.py')
-rwxr-xr-xsrc/cython/example/persistence_representations_landscapes_example.py26
1 files changed, 6 insertions, 20 deletions
diff --git a/src/cython/example/persistence_representations_landscapes_example.py b/src/cython/example/persistence_representations_landscapes_example.py
index d2b7b393..b7e47c0b 100755
--- a/src/cython/example/persistence_representations_landscapes_example.py
+++ b/src/cython/example/persistence_representations_landscapes_example.py
@@ -1,8 +1,6 @@
#!/usr/bin/env python
import gudhi
-from libcpp.vector cimport vector
-from libcpp.utility cimport pair
"""This file is part of the Gudhi Library. The Gudhi library
@@ -34,30 +32,18 @@ __license__ = "GPL v3"
print("#####################################################################")
print("Persistence representations landscapes example")
-persistence1 = vector[pair[double, double]]
-persistence2 = vector[pair[double, double]]
+persistence1 = [(1,2),(6,8),(0,4),(3,8)]
+persistence2 = [(2,9),(1,6),(3,5),(6,10)]
-persistence1.push_back(make_pair(1, 2))
-persistence1.push_back(make_pair(6, 8))
-persistence1.push_back(make_pair(0, 4))
-persistence1.push_back(make_pair(3, 8))
-
-persistence2.push_back(make_pair(2, 9))
-persistence2.push_back(make_pair(1, 6))
-persistence2.push_back(make_pair(3, 5))
-persistence2.push_back(make_pair(6, 10))
#create two persistence landscapes based on persistence1 and persistence2:
-l1 = gudhi.Persistence_landscape(persistence1)
-l2 = gudhi.Persistence_landscape(persistence2)
+l1 = gudhi.PersistenceLandscapes(vector_of_intervals=persistence1, dimension=3)
+l2 = gudhi.PersistenceLandscapes(vector_of_intervals=persistence2)
#This is how to compute integral of landscapes:
print "Integral of the first landscape : ", l1.compute_integral_of_landscape()
print "Integral of the second landscape : ", l2.compute_integral_of_landscape()
-#Arithmetic operations on landscapes:
-sum_ = l1 + l2;
-
#here are the maxima of the functions:
print "Maximum of l1 : ", l1.compute_maximum()
print "Maximum of l2 : ", l2.compute_maximum()
@@ -67,8 +53,8 @@ print "L^1 Norm of l1 : ", l1.compute_norm_of_landscape(1.)
print "L^1 Norm of l2 : ", l2.compute_norm_of_landscape(1.)
#here is the average of landscapes:
-average = Persistence_landscape
-average.compute_average({l1, l2});
+average = gudhi.PersistenceLandscapes
+average.compute_average([l1, l2])
#here is the distance of landscapes:
print "Distance : ", l1.distance(l2)