Skip to content

Commit

Permalink
keep trying to resolve namespace issue
Browse files Browse the repository at this point in the history
  • Loading branch information
philchalmers committed Apr 23, 2015
1 parent f71db9e commit 5d043ed
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 11 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Expand Up @@ -13,11 +13,11 @@ Description: Tools for detecting and summarize influential cases that
Roxygen: list(wrap = FALSE)
Depends:
R (>= 2.14),
sem,
mvtnorm,
parallel
Imports:
lattice,
sem,
lavaan,
mirt,
MASS
Expand Down
3 changes: 1 addition & 2 deletions NAMESPACE
Expand Up @@ -24,6 +24,5 @@ import(graphics)
import(lattice)
import(mvtnorm)
import(parallel)
import(sem)
importFrom(lavaan,logLik)
importFrom(lavaan,sem)
importFrom(mirt,fscores)
8 changes: 3 additions & 5 deletions R/LD.R
Expand Up @@ -90,7 +90,7 @@ LD <- function(data, model, ...)
logLik(sem::sem(model, data=data[-ind, ], objective=objective, ...))
}
f_lavaan <- function(ind, data, model, ...){
logLik(lavaan::sem(model, data=data[-ind, ], ...))
lavaan::logLik(lavaan::sem(model, data=data[-ind, ], ...))
}
f_mirt <- function(ind, data, model, large, ...){
large$Freq[[1L]][ind] <- large$Freq[[1L]][ind] - 1L
Expand All @@ -107,12 +107,10 @@ LD <- function(data, model, ...)
LR <- myApply(index, MARGIN=1L, FUN=f_numeric, data=data, model=model, ...)
}
if(class(model) == "semmod"){
stop('semmod objects under construction') #TODO
stop('semmod objects under construction. Use GOF() for now instead') #TODO
objective <- if(any(is.na(data))) sem::objectiveFIML else sem::objectiveML
MLmod <- sem::sem(model, data=data, objective=objective, ...)
if(requireNamespace('sem')){
MLmod <- logLik(MLmod)
}
MLmod <- logLik(MLmod) ## TODO, this doesn't resolve correctly
LR <- myApply(index, MARGIN=1L, FUN=f_sem, data=data, model=model, objective=objective, ...)
}
if(class(model) == "character"){
Expand Down
4 changes: 1 addition & 3 deletions R/faoutlier.R
Expand Up @@ -9,10 +9,8 @@
#' @docType package
#' @title Influential case detection methods for FA and SEM
#' @author Phil Chalmers \email{rphilip.chalmers@@gmail.com}
#' @import MASS parallel lattice mvtnorm graphics
#' @import MASS parallel lattice mvtnorm graphics sem
#' @importFrom lavaan logLik
#' @importFrom lavaan sem
#' @importFrom mirt fscores
#' @keywords package
NULL

Expand Down

0 comments on commit 5d043ed

Please sign in to comment.