From 944b6c167e1646bad270322ba8edabd714570e07 Mon Sep 17 00:00:00 2001 From: Jim Thorson Date: Fri, 10 Jan 2025 09:47:48 -0800 Subject: [PATCH] another try --- NAMESPACE | 8 ++++---- R/dsem.R | 2 +- R/dsemRTMB.R | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index ad4d6d7..be10967 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -38,7 +38,11 @@ importFrom(RTMB,AD) importFrom(RTMB,ADREPORT) importFrom(RTMB,ADoverload) importFrom(RTMB,REPORT) +importFrom(RTMB,dbinom) +importFrom(RTMB,dgamma) importFrom(RTMB,dgmrf) +importFrom(RTMB,dnorm) +importFrom(RTMB,dpois) importFrom(TMB,MakeADFun) importFrom(TMB,compile) importFrom(TMB,dynlib) @@ -61,10 +65,6 @@ importFrom(sem,sem) importFrom(stats,"tsp<-") importFrom(stats,.preformat.ts) importFrom(stats,AIC) -importFrom(stats,dbinom) -importFrom(stats,dgamma) -importFrom(stats,dnorm) -importFrom(stats,dpois) importFrom(stats,logLik) importFrom(stats,na.omit) importFrom(stats,nlminb) diff --git a/R/dsem.R b/R/dsem.R index c590fa5..0386156 100644 --- a/R/dsem.R +++ b/R/dsem.R @@ -34,7 +34,7 @@ #' settings, and see documentation for that function for details. #' #' @importFrom TMB compile dynlib MakeADFun sdreport summary.sdreport -#' @importFrom stats AIC sd .preformat.ts na.omit nlminb optimHess pnorm rbinom rgamma rpois rnorm simulate time tsp<- dbinom dgamma dnorm dpois plogis +#' @importFrom stats AIC sd .preformat.ts na.omit nlminb optimHess pnorm rbinom rgamma rpois rnorm simulate time tsp<- plogis #' @importFrom Matrix solve Cholesky sparseMatrix mat2triplet drop0 #' @importFrom sem sem #' @importFrom igraph plot.igraph graph_from_data_frame with_sugiyama layout_ diff --git a/R/dsemRTMB.R b/R/dsemRTMB.R index 1fa7918..2c033dc 100644 --- a/R/dsemRTMB.R +++ b/R/dsemRTMB.R @@ -13,7 +13,7 @@ #' \code{library(RTMB)} prior to running the model. #' #' @importFrom Matrix solve Diagonal sparseMatrix drop0 kronecker crossprod tcrossprod t diag -#' @importFrom RTMB ADoverload AD dgmrf REPORT ADREPORT +#' @importFrom RTMB ADoverload AD dgmrf REPORT ADREPORT dnorm dpois dbinom dgamma #' #' @details #' \code{dsemRTMB} is interchangeable with \code{\link{dsem}}, but uses RTMB