Merge pull request #38 from QuantEcon/fbot/deps

Fix deprecations
QuantEcon · Sep 28, 2018 · a40161c · a40161c
2 parents 60a1a82 + 11af20e
commit a40161c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/demo/demapp01.jl b/demo/demapp01.jl
@@ -75,7 +75,7 @@ function main()
     # One may evaluate the accuracy of the Chebychev polynomial approximant by
     # computing the approximation error on a highly refined grid of points:
     ngrid = 5001                       # number of grid nodes
-    xgrid = linspace(a, b, ngrid)        # generate refined grid for plotting
+    xgrid = range(a, stop=b, length=ngrid)        # generate refined grid for plotting
 
 
     function plot_approx(f::Function, basistype::Symbol, n, a, b, xgrid, k=0)

diff --git a/demo/dierckxcompare_1d.jl b/demo/dierckxcompare_1d.jl
@@ -13,8 +13,8 @@ fs = [f1, f2, f3]
 fps = [fp1, fp2, fp3]
 nf = length(fs)
 
-x = collect(linspace(.5, 2, 35))
-finex = collect(linspace(1e-2, 2*pi - 1e-2, 150))
+x = collect(range(.5, stop=2, length=35))
+finex = collect(range(1e-2, stop=2*pi - 1e-2, length=150))
 ys = map(f->f(x), fs)
 finey = map(f->f(finex), fs)
 
@@ -32,7 +32,7 @@ function compare_D_CE_levels(f::Function, x::Array{Float64, 1}, order::Int)
     c, bs = funfitxy(cebasis, xx, yy)
 
     # Evaluate Splines on finer grid
-    xfine = collect(linspace(x[1], x[end], 2*n + 1))
+    xfine = collect(range(x[1], stop=x[end], length=2*n + 1))
     yfine = f(xfine)
 
     deval = Dierckx.evaluate(dspl, xfine)
@@ -62,7 +62,7 @@ function compare_D_CE_deriv(f::Function, fp::Function, x::Array{Float64, 1}, ord
     c, bs = funfitxy(cebasis, xx, yy)
 
     # Evaluate Splines on finer grid
-    xfine = collect(linspace(x[1], x[end], 2*n + 1))
+    xfine = collect(range(x[1], stop=x[end], length=2*n + 1))
     ypfine = fp(xfine)
 
     devalderiv = Dierckx.derivative(dspl, xfine)

diff --git a/demo/dierckxcompare_2d.jl b/demo/dierckxcompare_2d.jl
@@ -9,8 +9,8 @@ f3(x, y) = 1.5 + log(x .* y)
 fs = [f1, f2, f3]
 nf = length(fs)
 
-x = collect(linspace(.5, 2, 35))
-y = collect(linspace(.2, 4, 35))
+x = collect(range(.5, stop=2, length=35))
+y = collect(range(.2, stop=4, length=35))
 
 function compare_D_CE_levels(f::Function, x::Array{Float64, 1}, y::Array{Float64, 1}, order::Int)
 
@@ -28,8 +28,8 @@ function compare_D_CE_levels(f::Function, x::Array{Float64, 1}, y::Array{Float64
     c, bs = funfitxy(cebasis, xx, yy)
 
     # Evaluate Splines on finer grid
-    xfine = collect(linspace(x[1], x[end], 2*n + 1))
-    yfine = collect(linspace(y[1], y[end], 2*n + 1))
+    xfine = collect(range(x[1], stop=x[end], length=2*n + 1))
+    yfine = collect(range(y[1], stop=y[end], length=2*n + 1))
     zfine = f(xfine, yfine')
 
     deval = Dierckx.evalgrid(dspl, xfine, yfine)

diff --git a/src/CompEcon.jl b/src/CompEcon.jl
@@ -1,5 +1,3 @@
-__precompile__()
-
 module CompEcon
 
 using Reexport