author Aravindakshan Babu <>
Tue, 17 Aug 2010 22:19:19 -0700
changeset 219 5311343eb2f5
parent 218 4f70a473e34b
child 220 d07d77561661
permissions -rw-r--r--
Added documentation for the python classes Point and PersistenceDiagram. Removed the __sub__ method for PersistenceDiagram. Minor renaming. Renamed BottleneckDistance to bottleneck_distance. Renamed intervals iterator for PersistenceDiagram to points. Seems in better conformance with usage.

from    _dionysus   import *
from    distances   import l2, ExplicitDistances, points_file
from    zigzag      import *

def init_with_none(self, iter, data = None):        # convenience: data defaults to None
    self._cpp_init_(iter, data)

def repr_with_data(self):
    str = self._cpp_repr_()
    if type( == float:
        str += ' %f' %
    return str

Simplex._cpp_init_ =    Simplex.__init__
Simplex.__init__   =    init_with_none
Simplex._cpp_repr_ =    Simplex.__repr__
Simplex.__repr__   =    repr_with_data

def data_cmp(s1, s2):
    return cmp(,

def data_dim_cmp(s1,s2):
    return cmp(s1.dimension(), s2.dimension()) or data_cmp(s1,s2)

def vertex_dim_cmp(s1, s2):
    return cmp(s1.dimension(), s2.dimension()) or vertex_cmp(s1, s2)

# TBD: Port this into C++
def point_iterator( point ):

    yield point.x
    yield point.y
    if not is None:

Point.__iter__ = point_iterator

def persistence_diagram_iterator( self ):
    This returns a list of lists.
    Whereas the intervals iterator returns a list of dionysus.Point objects

    # self.intervals is an iterator object,
    # whose next method returns a Point object
    for intv in self.points:
        yield [ x for x in intv ]

PersistenceDiagram.__iter__ = persistence_diagram_iterator