1 --- a/examples/rips/rips-pairwise.py Thu Jul 30 10:35:49 2009 -0700
2 +++ b/examples/rips/rips-pairwise.py Mon Jul 25 23:21:29 2011 -0700
3 @@ -13,7 +13,7 @@
4 rips = Rips(distances)
5 print time.asctime(), "Rips initialized"
6
7 - simplices = []
8 + simplices = Filtration()
9 rips.generate(skeleton, max, simplices.append)
10 print time.asctime(), "Generated complex: %d simplices" % len(simplices)
11
12 @@ -22,27 +22,28 @@
13 for s in simplices: s.data = rips.eval(s)
14 print time.asctime(), simplices[0], '...', simplices[-1]
15
16 - f = Filtration(simplices, data_dim_cmp) # could be rips.cmp if s.data for s in simplices is not set
17 + simplices.sort(data_dim_cmp) # could be rips.cmp if s.data for s in simplices is not set
18 print time.asctime(), "Set up filtration"
19
20 - p = StaticPersistence(f)
21 + p = StaticPersistence(simplices)
22 print time.asctime(), "Initialized StaticPersistence"
23
24 p.pair_simplices()
25 print time.asctime(), "Simplices paired"
26
27 print "Outputting persistence diagram"
28 + smap = p.make_simplex_map(simplices)
29 for i in p:
30 if i.sign():
31 - b = simplices[f[p(i)]]
32 + b = smap[i]
33
34 if b.dimension() >= skeleton: continue
35
36 - if i == i.pair:
37 + if i.unpaired():
38 print b.dimension(), b.data, "inf"
39 continue
40
41 - d = simplices[f[p(i.pair)]]
42 + d = smap[i.pair()]
43 print b.dimension(), b.data, d.data
44
45 if __name__ == '__main__':