Improve error messaging

Author: tomasaschan

src/scaling/scaling.jl

@@ -5,12 +5,12 @@ end
 ScaledInterpolation{T,ITPT,IT,GT,RT}(::Type{T}, N, itp::ITPT, ::Type{IT}, ::Type{GT}, ranges::RT) =
     ScaledInterpolation{T,N,ITPT,IT,GT,RT}(itp, ranges)
 function scale{T,N,IT,GT}(itp::AbstractInterpolation{T,N,IT,GT}, ranges::Range...)
-    length(ranges) == N || error("Must scale $N-dimensional interpolation object with exactly $N ranges (you used $(length(ranges)))")
+    length(ranges) == N || throw(ArgumentError("Must scale $N-dimensional interpolation object with exactly $N ranges (you used $(length(ranges)))"))
     for d in 1:N
         if iextract(IT,d) != NoInterp 
-            length(ranges[d]) == size(itp,d) || error("The length of the range in dimension $d ($(length(ranges[d]))) did not equal the size of the interpolation object in that direction ($(size(itp,d)))")
+            length(ranges[d]) == size(itp,d) || throw(ArgumentError("The length of the range in dimension $d ($(length(ranges[d]))) did not equal the size of the interpolation object in that direction ($(size(itp,d)))"))
         elseif ranges[d] != 1:size(itp,d)
-            error("NoInterp dimension $d must be scaled with unit range 1:$(size(itp,d))")
+            throw(ArgumentError("NoInterp dimension $d must be scaled with unit range 1:$(size(itp,d))"))
         end
     end
 
@@ -42,7 +42,7 @@ gradient{T,N}(sitp::ScaledInterpolation{T,N}, xs...) = gradient!(Array(T,N), sit
     interp_indices = map(i -> interp_dimens[i] ? :(coordlookup(sitp.ranges[$i], xs[$i])) : :(xs[$i]), 1:N)
 
     quote
-        length(g) == N || error(string("g must be a vector of length ", N, " (was ", length(g), ")"))
+        length(g) == N || throw(ArgumentError(string("g must be a vector of length ", N, " (was ", length(g), ")")))
         gradient!(g, sitp.itp, $(interp_indices...))
         for i in eachindex(g)
             g[i] = rescale_gradient(sitp.ranges[i], g[i])

test/scaling/nointerp.jl

@@ -21,16 +21,18 @@ end
 
 # Test error messages for incorrect initialization
 function message_is(message)
-	r -> r.err.msg == message || error("Incorrect error message: expected '$message' but was '$(r.msg)'")
+	r -> r.err.msg == message || error("Incorrect error message: expected '$message' but was '$(r.err.msg)'")
 end
 Test.with_handler(message_is("Must scale 2-dimensional interpolation object with exactly 2 ranges (you used 1)")) do
 	@test scale(itp, xs)
 end
 Test.with_handler(message_is("NoInterp dimension 2 must be scaled with unit range 1:3")) do
 	@test scale(itp, xs, -1:1)
 end
+Test.with_handler(message_is("The length of the range in dimension 1 (8) did not equal the size of the interpolation object in that direction (11)")) do
+	@test scale(itp, -pi:2pi/7:pi, 1:3)
+end
 Test.with_handler(message_is("Must index into 2-dimensional scaled interpolation object with exactly 2 indices (you used 1)")) do
 	@test sitp[2.3]
 end
-
 end