1.1 --- a/EventAggregatorSupport/Filter.py Tue Jan 28 23:30:33 2014 +0100
1.2 +++ b/EventAggregatorSupport/Filter.py Wed Jan 29 19:20:21 2014 +0100
1.3 @@ -198,8 +198,8 @@
1.4 Return a scale for the given coverage so that the times involved are
1.5 exposed. The scale consists of a list of non-overlapping timespans forming
1.6 a contiguous period of time, where each timespan is accompanied in a tuple
1.7 - by a limit and a list of original time details. Thus, the scale consists of
1.8 - (timespan, limit, set-of-times) tuples.
1.9 + by a limit and two sets of original time details. Thus, the scale consists
1.10 + of (timespan, limit, set-of-start-times, set-of-end-times) tuples.
1.11 """
1.12
1.13 times = {}
1.14 @@ -241,7 +241,7 @@
1.15
1.16 for time, limit in keys:
1.17 if not first:
1.18 - scale.append((Timespan(start, time), limit, times[(start, start_limit)]))
1.19 + scale.append((Timespan(start, time), limit, times[(start, start_limit)], times[(time, limit)]))
1.20 else:
1.21 first = 0
1.22 start, start_limit = time, limit