Refactor variogram files

JuliaEarth · Feb 19, 2024 · c67c06f · c67c06f
1 parent bb227a7
commit c67c06f
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 44 deletions.
diff --git a/src/variogram/circular.jl b/src/variogram/circular.jl
@@ -15,14 +15,14 @@ CircularVariogram(ball; sill=1.0, nugget=zero(typeof(sill))) = CircularVariogram
 
 CircularVariogram(; range=1.0, sill=1.0, nugget=zero(typeof(sill))) = CircularVariogram(sill, nugget, MetricBall(range))
 
+variotype(::CircularVariogram) = CircularVariogram
+
+isstationary(::Type{<:CircularVariogram}) = true
+
 function (γ::CircularVariogram)(h)
   r = radius(γ.ball)
   s = γ.sill
   n = γ.nugget
   v = h ≤ r ? 1 - (2 / π) * acos(h / r) + (2h / (π * r)) * sqrt(1 - (h^2 / r^2)) : one(h)
   (s - n) * v + (h > zero(h)) * n
 end
-
-variotype(::CircularVariogram) = CircularVariogram
-
-isstationary(::Type{<:CircularVariogram}) = true
diff --git a/src/variogram/cubic.jl b/src/variogram/cubic.jl
@@ -19,6 +19,10 @@ CubicVariogram(ball; sill=1.0, nugget=zero(typeof(sill))) = CubicVariogram(sill,
 
 CubicVariogram(; range=1.0, sill=1.0, nugget=zero(typeof(sill))) = CubicVariogram(sill, nugget, MetricBall(range))
 
+variotype(::CubicVariogram) = CubicVariogram
+
+isstationary(::Type{<:CubicVariogram}) = true
+
 function (γ::CubicVariogram)(h::T) where {T}
   r = radius(γ.ball)
   s = γ.sill
@@ -33,7 +37,3 @@ function (γ::CubicVariogram)(h::T) where {T}
 
   (h < r) * (s - n) * s1 + (h ≥ r) * (s - n) * s2 + (h > 0) * n
 end
-
-variotype(::CubicVariogram) = CubicVariogram
-
-isstationary(::Type{<:CubicVariogram}) = true
diff --git a/src/variogram/exponential.jl b/src/variogram/exponential.jl
@@ -20,13 +20,13 @@ ExponentialVariogram(ball; sill=1.0, nugget=zero(typeof(sill))) = ExponentialVar
 ExponentialVariogram(; range=1.0, sill=1.0, nugget=zero(typeof(sill))) =
   ExponentialVariogram(sill, nugget, MetricBall(range))
 
+variotype(::ExponentialVariogram) = ExponentialVariogram
+
+isstationary(::Type{<:ExponentialVariogram}) = true
+
 function (γ::ExponentialVariogram)(h)
   r = radius(γ.ball)
   s = γ.sill
   n = γ.nugget
   (s - n) * (1 - exp(-3(h / r))) + (h > 0) * n
 end
-
-variotype(::ExponentialVariogram) = ExponentialVariogram
-
-isstationary(::Type{<:ExponentialVariogram}) = true
diff --git a/src/variogram/gaussian.jl b/src/variogram/gaussian.jl
@@ -19,6 +19,10 @@ GaussianVariogram(ball; sill=1.0, nugget=zero(typeof(sill))) = GaussianVariogram
 
 GaussianVariogram(; range=1.0, sill=1.0, nugget=zero(typeof(sill))) = GaussianVariogram(sill, nugget, MetricBall(range))
 
+variotype(::GaussianVariogram) = GaussianVariogram
+
+isstationary(::Type{<:GaussianVariogram}) = true
+
 function (γ::GaussianVariogram)(h)
   # add small eps to nugget
   # for numerical stability
@@ -27,7 +31,3 @@ function (γ::GaussianVariogram)(h)
   n = γ.nugget + typeof(s)(1e-6)
   (s - n) * (1 - exp(-3(h / r)^2)) + (h > 0) * n
 end
-
-variotype(::GaussianVariogram) = GaussianVariogram
-
-isstationary(::Type{<:GaussianVariogram}) = true
diff --git a/src/variogram/matern.jl b/src/variogram/matern.jl
@@ -22,6 +22,10 @@ MaternVariogram(ball; sill=1.0, nugget=zero(typeof(sill)), order=1.0) = MaternVa
 MaternVariogram(; range=1.0, sill=1.0, nugget=zero(typeof(sill)), order=1.0) =
   MaternVariogram(sill, nugget, order, MetricBall(range))
 
+variotype(::MaternVariogram) = MaternVariogram
+
+isstationary(::Type{<:MaternVariogram}) = true
+
 function (γ::MaternVariogram)(h::T) where {T}
   r = radius(γ.ball)
   s = γ.sill
@@ -38,7 +42,3 @@ function (γ::MaternVariogram)(h::T) where {T}
 
   (s - n) * (1 - 2^(1 - ν) / Γ * δ^ν * Β) + (h > 0) * n
 end
-
-variotype(::MaternVariogram) = MaternVariogram
-
-isstationary(::Type{<:MaternVariogram}) = true
diff --git a/src/variogram/nugget.jl b/src/variogram/nugget.jl
@@ -13,16 +13,16 @@ end
 
 NuggetEffect(; nugget=1.0) = NuggetEffect(nugget)
 
-(γ::NuggetEffect)(h) = (h > 0) * γ.nugget
+variotype(::NuggetEffect) = NuggetEffect
 
-(γ::NuggetEffect)(u::Point, v::Point) = ifelse(u == v, zero(γ.nugget), γ.nugget)
+isstationary(::Type{<:NuggetEffect}) = true
 
-Base.range(::NuggetEffect{T}) where {T} = zero(T)
+isisotropic(::NuggetEffect) = true
 
 sill(γ::NuggetEffect) = γ.nugget
 
-variotype(::NuggetEffect) = NuggetEffect
+Base.range(::NuggetEffect{T}) where {T} = zero(T)
 
-isstationary(::Type{<:NuggetEffect}) = true
+(γ::NuggetEffect)(h) = (h > 0) * γ.nugget
 
-isisotropic(::NuggetEffect) = true
+(γ::NuggetEffect)(u::Point, v::Point) = ifelse(u == v, zero(γ.nugget), γ.nugget)
diff --git a/src/variogram/pentaspherical.jl b/src/variogram/pentaspherical.jl
@@ -20,6 +20,10 @@ PentasphericalVariogram(ball; sill=1.0, nugget=zero(typeof(sill))) = Pentaspheri
 PentasphericalVariogram(; range=1.0, sill=1.0, nugget=zero(typeof(sill))) =
   PentasphericalVariogram(sill, nugget, MetricBall(range))
 
+variotype(::PentasphericalVariogram) = PentasphericalVariogram
+
+isstationary(::Type{<:PentasphericalVariogram}) = true
+
 function (γ::PentasphericalVariogram)(h::T) where {T}
   r = radius(γ.ball)
   s = γ.sill
@@ -34,7 +38,3 @@ function (γ::PentasphericalVariogram)(h::T) where {T}
 
   (h < r) * (s - n) * s1 + (h ≥ r) * (s - n) * s2 + (h > 0) * n
 end
-
-variotype(::PentasphericalVariogram) = PentasphericalVariogram
-
-isstationary(::Type{<:PentasphericalVariogram}) = true
diff --git a/src/variogram/power.jl b/src/variogram/power.jl
@@ -15,6 +15,12 @@ end
 
 PowerVariogram(; scaling=1.0, nugget=zero(typeof(scaling)), exponent=1.0) = PowerVariogram(scaling, nugget, exponent)
 
+variotype(::PowerVariogram) = PowerVariogram
+
+isstationary(::Type{<:PowerVariogram}) = false
+
+isisotropic(::PowerVariogram) = true
+
 function (γ::PowerVariogram)(h)
   s = γ.scaling
   a = γ.exponent
@@ -29,9 +35,3 @@ function (γ::PowerVariogram)(u::Point, v::Point)
   h = evaluate(d, x, y)
   γ(h)
 end
-
-variotype(::PowerVariogram) = PowerVariogram
-
-isstationary(::Type{<:PowerVariogram}) = false
-
-isisotropic(::PowerVariogram) = true
diff --git a/src/variogram/sinehole.jl b/src/variogram/sinehole.jl
@@ -19,6 +19,10 @@ SineHoleVariogram(ball; sill=1.0, nugget=zero(typeof(sill))) = SineHoleVariogram
 
 SineHoleVariogram(; range=1.0, sill=1.0, nugget=zero(typeof(sill))) = SineHoleVariogram(sill, nugget, MetricBall(range))
 
+variotype(::SineHoleVariogram) = SineHoleVariogram
+
+isstationary(::Type{<:SineHoleVariogram}) = true
+
 function (γ::SineHoleVariogram)(h::T) where {T}
   r = radius(γ.ball)
   s = γ.sill
@@ -31,7 +35,3 @@ function (γ::SineHoleVariogram)(h::T) where {T}
 
   (s - n) * (1 - sin(c * h′ / r) / (c * h′ / r)) + (h′ > 0) * n
 end
-
-variotype(::SineHoleVariogram) = SineHoleVariogram
-
-isstationary(::Type{<:SineHoleVariogram}) = true
diff --git a/src/variogram/spherical.jl b/src/variogram/spherical.jl
@@ -20,6 +20,10 @@ SphericalVariogram(ball; sill=1.0, nugget=zero(typeof(sill))) = SphericalVariogr
 SphericalVariogram(; range=1.0, sill=1.0, nugget=zero(typeof(sill))) =
   SphericalVariogram(sill, nugget, MetricBall(range))
 
+variotype(::SphericalVariogram) = SphericalVariogram
+
+isstationary(::Type{<:SphericalVariogram}) = true
+
 function (γ::SphericalVariogram)(h::T) where {T}
   r = radius(γ.ball)
   s = γ.sill
@@ -33,7 +37,3 @@ function (γ::SphericalVariogram)(h::T) where {T}
 
   (h < r) * (s - n) * s1 + (h ≥ r) * (s - n) * s2 + (h > 0) * n
 end
-
-variotype(::SphericalVariogram) = SphericalVariogram
-
-isstationary(::Type{<:SphericalVariogram}) = true