Merge pull request #2959 from simonster/range-fix

Fix float range behavior
JuliaLang · Apr 28, 2013 · d121c4d · d121c4d
2 parents c51a2dc + 30f8440
commit d121c4d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/base/range.jl b/base/range.jl
@@ -53,7 +53,7 @@ function colon{T<:Real}(start::T, step::T, stop::T)
             end
         else
             n = nf
-            len = iround(n)
+            len = itrunc(n)
         end
         if n >= typemax(Int)
             error("Range: length ",n," is too large")
@@ -65,11 +65,17 @@ function colon{T<:Real}(start::T, stop::T)
     if stop < start
         len = 0
     else
-        n = round(stop-start+1)
+        nf = stop - start + 1
+        if T <: FloatingPoint
+            n = round(nf)
+            len = abs(n-nf) < eps(n)*3 ? itrunc(n) : itrunc(nf)
+        else
+            n = nf
+            len = itrunc(n)
+        end
         if n >= typemax(Int)
             error("Range: length ",n," is too large")
         end
-        len = itrunc(n)
     end
     Range1(start, len)
 end

diff --git a/test/core.jl b/test/core.jl
@@ -764,3 +764,7 @@ i2619()
 typealias Foo2919 Int
 type Baz2919; Foo2919::Foo2919; end
 @test Baz2919(3).Foo2919 === 3
+
+# issue #2959
+@test 1.0:1.5 == 1.0:1.0:1.5 == 1.0:1.0
+@test 1.0:(.3-.1)/.1 == 1.0:2.0