Update for TMB (#20)

* Fix #19 * further fix * small update * Update as_fitted_DAG.Rd
James-Thorson-NOAA · Apr 15, 2024 · bb1bd53 · bb1bd53
1 parent 84cedad
commit bb1bd53
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 160 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: dsem
 Type: Package
 Title: Fit Dynamic Structural Equation Models
-Version: 1.2.0
-Date: 2024-03-29
+Version: 1.2.1
+Date: 2024-04-02
 Authors@R: 
     c(person(given = "James",
              family = "Thorson",

diff --git a/NAMESPACE b/NAMESPACE
@@ -11,7 +11,6 @@ S3method(vcov,dsem)
 export(TMBAIC)
 export(as_fitted_DAG)
 export(as_sem)
-export(checkDepPackageVersion)
 export(classify_variables)
 export(dsem)
 export(dsem_control)
@@ -42,5 +41,4 @@ importFrom(stats,sd)
 importFrom(stats,simulate)
 importFrom(stats,time)
 importFrom(stats,vcov)
-importFrom(utils,packageVersion)
 useDynLib(dsem, .registration = TRUE)
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+# dsem 1.2.1
+
+* removing `checkDepPackageVersion(dep_pkg="Matrix", this_pkg="TMB")` from `.onLoad()`
+  as requested by K. Kristensen
+
 # dsem 1.2.0
 
 * Adding option to specify covariance via argument `covs`

diff --git a/R/dsem.R b/R/dsem.R
@@ -873,9 +873,10 @@ logLik.dsem <- function(object, ...) {
 as_fitted_DAG <-
 function( fit,
           lag = 0,
-          what = "Estimate",
+          what = c("Estimate","Std_Error","p_value"),
           direction = 1 ){
 
+  what = match.arg(what)
   coefs = summary( fit )
   coefs = coefs[ which(coefs[,2]==lag), ]
   coefs = coefs[ which(coefs[,'direction'] %in% direction), ]

diff --git a/R/utils.R b/R/utils.R
diff --git a/R/zzz.R b/R/zzz.R
@@ -4,7 +4,7 @@
 # See: https://mail.google.com/mail/u/0/#inbox/QgrcJHsNjpqZNGJhNMVHcfGFDLLMfrvqqHl
 .onLoad <- function(libname, pkgname) {
   #checkDepPackageVersion(dep_pkg="TMB", this_pkg="dsem")
-  checkDepPackageVersion(dep_pkg="Matrix", this_pkg="TMB")
+  #checkDepPackageVersion(dep_pkg="Matrix", this_pkg="TMB")
 }
 
 .onUnload <- function(libpath) {

diff --git a/man/as_fitted_DAG.Rd b/man/as_fitted_DAG.Rd
diff --git a/man/checkDepPackageVersion.Rd b/man/checkDepPackageVersion.Rd
diff --git a/man/reinstalling.Rd b/man/reinstalling.Rd