Update to latest GeoStatsBase.jl

Author: juliohm

src/processes.jl

@@ -23,11 +23,11 @@ Generate `n` realizations of spatial point process `p`
 inside spatial region `r`. Optionally specify sampling
 algorithm `algo`.
 """
-Base.rand(p::PointProcess, r::AbstractRegion, n::Int;
+Base.rand(p::PointProcess, r::AbstractGeometry, n::Int;
           algo=default_sampling_algorithm(p)) =
   [rand_single(p, r, algo) for i in 1:n]
 
-Base.rand(p::PointProcess, r::AbstractRegion;
+Base.rand(p::PointProcess, r::AbstractGeometry;
           algo=default_sampling_algorithm(p)) =
   rand_single(p, r, algo)
 
@@ -37,7 +37,7 @@ Base.rand(p::PointProcess, r::AbstractRegion;
 Generate a single realization of spatial point process
 `p` inside spatial region `r` with sampling `algo`.
 """
-rand_single(p::PointProcess, r::AbstractRegion, algo) =
+rand_single(p::PointProcess, r::AbstractGeometry, algo) =
   @error "not implemented"
 
 """
@@ -59,4 +59,4 @@ Base.union(p₁::PointProcess, p₂::PointProcess) = UnionProcess(p₁, p₂)
 #-----------------
 include("processes/binomial.jl")
 include("processes/poisson.jl")
-include("processes/union.jl")
+include("processes/union.jl")

src/processes/binomial.jl

@@ -17,11 +17,11 @@ struct BinomialSampling end
 
 default_sampling_algorithm(::BinomialProcess) = BinomialSampling()
 
-function rand_single(p::BinomialProcess, r::RectangleRegion{T,N},
+function rand_single(p::BinomialProcess, r::Rectangle{T,N},
                      algo::BinomialSampling) where {N,T}
   # region configuration
-  lo = lowerleft(r)
-  up = upperright(r)
+  lo = origin(r)
+  up = lo + sides(r)
 
   # product of uniform distributions
   U = product_distribution([Uniform(lo[i], up[i]) for i in 1:N])

src/processes/poisson.jl

@@ -24,11 +24,11 @@ default_sampling_algorithm(::PoissonProcess{<:Function}) = DiscretizedSampling()
 #------------------
 # HOMOGENEOUS CASE
 #------------------
-function rand_single(p::PoissonProcess{<:Real}, r::RectangleRegion{T,N},
+function rand_single(p::PoissonProcess{<:Real}, r::Rectangle{T,N},
                      algo::ProductSampling) where {N,T}
   # region configuration
-  lo = lowerleft(r)
-  up = upperright(r)
+  lo = origin(r)
+  up = lo + sides(r)
 
   # simulate number of points
   λ = p.λ; V = volume(r)
@@ -44,7 +44,7 @@ end
 #--------------------
 # INHOMOGENEOUS CASE
 #--------------------
-function rand_single(p::PoissonProcess{<:Function}, r::RectangleRegion{T,N},
+function rand_single(p::PoissonProcess{<:Function}, r::Rectangle{T,N},
                      algo::DiscretizedSampling) where {N,T}
   # discretize region
   # TODO
@@ -56,7 +56,7 @@ function rand_single(p::PoissonProcess{<:Function}, r::RectangleRegion{T,N},
   # TODO
 end
 
-function rand_single(p::PoissonProcess{<:Function}, r::RectangleRegion{T,N},
+function rand_single(p::PoissonProcess{<:Function}, r::Rectangle{T,N},
                      algo::ThinnedSampling) where {N,T}
   # Lewis-Shedler algorithm
   # TODO

src/processes/union.jl

@@ -18,7 +18,7 @@ struct UnionSampling end
 
 default_sampling_algorithm(::UnionProcess) = UnionSampling()
 
-function rand_single(p::UnionProcess, r::AbstractRegion, algo::UnionSampling)
+function rand_single(p::UnionProcess, r::AbstractGeometry, algo::UnionSampling)
   pp₁ = rand(p.p₁, r)
   pp₂ = rand(p.p₂, r)
 

test/processes.jl

@@ -1,7 +1,7 @@
 @testset "Processes" begin
   @testset "Basic" begin
     for p in [BinomialProcess(100), PoissonProcess(100.)]
-      r = RectangleRegion((0., 1.), (1., 2.))
+      r = Rectangle((0.,1.), (1.,1.))
       P = rand(p, r)
       X = coordinates(P)
       @test all(0 .≤ X[1,:] .≤ 1)