diff options
| author | Robert | 2017-05-02 21:44:59 +0200 |
|---|---|---|
| committer | jpl | 2017-05-04 10:11:35 +0200 |
| commit | 766c70fb8d21c9a22e1d08136a623b59a1aae1df (patch) | |
| tree | f5c74bfab5cd2c8a15945abc63875e695fc77a84 /lib/range_ext.rb | |
| parent | 26d7f4eda6b1e9bdf587a95c9a1d088192689aef (diff) | |
| download | chouette-core-766c70fb8d21c9a22e1d08136a623b59a1aae1df.tar.bz2 | |
duplicate code from models/calendar removed; coherent naming in Range#intersection
Diffstat (limited to 'lib/range_ext.rb')
| -rw-r--r-- | lib/range_ext.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/range_ext.rb b/lib/range_ext.rb index 5afb44dee..729cd1092 100644 --- a/lib/range_ext.rb +++ b/lib/range_ext.rb @@ -1,7 +1,7 @@ class Range def intersection(other) - return nil if (self.max < other.begin or other.max < self.begin) - [self.begin, other.begin].max..[self.max, other.max].min + return nil if (self.max < other.min or other.max < self.min) + [self.min, other.min].max..[self.max, other.max].min end alias_method :&, :intersection end |
