# HG changeset patch # User Nicolas Saunier # Date 1356127594 18000 # Node ID 8d44fb1756bcf296e3557cf27d93b828252deaaf # Parent 3af4c267a7bfe2f313fe342f793a7d265a9a6429 removed small error diff -r 3af4c267a7bf -r 8d44fb1756bc python/moving.py --- a/python/moving.py Thu Dec 20 18:04:05 2012 -0500 +++ b/python/moving.py Fri Dec 21 17:06:34 2012 -0500 @@ -49,11 +49,11 @@ def union(self, interval2): '''Smallest interval comprising self and interval2''' - return TimeInterval(min(self.first, interval2.first), max(self.last, interval2.last)) + return Interval(min(self.first, interval2.first), max(self.last, interval2.last)) def intersection(self, interval2): '''Largest interval comprised in both self and interval2''' - return TimeInterval(max(self.first, interval2.first), min(self.last, interval2.last)) + return Interval(max(self.first, interval2.first), min(self.last, interval2.last)) def distance(self, interval2): if not self.intersection(interval2).empty():