1.1 --- a/test.py Thu Feb 03 01:26:35 2011 +0100
1.2 +++ b/test.py Mon Feb 07 02:05:38 2011 +0100
1.3 @@ -32,49 +32,53 @@
1.4
1.5 f = open("test", "wb")
1.6 w = FileWriter(f)
1.7 +w.begin_record()
1.8 for number in numbers:
1.9 w.write_number(number)
1.10 +w.end_record()
1.11 w.close()
1.12
1.13 f = open("test", "rb")
1.14 r = FileReader(f)
1.15 +r.begin_record()
1.16 for number in numbers:
1.17 n = r.read_number()
1.18 print number == n, number, n
1.19 +r.end_record()
1.20 r.close()
1.21
1.22 tuples = [(0, 0), (1, 3), (2, 5), (3, 9)]
1.23
1.24 f = open("testMS", "wb")
1.25 w = FileWriter(f)
1.26 -last = w.get_initial_value(2)
1.27 -for t in tuples:
1.28 - last = w.write_sequence(t, last, 2)
1.29 +w.begin_record()
1.30 +w.write_monotonic_sequence(tuples)
1.31 +w.end_record()
1.32 w.close()
1.33
1.34 f = open("testMS", "rb")
1.35 r = FileReader(f)
1.36 -last = r.get_initial_value(2)
1.37 -for t in tuples:
1.38 - last = t2 = r.read_sequence(last, 2)
1.39 +r.begin_record()
1.40 +for t, t2 in zip(r.read_monotonic_sequence(), tuples):
1.41 print t == t2, t, t2
1.42 +r.end_record()
1.43 r.close()
1.44
1.45 tuples2 = [(0, 0), (1, 3), (2, 1), (3, 2), (4, 0)]
1.46
1.47 f = open("testNMS", "wb")
1.48 w = FileWriter(f)
1.49 -last = w.get_initial_value(2)
1.50 -for t in tuples2:
1.51 - last = w.write_sequence(t, last, 2, monotonic=0)
1.52 +w.begin_record()
1.53 +w.write_delta_sequence(tuples2)
1.54 +w.end_record()
1.55 w.close()
1.56
1.57 f = open("testNMS", "rb")
1.58 r = FileReader(f)
1.59 -last = r.get_initial_value(2)
1.60 -for t in tuples2:
1.61 - last = t2 = r.read_sequence(last, 2, monotonic=0)
1.62 +r.begin_record()
1.63 +for t, t2 in zip(r.read_delta_sequence(), tuples2):
1.64 print t == t2, t, t2
1.65 +r.end_record()
1.66 r.close()
1.67
1.68 print "- Test positions."
1.69 @@ -138,8 +142,8 @@
1.70 for doc_positions in all_doc_positions_seq:
1.71 for docnum, positions in doc_positions:
1.72 d, p = r.read_positions()
1.73 - print tuple(docnum) == tuple(d), docnum, d
1.74 - print tuple(positions) == tuple(p), positions, p
1.75 + print docnum == d, docnum, d
1.76 + print positions == p, positions, p
1.77 r.reset()
1.78 r.close()
1.79