more fixes

madsjulia · Jul 16, 2017 · 6d7a4fb · 6d7a4fb
1 parent af69aeb
commit 6d7a4fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/src/FFTRF.jl b/src/FFTRF.jl
@@ -1,19 +1,5 @@
 module FFTRF
 
-"Try to import a module"
-macro tryimport(s::Symbol)
-	importq = string(:(import $s))
-	warnstring = string("Module ", s, " is not available")
-	q = quote
-		try
-			eval(parse($importq))
-		catch
-			warn($warnstring)
-		end
-	end
-	return :($(esc(q)))
-end
-
 import Interpolations
 import Base.Cartesian
 

diff --git a/test/testfftrf.jl b/test/testfftrf.jl
@@ -7,8 +7,8 @@ import Base.Test
 	dk = rand()
 	beta = -2 - rand()
 	k = GeostatInversion.FFTRF.powerlaw_structuredgrid(Ns, k0, dk, beta)
-	@Base.Test.test_approx_eq mean(k) k0
-	@Base.Test.test_approx_eq std(k) dk
+	@Base.Test.test mean(k) ≈ k0
+	@Base.Test.test std(k) ≈ dk
 	@Base.Test.test collect(size(k)) == Ns
 end