Updates for latest GeoStatsFunctions.jl

Author: juliohm

Project.toml

@@ -1,7 +1,7 @@
 name = "GeoStatsModels"
 uuid = "ad987403-13c5-47b5-afee-0a48f6ac4f12"
 authors = ["Júlio Hoffimann <julio.hoffimann@gmail.com> and contributors"]
-version = "0.13.7"
+version = "0.13.8"
 
 [deps]
 ChunkSplitters = "ae650224-84b6-46f8-82ea-d812ca08434e"
@@ -23,7 +23,7 @@ Combinatorics = "1.0"
 CoordRefSystems = "0.19"
 Distances = "0.10"
 Distributions = "0.25"
-GeoStatsFunctions = "0.13"
+GeoStatsFunctions = "0.14"
 GeoTables = "1.25"
 LinearAlgebra = "1.10"
 Meshes = "0.57"

src/krig.jl

@@ -78,7 +78,7 @@ end
 # make sure data is compatible with model
 function checkcompat(model::KrigingModel, data)
   fun = model.fun
-  nvar = nvariates(fun)
+  nvar = nvariables(fun)
   nfeat = ncol(data) - 1
   if nfeat != nvar
     throw(ArgumentError("$nfeat data column(s) provided to $nvar-variate Kriging model"))
@@ -92,7 +92,7 @@ function prealloc(model::KrigingModel, data)
 
   # retrieve matrix parameters
   nobs = nelements(dom)
-  nvar = nvariates(fun)
+  nvar = nvariables(fun)
   ncon = nconstraints(model)
   nfun = nobs * nvar
   nrow = nfun + ncon
@@ -116,7 +116,7 @@ function setlhs!(model::KrigingModel, LHS, data)
 
   # number of function evaluations
   nobs = nelements(dom)
-  nvar = nvariates(fun)
+  nvar = nvariables(fun)
   nfun = nobs * nvar
 
   # find locations with missing values
@@ -167,7 +167,7 @@ function lhsbanded!(LHS, fun, dom)
 
   # retrieve matrix paramaters
   nobs = nelements(dom)
-  nvar = nvariates(fun)
+  nvar = nvariables(fun)
   nfun = nobs * nvar
 
   @inbounds for j in 1:nfun, i in 1:nfun
@@ -366,7 +366,7 @@ function rhsbanded!(RHS, fun, dom)
 
   # retrieve matrix paramaters
   nobs = nelements(dom)
-  nvar = nvariates(fun)
+  nvar = nvariables(fun)
   nfun = nobs * nvar
 
   @inbounds for j in 1:nvar, i in 1:nfun

src/krig/ordinary.jl

@@ -28,11 +28,11 @@ end
 
 scale(model::OrdinaryKriging, α) = OrdinaryKriging(GeoStatsFunctions.scale(model.fun, α))
 
-nconstraints(model::OrdinaryKriging) = nvariates(model.fun)
+nconstraints(model::OrdinaryKriging) = nvariables(model.fun)
 
 function lhsconstraints!(model::OrdinaryKriging, LHS::AbstractMatrix, domain)
   nobs = nelements(domain)
-  nvar = nvariates(model.fun)
+  nvar = nvariables(model.fun)
   ncon = nconstraints(model)
   nfun = nobs * nvar
   nrow = nfun + ncon
@@ -59,7 +59,7 @@ end
 
 function rhsconstraints!(fitted::FittedKriging{<:OrdinaryKriging}, gₒ)
   RHS = fitted.state.RHS
-  nvar = nvariates(fitted.model.fun)
+  nvar = nvariables(fitted.model.fun)
   ncon = nconstraints(fitted.model)
   nfun = fitted.state.nfun
   nrow = nfun + ncon

src/krig/simple.jl

@@ -33,7 +33,7 @@ struct SimpleKriging{F<:GeoStatsFunction,M<:AbstractVector} <: KrigingModel
 
   function SimpleKriging{F,M}(fun, mean) where {F<:GeoStatsFunction,M<:AbstractVector}
     mlen = length(mean)
-    nvar = nvariates(fun)
+    nvar = nvariables(fun)
     @assert isstationary(fun) "Simple Kriging requires stationary geostatistical function"
     @assert mlen == nvar || isone(mlen) "length of mean vector must match number of covariates in geostatistical function"
     new(fun, mean)

src/krig/universal.jl

@@ -76,12 +76,12 @@ function exponents(deg::Int, dim::Int)
   eachcol(pow[:, inds])
 end
 
-nconstraints(model::UniversalKriging) = nvariates(model.fun) * length(model.drifts)
+nconstraints(model::UniversalKriging) = nvariables(model.fun) * length(model.drifts)
 
 function lhsconstraints!(model::UniversalKriging, LHS::AbstractMatrix, domain)
   drifts = model.drifts
   nobs = nelements(domain)
-  nvar = nvariates(model.fun)
+  nvar = nvariables(model.fun)
   ncon = nconstraints(model)
   nfun = nobs * nvar
   nrow = nfun + ncon
@@ -115,7 +115,7 @@ end
 function rhsconstraints!(fitted::FittedKriging{<:UniversalKriging}, gₒ)
   RHS = fitted.state.RHS
   drifts = fitted.model.drifts
-  nvar = nvariates(fitted.model.fun)
+  nvar = nvariables(fitted.model.fun)
   nfun = fitted.state.nfun
   ncol = nvar