Refatoring

Author: juliohm

src/processes/poisson.jl

@@ -53,7 +53,6 @@ function rand_single(rng::Random.AbstractRNG, p::PoissonProcess{<:Real}, g, ::Di
   n = rand(rng, Poisson(λ * V))
 
   if iszero(n)
-    # PointSet{embeddim(g), coordtype(g)}([])
     nothing
   else
     # simulate homogeneous process
@@ -76,14 +75,8 @@ function rand_single(rng::Random.AbstractRNG, p::PoissonProcess{<:Function}, g,
   thin(pp, RandomThinning(x -> p.λ(x) / algo.λmax))
 end
 
-function rand_single(rng::Random.AbstractRNG, p::PoissonProcess{<:Function}, d::Domain, algo::DiscretizedSampling)
-  # compute intensity on centroids
-  c = centroid.(d)
-  λvec = p.λ.(c)
-
-  # simulate inhomogeneous process
-  rand_single(rng, PoissonProcess(λvec), d, algo)
-end
+rand_single(rng::Random.AbstractRNG, p::PoissonProcess{<:Function}, d::Domain, algo::DiscretizedSampling) =
+  rand_single(rng, PoissonProcess(p.λ.(centroid.(d))), d, algo)
 
 function rand_single(rng::Random.AbstractRNG, p::PoissonProcess{<:AbstractVector}, d::Domain, algo::DiscretizedSampling)
   # simulate number of points

test/processes.jl

@@ -33,6 +33,9 @@
   end
 
   @testset "Poisson" begin
+    # helper function
+    λ(s::Point2) = sum(coordinates(s) .^ 2)
+
     # homogeneous
     p = PoissonProcess(10.0)
     for g in [seg, tri, quad, box, ball, poly, grid, mesh]
@@ -41,7 +44,6 @@
     end
 
     # inhomogeneous with intensity function
-    λ(s::Point2) = sum(coordinates(s) .^ 2)
     p = PoissonProcess(λ)
     for g in [seg, tri, quad, box, ball, poly, grid, mesh]
       # default thinnedsampling
@@ -58,7 +60,6 @@
 
     # inhomogeneous with piecewise constant intensity
     for g in [grid, mesh]
-      λ(s::Point2) = sum(coordinates(s) .^ 2)
       λvec = λ.(centroid.(g))
       p = PoissonProcess(λvec)
       # discretizedsampling by default