Skip to content

Commit 7fd7423

Browse files
alexanderrobitzschalexanderrobitzsch
committed
4.2-1
1 parent ec259f7 commit 7fd7423

File tree

96 files changed

+198
-175
lines changed

Some content is hidden

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

96 files changed

+198
-175
lines changed

‎DESCRIPTION

Lines changed: 2 additions & 2 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.1-1
5-
Date: 2022-05-15 09:03:38
4+
Version: 4.2-1
5+
Date: 2022-08-29 11:02:47
66
Author:
77
Alexander Robitzsch [aut,cre] (<https://orcid.org/0000-0002-8226-3132>),
88
Thomas Kiefer [aut],

‎R/IRT.informationCurve.R

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

44

55

@@ -59,7 +59,7 @@ informationCurves_mml <- function( object, h=.0001,
5959
args1 <- tam_args_replace_value( args=calc_args, variable="theta", value=theta+h )
6060
p1 <- do.call( what=fct, args=args1 )$rprobs
6161
args2 <- tam_args_replace_value( args=calc_args, variable="theta", value=theta-h )
62-
p2 <- do.call( what=fct, args=args2 )$rprobs
62+
p2 <- do.call( what=fct, args=args2 )$rprobs
6363
p0a <- p0
6464
p0[ is.na(p0) ] <- 0
6565
p1[ is.na(p1) ] <- 0

‎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.001001
2+
## File Version: 4.002001
33
# Generated by using Rcpp::compileAttributes() -> do not edit by hand
44
# Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
55

‎R/summary.tam.jml.R

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## File Name: summary.tam.jml.R
2-
## File Version: 9.258
2+
## File Version: 9.260
33

44

55
#***** summary for tam object
@@ -53,7 +53,8 @@ summary.tam.jml <- function( object, file=NULL, ...)
5353
cat(sdisplay)
5454
cat("Item Parameters -A*Xsi\n")
5555
obji <- object$item1
56-
tam_round_data_frame_print(obji=obji, from=2, to=ncol(obji), digits=3, rownames_null=TRUE)
56+
tam_round_data_frame_print(obji=obji, from=2, to=ncol(obji), digits=3,
57+
rownames_null=TRUE)
5758

5859
#** close sink
5960
tam_csink(file=file)

‎R/summary_tam_print_latreg_stand.R

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
## File Name: summary_tam_print_latreg_stand.R
2-
## File Version: 0.02
2+
## File Version: 0.04
33

44
summary_tam_print_latreg_stand <- function(object, digits_stand=4)
55
{
66
if ( ! is.null( object$latreg_stand ) ){
77
cat("------------------------------------------------------------\n")
88
cat("Standardized Coefficients\n")
9-
tam_round_data_frame_print(obji=object$latreg_stand$beta_stand, digits=digits_stand, from=3)
9+
tam_round_data_frame_print(obji=object$latreg_stand$beta_stand,
10+
digits=digits_stand, from=3)
1011
cat("\n** Explained Variance R^2\n")
11-
tam_round_data_frame_print(obji=object$latreg_stand$R2_theta, digits=digits_stand)
12+
tam_round_data_frame_print(obji=object$latreg_stand$R2_theta,
13+
digits=digits_stand)
1214
cat("** SD Theta\n")
13-
tam_round_data_frame_print(obji=object$latreg_stand$sd_theta, digits=digits_stand)
15+
tam_round_data_frame_print(obji=object$latreg_stand$sd_theta,
16+
digits=digits_stand)
1417
cat("** SD Predictors\n")
15-
tam_round_data_frame_print(obji=object$latreg_stand$sd_x, digits=digits_stand)
18+
tam_round_data_frame_print(obji=object$latreg_stand$sd_x,
19+
digits=digits_stand)
1620
}
1721
}

‎R/summary_tamaan_3pl_intro.R

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## File Name: summary_tamaan_3pl_intro.R
2-
## File Version: 9.27
2+
## File Version: 9.282
33

44

55
################################################
@@ -25,14 +25,17 @@ summary_tamaan_3pl_intro <- function(object){
2525
"Normal Distribution", "Discrete Distribution" ), "\n")
2626
if (object$skillspace=="normal"){
2727
if (ctr$snodes==0){
28-
cat("Numeric integration with", dim(object$theta)[1], "integration points\n")
28+
cat("Numeric integration with", dim(object$theta)[1],
29+
"integration points\n")
2930
}
3031
if (ctr$snodes>0){
3132
if (ctr$QMC){
32-
cat("Quasi Monte Carlo integration with", dim(object$theta)[1], "integration points\n")
33+
cat("Quasi Monte Carlo integration with", dim(object$theta)[1],
34+
"integration points\n")
3335
}
3436
if (! ctr$QMC){
35-
cat("Monte Carlo integration with", dim(object$theta)[1], "integration points\n")
37+
cat("Monte Carlo integration with", dim(object$theta)[1],
38+
"integration points\n")
3639
}
3740
}
3841
}

‎R/tam.cb.R

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## File Name: tam.cb.R
2-
## File Version: 0.16
2+
## File Version: 0.172
33

44

55

@@ -98,8 +98,9 @@ tam.cb <- function( dat, wlescore=NULL, group=NULL, max_ncat=30, progress=TRUE,
9898
if (l1 < max_ncat){
9999
wt <- weighted_table(v2, w=wgt1)
100100
wt <- wt / sum(wt)
101-
dfr.gg$freq[ii] <- paste0( " ", paste0( paste0( names(wt), " : ", round(wt,digits_freq)),
102-
collapse=" # " ) )
101+
dfr.gg$freq[ii] <- paste0( " ", paste0(
102+
paste0( names(wt), " : ", round(wt,digits_freq)),
103+
collapse=" # " ) )
103104
}
104105
if ( ii %in% prg){
105106
cat("-")

‎R/tam.jml.R

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

44

55
tam.jml <- function( resp, group=NULL, adj=.3, disattenuate=FALSE,
@@ -28,8 +28,8 @@ tam.jml <- function( resp, group=NULL, adj=.3, disattenuate=FALSE,
2828
constraint <- "cases"
2929
res <- tam_jml_version1( resp=resp, group=group, adj=adj,
3030
disattenuate=disattenuate, bias=bias, xsi.fixed=xsi.fixed,
31-
xsi.inits=xsi.inits, A=A, B=B, Q=Q, ndim=ndim, theta.fixed=theta.fixed,
32-
pweights=pweights, control=control )
31+
xsi.inits=xsi.inits, A=A, B=B, Q=Q, ndim=ndim,
32+
theta.fixed=theta.fixed, pweights=pweights, control=control )
3333
}
3434
#**** version=2
3535
if (version>=2){

‎R/tam.linking.R

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## File Name: tam.linking.R
2-
## File Version: 0.347
2+
## File Version: 0.349
33

44
tam.linking <- function( tamobj_list, type="Hae", method="joint",
55
pow_rob_hae=1, eps_rob_hae=1e-4, theta=NULL, wgt=NULL, wgt_sd=2, fix.slope=FALSE,
@@ -19,7 +19,8 @@ tam.linking <- function( tamobj_list, type="Hae", method="joint",
1919
#--- extract parameters
2020
parameters_list <- list()
2121
for (mm in 1:NM){
22-
parameters_list[[mm]] <- tam_linking_extract_parameters( tamobj=tamobj_list[[mm]],
22+
parameters_list[[mm]] <- tam_linking_extract_parameters(
23+
tamobj=tamobj_list[[mm]],
2324
elim_items=elim_items[[mm]] )
2425
}
2526

@@ -55,10 +56,10 @@ tam.linking <- function( tamobj_list, type="Hae", method="joint",
5556
s2 <- Sys.time()
5657
time <- c(s1, s2)
5758
res <- list(parameters_list=parameters_list, linking_list=linking_list, M_SD=M_SD,
58-
trafo_persons=trafo_persons, trafo_items=trafo_items, N_common=N_common,
59-
theta=theta, wgt=wgt, NS=NM, type=type, method=method,
60-
pow_rob_hae=pow_rob_hae, eps_rob_hae=eps_rob_hae, par=par,
61-
CALL=CALL,time=time)
59+
trafo_persons=trafo_persons, trafo_items=trafo_items,
60+
N_common=N_common, theta=theta, wgt=wgt, NS=NM, type=type,
61+
method=method, pow_rob_hae=pow_rob_hae, eps_rob_hae=eps_rob_hae,
62+
par=par, CALL=CALL,time=time)
6263
class(res) <- "tam.linking"
6364
return(res)
6465
}

‎R/tam.mml.3pl.R

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

44
tam.mml.3pl <- function( resp, Y=NULL, group=NULL,
55
formulaY=NULL, dataY=NULL,
@@ -638,6 +638,7 @@ tam.mml.3pl <- function( resp, Y=NULL, group=NULL,
638638
}
639639

640640

641+
641642
# cat("\nM steps slopes") ; a1 <- Sys.time(); print(a1-a0) ; a0 <- a1
642643

643644
#--- guessing parameter estimation

‎R/tam_accelerate_parameters.R

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## File Name: tam_accelerate_parameters.R
2-
## File Version: 9.18
2+
## File Version: 9.192
33

44
##############################################################################
55
# acceleration
@@ -22,7 +22,8 @@ tam_accelerate_parameters <- function( xsi_acceleration, xsi, iter, itermin=2, i
2222
xsi <- xsi + w_accel *(xsi - parm_history[,3] )
2323
parm_history[,1:2] <- parm_history[,2:3]
2424
parm_history[,3] <- xsi
25-
xsi_change <- cbind( parm_history[,2] - parm_history[,1], parm_history[,3] - parm_history[,2] )
25+
xsi_change <- cbind( parm_history[,2] - parm_history[,1],
26+
parm_history[,3] - parm_history[,2] )
2627
lam <- eucl_norm( xsi_change[ind,2] )/ ( eucl_norm( xsi_change[ind,1] ) + eps )
2728
if ( iter > itermin ){
2829
w_accel <- lam / ( 2 - lam )

‎R/tam_mml_3pl_mstep_item_slopes.R

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## File Name: tam_mml_3pl_mstep_item_slopes.R
2-
## File Version: 9.647
2+
## File Version: 9.658
33

44

55
#--- tam.mml.3pl estimate item slopes
@@ -90,7 +90,7 @@ tam_mml_3pl_mstep_item_slopes <- function( max.increment, np,
9090
if ( ncol(gammaslope.prior)==4 ){
9191
Xlambda <- ifelse( Xlambda < gammaslope.prior[,3],
9292
gammaslope.prior[,3] + 1.3* h, Xlambda )
93-
Xlambda <- ifelse( Xlambda > gammaslope.prior[,4],
93+
Xlambda <- ifelse( Xlambda > gammaslope.prior[,4],
9494
gammaslope.prior[,4] - 1.3* h, Xlambda )
9595
}
9696
}
@@ -145,12 +145,11 @@ tam_mml_3pl_mstep_item_slopes <- function( max.increment, np,
145145
skip_B=skip_B, B=B )
146146

147147
#---- OUTPUT
148-
res <- list(gammaslope=Xlambda, se.gammaslope=se.Xlambda,
148+
res <- list(gammaslope=gammaslope, se.gammaslope=se.Xlambda,
149149
max.increment.b=max.increment,
150150
gammachange=max( abs( Xlambda00 - Xlambda) ),
151151
gammaslope_change=gammaslope_change,
152-
gammaslope_acceleration=gammaslope_acceleration, B=B
153-
)
152+
gammaslope_acceleration=gammaslope_acceleration, B=B )
154153
return(res)
155154
}
156155
#----------------------------------------------------------

‎R/tam_mml_create_nodes.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## File Name: tam_mml_create_nodes.R
2-
## File Version: 0.331
2+
## File Version: 0.332
33

44
tam_mml_create_nodes <- function(snodes, nodes, ndim, QMC,
55
skillspace="normal", theta.k=NULL)
@@ -48,7 +48,7 @@ tam_mml_create_nodes <- function(snodes, nodes, ndim, QMC,
4848
# sampled theta values
4949
if (QMC){
5050
fac <- 1
51-
r1 <- tam_import_sfsmisc_QUnif(n=snodes, min=0, max=1, n.min=1,
51+
r1 <- tam_import_sfsmisc_QUnif(n=snodes, min=0, max=1, n.min=1,
5252
p=ndim, leap=409)
5353
theta0.samp <- fac * stats::qnorm(r1)
5454
if (ndim==1){

‎R/tamaanify.tam.mml.3pl.designMatrices.TRAIT.R

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

44
######################################
55
# TRAIT
@@ -25,7 +25,7 @@ tamaanify.tam.mml.3pl.designMatrices.TRAIT <- function( res ){
2525
if ( ! is.null(B_fix) ){
2626
Q.fixed <- NA*Q
2727
colnames(B_fix) <- c("item_index", "cat", "dim", "value")
28-
B_fix <- B_fix[ B_fix[,"cat"]==2, ]
28+
B_fix <- B_fix[ B_fix[,"cat"]==2,, drop=FALSE ]
2929
h1 <- B_fix[, c("item_index", "dim") ]
3030
Q.fixed[ h1 ] <- B_fix[, "value"]
3131
}

‎README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
# TAM
22
#### Test Analysis Modules
33

4-
5-
If you use `TAM` and have suggestions for improvement or have found bugs, please email me at robitzsch@ipn.uni-kiel.de.
4+
If you use `TAM` and have suggestions for improvement or have found bugs, please email me at robitzsch@leibniz-ipn.de.
5+
Please always provide a minimal dataset, necessary to demonstrate the problem,
6+
a minimal runnable code necessary to reproduce the issue, which can be run on the given dataset, and
7+
all necessary information on the used librarys, the R version, and the OS it is run on, perhaps a sessionInfo().
68

79
#### Manual
810

911
The manual may be found here [https://alexanderrobitzsch.github.io/TAM/](https://alexanderrobitzsch.github.io/TAM/)
1012

11-
#### CRAN version `TAM` 4.0-16 (2022-05-13)
13+
#### CRAN version `TAM` 4.1-4 (2022-08-28)
1214

1315

1416
[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version-last-release/TAM)](https://cran.r-project.org/package=TAM)
@@ -22,9 +24,9 @@ The CRAN version can be installed from within R using:
2224
utils::install.packages("TAM")
2325
```
2426

25-
#### GitHub version `TAM` 4.1-1 (2022-05-15)
27+
#### GitHub version `TAM` 4.2-1 (2022-08-29)
2628

27-
[![](https://img.shields.io/badge/github%20version-4.1--1-orange.svg)](https://github.com/alexanderrobitzsch/TAM)&#160;&#160;
29+
[![](https://img.shields.io/badge/github%20version-4.2--1-orange.svg)](https://github.com/alexanderrobitzsch/TAM)&#160;&#160;
2830

2931
The version hosted [here](https://github.com/alexanderrobitzsch/TAM) is the development version of `TAM`.
3032
The GitHub version can be installed using `devtools` as:

‎docs/404.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/authors.html

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/index.html

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/pkgdown.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ pandoc: 1.13.1
22
pkgdown: 1.5.1
33
pkgdown_sha: ~
44
articles: []
5-
last_built: 2022-05-15T07:23Z
5+
last_built: 2022-08-29T09:18Z
66

‎docs/reference/DescribeBy.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/reference/IRT.WrightMap.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/reference/IRT.cv.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)