[Splm-commits] r256 - in pkg: . man

[noreply at r-forge.r-project.org]

Author: rsbivand
Date: 2023-07-20 11:43:54 +0200 (Thu, 20 Jul 2023)
New Revision: 256

Modified:
   pkg/DESCRIPTION
   pkg/NAMESPACE
   pkg/man/spml.Rd
Log:
remove condition in NAMESPACE; add alias(impacts) to man page

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2023-07-17 08:39:42 UTC (rev 255)
+++ pkg/DESCRIPTION	2023-07-20 09:43:54 UTC (rev 256)
@@ -1,7 +1,7 @@
 Package: splm
 Title: Econometric Models for Spatial Panel Data
 Version: 1.6-3
-Date: 2022-10-03
+Date: 2023-07-20
 Authors at R: c(person(given = "Giovanni", family = "Millo", role = c("aut", "cre"), email = "giovanni.millo at deams.units.it"),
              person(given = "Gianfranco", family = "Piras", role = c("aut"), email = "gpiras at mac.com"),
              person("Roger", "Bivand", role = c("ctb"), email = "Roger.Bivand at nhh.no", comment=c(ORCID="0000-0003-2392-6140")))

Modified: pkg/NAMESPACE
===================================================================
--- pkg/NAMESPACE	2023-07-17 08:39:42 UTC (rev 255)
+++ pkg/NAMESPACE	2023-07-20 09:43:54 UTC (rev 256)
@@ -13,34 +13,17 @@
 importFrom(nlme, fdHess, lme)
 importFrom(stringr, str_remove)
 
-#if (packageVersion("spdep") < 1.2) {
-#  import(spdep, except=c(do_ldet, eigen_setup, trW, impacts.gmsar, impacts))
-#  importFrom(spatialreg, do_ldet, eigen_setup, trW, impacts)
-#} else {
-#  import(spdep, except=c(set.ClusterOption, set.VerboseOption, set.mcOption, 
-#    get.VerboseOption, get.coresOption, set.coresOption, set.ZeroPolicyOption, 
-#    get.mcOption, get.ClusterOption, get.ZeroPolicyOption))
-#  import(spatialreg)
-#}
+# rely on spdep (>= 1.2-1) in Imports:
+importFrom(spdep, mat2listw, listw2mat, lag.listw, nblag,
+           is.symmetric.nb, is.symmetric.glist, card)
+importFrom(spatialreg, impacts,
+         do_ldet, eigen_setup, trW,
+         eigen_pre_setup, Matrix_setup, Matrix_J_setup, spam_setup,
+         spam_update_setup, cheb_setup, mcdet_setup, LU_setup,
+         LU_prepermutate_setup, moments_setup,
+         SE_classic_setup, SE_whichMin_setup, SE_interp_setup,
+         as.spam.listw, get.ZeroPolicyOption)
 
-## check if we can rationalize imports from spdep and spatialreg (also to avoid
-## problematic dependencies like, e.g., gdata)
-if (packageVersion("spdep") < 1.2) {
-  import(spdep, except=c(do_ldet, eigen_setup, trW, impacts.gmsar, impacts))
-  importFrom(spatialreg, do_ldet, eigen_setup, trW, impacts)
-} else {
-    importFrom(spdep, mat2listw, listw2mat, lag.listw, nblag,
-               is.symmetric.nb, is.symmetric.glist, card)
-    importFrom(spatialreg, impacts,
-             do_ldet, eigen_setup, trW,
-             eigen_pre_setup, Matrix_setup, Matrix_J_setup, spam_setup,
-             spam_update_setup, cheb_setup, mcdet_setup, LU_setup,
-             LU_prepermutate_setup, moments_setup,
-             SE_classic_setup, SE_whichMin_setup, SE_interp_setup,
-             as.spam.listw, get.ZeroPolicyOption)
-}
-
-
 importFrom(ibdreg, pchibar)
 import(Matrix)
 importFrom(spam, as.spam, diag.spam, solve.spam, t.spam, determinant.spam)

Modified: pkg/man/spml.Rd
===================================================================
--- pkg/man/spml.Rd	2023-07-17 08:39:42 UTC (rev 255)
+++ pkg/man/spml.Rd	2023-07-20 09:43:54 UTC (rev 256)
@@ -1,5 +1,6 @@
 \name{spml}
 \alias{spml}
+\alias{impacts}
 \title{Spatial Panel Model by Maximum Likelihood}
 \description{Maximum likelihood (ML) estimation of spatial panel models, possibly with fixed or random effects.}