Skip to content

Commit 4c6cfe1

Browse files
committed
Fixes eval errors
1 parent 8e33e85 commit 4c6cfe1

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

src/PaduaTransform.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ function paduatransform{T}(P::PaduaTransformPlan,v::AbstractVector{T})
9696
tensorcfs=P.dctplan*vals
9797
m,l=size(tensorcfs)
9898
scale!(tensorcfs,T(2)/(n*(n+1)))
99-
scale!(sub(tensorcfs,1,:),0.5)
100-
scale!(sub(tensorcfs,:,1),0.5)
101-
scale!(sub(tensorcfs,m,:),0.5)
102-
scale!(sub(tensorcfs,:,l),0.5)
99+
scale!(view(tensorcfs,1,:),0.5)
100+
scale!(view(tensorcfs,:,1),0.5)
101+
scale!(view(tensorcfs,m,:),0.5)
102+
scale!(view(tensorcfs,:,l),0.5)
103103
cfs=trianglecfsvec(P,tensorcfs)
104104
return cfs
105105
end
@@ -115,11 +115,11 @@ function paduavalsmat(P::PaduaTransformPlan,v::AbstractVector)
115115
d=div(n+2,2)
116116
m=0
117117
@inbounds for i=1:n+1
118-
vals[1+mod(i,2):2:n+1+mod(i,2),i]=sub(v,m+1:m+d)
118+
vals[1+mod(i,2):2:n+1+mod(i,2),i]=view(v,m+1:m+d)
119119
m+=d
120120
end
121121
else
122-
@inbounds vals[1:2:end]=sub(v,:)
122+
@inbounds vals[1:2:end]=view(v,:)
123123
end
124124
return vals
125125
end

test/runtests.jl

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,17 +245,16 @@ Interpolates a 2d function at a given point using 2d Chebyshev series.
245245
function paduaeval(f::Function,x::AbstractFloat,y::AbstractFloat,m::Integer)
246246
T=promote_type(typeof(x),typeof(y))
247247
M=div((m+1)*(m+2),2)
248-
pvals=Array(T,M)
249-
p=paduapoints(m)
250-
pvals=map!(f,p[:,1],p[:,2])
251-
plan=plan_paduatransform(pvals)
252-
coeffs=paduatransform(plan,pvals)
248+
p=paduapoints(T,m)
249+
map!(f,p,p[:,1],p[:,2])
250+
plan=plan_paduatransform(p)
251+
coeffs=paduatransform(plan,p)
253252
cfs_mat=trianglecfsmat(coeffs)
254253
cfs_mat=view(cfs_mat,1:m+1,:)
255254
f_x=sum([cfs_mat[k,j]*cos((j-1)*acos(x))*cos((k-1)*acos(y)) for k=1:m+1, j=1:m+1])
256255
return f_x
257256
end
258-
f_xy = (x,y) -> x^2*y+x^3
257+
f_xy = (x,y) ->x^2*y+x^3
259258
g_xy = (x,y) ->cos(exp(2*x+y))*sin(y)
260259
x=0.1;y=0.2
261260
m=130

0 commit comments

Comments
 (0)