Skip to content

Commit ec259f7

Browse files
alexanderrobitzschalexanderrobitzsch
committed
4.1-1
1 parent 0d14d1d commit ec259f7

File tree

126 files changed

+363
-355
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+363
-355
lines changed

‎DESCRIPTION‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: TAM
22
Type: Package
33
Title: Test Analysis Modules
4-
Version: 4.0-1
5-
Date: 2021-06-25 14:15:15
4+
Version: 4.1-1
5+
Date: 2022-05-15 09:03:38
66
Author:
77
Alexander Robitzsch [aut,cre] (<https://orcid.org/0000-0002-8226-3132>),
88
Thomas Kiefer [aut],
@@ -27,7 +27,7 @@ Imports:
2727
graphics, methods, Rcpp, stats, utils
2828
Suggests:
2929
coda, GPArotation, grDevices, lattice, lavaan, MASS,
30-
miceadds, mvtnorm, plyr, psych, sfsmisc, sirt, splines,
30+
miceadds, mvtnorm, plyr, psych, sfsmisc, splines,
3131
WrightMap
3232
LinkingTo:
3333
Rcpp, RcppArmadillo

‎R/IRT.informationCurve.R‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## File Name: IRT.informationCurve.R
2-
## File Version: 9.19
2+
## File Version: 9.212
33

44

55

@@ -47,25 +47,19 @@ informationCurves_mml <- function( object, h=.0001,
4747
B=B, xsi=xsi, theta=theta, nnodes=nnodes,
4848
maxK=maxK, recalc=TRUE)
4949

50-
#****
51-
# calculate probabilities
52-
if ( class(object) %in% c("tam.mml","tam.mml.2pl", "tam.mml.mfr") ){
50+
#--- calculate probabilities
51+
if ( inherits(object, c("tam.mml","tam.mml.2pl", "tam.mml.mfr") ) ){
5352
fct <- "tam_calc_prob"
54-
p0 <- do.call( what=fct, args=calc_args )$rprobs
55-
p1 <- do.call( what=fct, args=tam_args_replace_value( args=calc_args,
56-
variable="theta", value=theta+h ) )$rprobs
57-
p2 <- do.call( what=fct, args=tam_args_replace_value( args=calc_args,
58-
variable="theta", value=theta-h ) )$rprobs
5953
}
60-
if ( class(object) %in% c("tam.mml.3pl" ) ){
54+
if ( inherits(object, c("tam.mml.3pl") ) ){
6155
calc_args$guess <- guess
6256
fct <- "tam_mml_3pl_calc_prob"
63-
p0 <- do.call( what=fct, args=calc_args )$rprobs
64-
p1 <- do.call( what=fct, args=tam_args_replace_value( args=calc_args,
65-
variable="theta", value=theta+h ) )$rprobs
66-
p2 <- do.call( what=fct, args=tam_args_replace_value( args=calc_args,
67-
variable="theta", value=theta-h ) )$rprobs
6857
}
58+
p0 <- do.call( what=fct, args=calc_args )$rprobs
59+
args1 <- tam_args_replace_value( args=calc_args, variable="theta", value=theta+h )
60+
p1 <- do.call( what=fct, args=args1 )$rprobs
61+
args2 <- tam_args_replace_value( args=calc_args, variable="theta", value=theta-h )
62+
p2 <- do.call( what=fct, args=args2 )$rprobs
6963
p0a <- p0
7064
p0[ is.na(p0) ] <- 0
7165
p1[ is.na(p1) ] <- 0

‎R/IRT.residuals.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## File Name: IRT.residuals.R
2-
## File Version: 9.15
2+
## File Version: 9.161
33

44

55
#####################################################
@@ -15,7 +15,7 @@ IRT.residuals <- function (object, ...)
1515
tam.residuals <- function( object, ... )
1616
{
1717
tamobj <- object
18-
if (class(tamobj)!="tam.jml"){
18+
if (! inherits(tamobj,"tam.jml")){
1919
res <- tam.wle( tamobj, progress=FALSE, output.prob=TRUE, ... )
2020
probs <- res$probs
2121
probs[ is.na(probs) ] <- 0

‎R/IRTLikelihood.cfa.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## File Name: IRTLikelihood.cfa.R
2-
## File Version: 9.19
2+
## File Version: 9.201
33

44
#---- IRTLikelihood for fitted CFA model
55
IRTLikelihood.cfa <- function( data, cfaobj=NULL,
@@ -25,7 +25,7 @@ IRTLikelihood.cfa <- function( data, cfaobj=NULL,
2525
}
2626
theta0 <- snodes.adj * seq(-3,3,len=21)
2727
if (D>2){
28-
r1 <- sirt_import_sfsmisc_QUnif(n=snodes, min=0, max=1, n.min=1, p=D, leap=409)
28+
r1 <- tam_import_sfsmisc_QUnif(n=snodes, min=0, max=1, n.min=1, p=D, leap=409)
2929
theta <- stats::qnorm( r1 )
3030
for ( dd in 1:D){
3131
theta[,dd] <- snodes.adj*theta[,dd]

‎R/RcppExports.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## File Name: RcppExports.R
2-
## File Version: 4.000001
2+
## File Version: 4.001001
33
# Generated by using Rcpp::compileAttributes() -> do not edit by hand
44
# Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
55

‎R/designMatrices_aux.R‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## File Name: designMatrices_aux.R
2-
## File Version: 9.103
2+
## File Version: 9.104
33

44
#############################################################
55
print.designMatrices <-
@@ -215,8 +215,6 @@ if (FALSE){
215215
ind.mm <- grep(sg, rownames(mm))
216216
mm.sg.temp <- rbind( 0, apply( mm[ ind.mm,], 2, cumsum ) )
217217
# mm.sg.temp <- rbind( 0, colCumsums.sirt( mm[ ind.mm,] ) )
218-
# substitute the following line later if the sirt function
219-
# colCumsums.sirt is available at CRAN
220218
# mm.sg.temp <- rbind( 0, colCumsums.sirt( mm[ grep(sg, rownames(mm)),] ) )
221219
rownames(mm.sg.temp)[1] <- gsub("step([[:digit:]])*", "step0", sg, fixed=T)
222220
A <- rbind(A, mm.sg.temp)

‎R/plotDevianceTAM.R‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
## File Name: plotDevianceTAM.R
2-
## File Version: 9.10
3-
###############################################################################
4-
plotDevianceTAM <- function ( tam.obj, omitUntil=1, reverse=TRUE,
2+
## File Version: 9.111
3+
4+
5+
plotDevianceTAM <- function ( tam.obj, omitUntil=1, reverse=TRUE,
56
change=TRUE)
67
{
7-
stopifnot(class(tam.obj) %in% c("tam.mml","tam.mml.2pl","tam.mml.mfr","tam.mml.3pl","tamaan") )
8+
stopifnot(inherits(tam.obj, c("tam.mml","tam.mml.2pl","tam.mml.mfr","tam.mml.3pl","tamaan")) )
89

910
devhistory <- tam.obj$deviance.history
1011
if(omitUntil>0) {
@@ -20,7 +21,7 @@ plotDevianceTAM <- function ( tam.obj, omitUntil=1, reverse=TRUE,
2021
}
2122

2223
if(reverse){
23-
devChange <- -1 * devChange
24+
devChange <- -devChange
2425
}
2526
devChange <- data.frame ( nr=omitUntil + 1:length(devChange), devChange)
2627
xm <- ceiling( max(devChange[,1])/10 )*10
@@ -41,4 +42,3 @@ plotDevianceTAM <- function ( tam.obj, omitUntil=1, reverse=TRUE,
4142
dcr <- devChange[devChange[,2]<0,]
4243
graphics::points( dcr[,1], dcr[,2], pch=20, cex=cex, col="red")
4344
}
44-
###############################################################################

‎R/summary.tam.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
## File Name: summary.tam.R
2-
## File Version: 9.586
2+
## File Version: 9.587
33

44
#****** summary for tam object
55
summary.tam <- function( object, file=NULL, ...)
66
{
77
tam_osink(file=file)
88

99
latreg <- FALSE
10-
if ( class(object)=="tam.latreg" ){
10+
if ( inherits(object,"tam.latreg") ){
1111
latreg <- TRUE
1212
object$irtmodel <- "tam.latreg"
1313
}

‎R/tam.fit.R‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
## File Name: tam.fit.R
2-
## File Version: 9.16
2+
## File Version: 9.171
33
tam.fit <- function( tamobj, ... )
44
{
55
CALL <- match.call()
6-
if(class(tamobj)=="tam.mml"){
6+
if(inherits(tamobj,"tam.mml")){
77
res <- tam.mml.fit( tamobj, ...)
88
}
9-
if(class(tamobj)=="tam.jml"){
9+
if(inherits(tamobj,"tam.jml")){
1010
res <- tam.jml.fit( tamobj, ...)
1111
}
1212
res$CALL <- CALL

‎R/tam.mml.3pl.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## File Name: tam.mml.3pl.R
2-
## File Version: 9.881
2+
## File Version: 9.882
33

44
tam.mml.3pl <- function( resp, Y=NULL, group=NULL,
55
formulaY=NULL, dataY=NULL,
@@ -718,7 +718,7 @@ tam.mml.3pl <- function( resp, Y=NULL, group=NULL,
718718
se.xsi.min -> se.xsi
719719
se.B.min -> se.B
720720

721-
#*** include NAs in AXsi
721+
#*** include NAs in AXsi
722722
AXsi <- tam_mml_include_NA_AXsi(AXsi=AXsi, maxcat=maxK, A=A, xsi=xsi)
723723

724724
#**** standard errors AXsi

0 commit comments

Comments
 (0)