Skip to content

Commit

Permalink
Fix deprecations
Browse files Browse the repository at this point in the history
  • Loading branch information
femtocleaner[bot] committed Sep 26, 2018
1 parent a9415ae commit fe7aab3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 0 additions & 2 deletions src/ConformalMaps.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
__precompile__(true)

module ConformalMaps

# This package provides a ConfomalMap type which numerically approximates the
Expand Down
8 changes: 4 additions & 4 deletions src/visualization.jl
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ function hyperbolictiling(f::Union{Function,InverseConformalMap};

points = [[f((1-(1-innerradius)/2^(k-1))*cos+rotation) +
im*(1-(1-innerradius)/2^(k-1))*sin+rotation))
for θ=linspace(0,2π,1+rays*2^(k-1))] for k=1:rings]
for θ=range(0, stop=2π, length=1+rays*2^(k-1))] for k=1:rings]
return Plot([
(isa(f,InverseConformalMap) ? domain(f) :
[Point2D(f(0.0),linewidth=2),
Polygon2D([f(cis(θ)) for θ=linspace(0,2π,250)];linewidth=0.3)]);
Polygon2D([f(cis(θ)) for θ=range(0, stop=2π, length=250)];linewidth=0.3)]);
[Path2D([points[i][k],points[i+1][2*k-1]];
color=raycolor,linewidth=lwfunction(i))
for i=1:length(points)-1 for k=1:length(points[i])-1]
Expand Down Expand Up @@ -126,8 +126,8 @@ function makegrid(boundary::Array{AsyPlots.Vec2,1},n::Integer)
m = length(minimum(xvals):ϵ:maximum(xvals))
n = length(minimum(yvals):ϵ:maximum(yvals))
totalgrid = [(x,y) for
x = linspace(minimum(xvals),maximum(xvals),m),
y = linspace(minimum(yvals),maximum(yvals),n)]
x = range(minimum(xvals), stop=maximum(xvals), length=m),
y = range(minimum(yvals), stop=maximum(yvals), length=n)]
pointsinside = [iswellinside(AsyPlots.Vec2(totalgrid[i,j]),
boundary;epsilon=1e-3) ? 1 : 0 for i=1:m,j=1:n]
lines = Tuple{Tuple{Int64,Int64},Tuple{Int64,Int64}}[]
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using ConformalMaps
using Base.Test
using Test
using Requires

vertices = [1.0 0.0;
Expand Down

0 comments on commit fe7aab3

Please sign in to comment.