From 7fd74230a55c8296fd8865db1700009445e4e54f Mon Sep 17 00:00:00 2001 From: arobitzsch Date: Mon, 29 Aug 2022 11:31:35 +0200 Subject: [PATCH] 4.2-1 --- DESCRIPTION | 4 ++-- R/IRT.informationCurve.R | 4 ++-- R/RcppExports.R | 2 +- R/summary.tam.jml.R | 5 +++-- R/summary_tam_print_latreg_stand.R | 14 +++++++++----- R/summary_tamaan_3pl_intro.R | 11 +++++++---- R/tam.cb.R | 7 ++++--- R/tam.jml.R | 6 +++--- R/tam.linking.R | 13 +++++++------ R/tam.mml.3pl.R | 3 ++- R/tam_accelerate_parameters.R | 5 +++-- R/tam_mml_3pl_mstep_item_slopes.R | 9 ++++----- R/tam_mml_create_nodes.R | 4 ++-- R/tamaanify.tam.mml.3pl.designMatrices.TRAIT.R | 4 ++-- README.md | 12 +++++++----- docs/404.html | 2 +- docs/authors.html | 8 ++++---- docs/index.html | 6 +++--- docs/pkgdown.yml | 2 +- docs/reference/DescribeBy.html | 2 +- docs/reference/IRT.WrightMap.html | 2 +- docs/reference/IRT.cv.html | 2 +- docs/reference/IRT.data.tam.html | 2 +- docs/reference/IRT.drawPV.html | 4 ++-- docs/reference/IRT.expectedCounts.tam.html | 2 +- docs/reference/IRT.factor.scores.tam.html | 2 +- docs/reference/IRT.frequencies.tam.html | 2 +- docs/reference/IRT.informationCurves.html | 2 +- docs/reference/IRT.irfprob.tam.html | 2 +- docs/reference/IRT.itemfit.html | 4 ++-- docs/reference/IRT.likelihood.tam.html | 2 +- docs/reference/IRT.linearCFA.html | 2 +- docs/reference/IRT.residuals.html | 6 +++--- docs/reference/IRT.simulate.html | 2 +- docs/reference/IRT.threshold.html | 2 +- docs/reference/IRT.truescore.html | 4 ++-- docs/reference/IRTLikelihood.cfa.html | 2 +- docs/reference/IRTLikelihood.ctt.html | 2 +- docs/reference/Scale.html | 2 +- docs/reference/TAM-defunct.html | 2 +- docs/reference/TAM-package.html | 2 +- docs/reference/TAM-utilities.html | 2 +- docs/reference/WLErel.html | 2 +- docs/reference/anova.tam.html | 2 +- docs/reference/cfa.extract.itempars.html | 2 +- docs/reference/data.cqc.html | 16 ++++++++-------- docs/reference/data.ctest.html | 2 +- docs/reference/data.examples.html | 2 +- docs/reference/data.fims.Aus.Jpn.html | 2 +- docs/reference/data.geiser.html | 2 +- docs/reference/data.gpcm.html | 2 +- docs/reference/data.janssen.html | 2 +- docs/reference/data.mc.html | 2 +- docs/reference/data.numeracy.html | 2 +- docs/reference/data.sim.mfr.html | 2 +- docs/reference/data.sim.rasch.html | 2 +- docs/reference/data.timssAusTwn.html | 2 +- docs/reference/designMatrices.html | 2 +- docs/reference/doparse.html | 2 +- docs/reference/index.html | 2 +- docs/reference/lavaanify.IRT.html | 8 ++++---- docs/reference/msq.itemfit.html | 6 +++--- docs/reference/plot.tam.html | 2 +- docs/reference/plotDevianceTAM.html | 2 +- docs/reference/predict.html | 2 +- docs/reference/tam.ctt.html | 2 +- docs/reference/tam.fa.html | 2 +- docs/reference/tam.fit.html | 12 ++++++------ docs/reference/tam.jml.html | 2 +- docs/reference/tam.latreg.html | 2 +- docs/reference/tam.linking.html | 10 +++++----- docs/reference/tam.mml.3pl.html | 2 +- docs/reference/tam.mml.html | 8 ++++---- docs/reference/tam.modelfit.html | 4 ++-- docs/reference/tam.np.html | 8 ++++---- docs/reference/tam.personfit.html | 2 +- docs/reference/tam.pv.html | 4 ++-- docs/reference/tam.se.html | 2 +- docs/reference/tam.threshold.html | 2 +- docs/reference/tam.wle.html | 2 +- docs/reference/tam_NA_pattern.html | 2 +- docs/reference/tam_downcode.html | 2 +- docs/reference/tam_irf_3pl.html | 2 +- docs/reference/tamaan.html | 2 +- docs/reference/tamaanify.html | 2 +- docs/reference/tampv2datalist.html | 2 +- docs/reference/weighted_Stats.html | 2 +- inst/NEWS | 12 +++++++++++- man/IRT.residuals.Rd | 6 +++--- man/lavaanify.IRT.Rd | 4 ++-- man/msq.itemfit.Rd | 4 ++-- man/tam.mml.Rd | 4 ++-- man/tam.np.Rd | 6 +++--- src/RcppExports.cpp | 2 +- src/init.c | 2 +- src/tam_rcpp_pv_mcmc.cpp | 8 ++++---- 96 files changed, 198 insertions(+), 175 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index dba7661..51f13d3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: TAM Type: Package Title: Test Analysis Modules -Version: 4.1-1 -Date: 2022-05-15 09:03:38 +Version: 4.2-1 +Date: 2022-08-29 11:02:47 Author: Alexander Robitzsch [aut,cre] (), Thomas Kiefer [aut], diff --git a/R/IRT.informationCurve.R b/R/IRT.informationCurve.R index 5d516d9..2cc6c6c 100644 --- a/R/IRT.informationCurve.R +++ b/R/IRT.informationCurve.R @@ -1,5 +1,5 @@ ## File Name: IRT.informationCurve.R -## File Version: 9.212 +## File Version: 9.213 @@ -59,7 +59,7 @@ informationCurves_mml <- function( object, h=.0001, args1 <- tam_args_replace_value( args=calc_args, variable="theta", value=theta+h ) p1 <- do.call( what=fct, args=args1 )$rprobs args2 <- tam_args_replace_value( args=calc_args, variable="theta", value=theta-h ) - p2 <- do.call( what=fct, args=args2 )$rprobs + p2 <- do.call( what=fct, args=args2 )$rprobs p0a <- p0 p0[ is.na(p0) ] <- 0 p1[ is.na(p1) ] <- 0 diff --git a/R/RcppExports.R b/R/RcppExports.R index 6a4cb9e..df98303 100644 --- a/R/RcppExports.R +++ b/R/RcppExports.R @@ -1,5 +1,5 @@ ## File Name: RcppExports.R -## File Version: 4.001001 +## File Version: 4.002001 # Generated by using Rcpp::compileAttributes() -> do not edit by hand # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393 diff --git a/R/summary.tam.jml.R b/R/summary.tam.jml.R index 921b7cf..4c5d413 100644 --- a/R/summary.tam.jml.R +++ b/R/summary.tam.jml.R @@ -1,5 +1,5 @@ ## File Name: summary.tam.jml.R -## File Version: 9.258 +## File Version: 9.260 #***** summary for tam object @@ -53,7 +53,8 @@ summary.tam.jml <- function( object, file=NULL, ...) cat(sdisplay) cat("Item Parameters -A*Xsi\n") obji <- object$item1 - tam_round_data_frame_print(obji=obji, from=2, to=ncol(obji), digits=3, rownames_null=TRUE) + tam_round_data_frame_print(obji=obji, from=2, to=ncol(obji), digits=3, + rownames_null=TRUE) #** close sink tam_csink(file=file) diff --git a/R/summary_tam_print_latreg_stand.R b/R/summary_tam_print_latreg_stand.R index 6eb0e08..ad7c292 100644 --- a/R/summary_tam_print_latreg_stand.R +++ b/R/summary_tam_print_latreg_stand.R @@ -1,17 +1,21 @@ ## File Name: summary_tam_print_latreg_stand.R -## File Version: 0.02 +## File Version: 0.04 summary_tam_print_latreg_stand <- function(object, digits_stand=4) { if ( ! is.null( object$latreg_stand ) ){ cat("------------------------------------------------------------\n") cat("Standardized Coefficients\n") - tam_round_data_frame_print(obji=object$latreg_stand$beta_stand, digits=digits_stand, from=3) + tam_round_data_frame_print(obji=object$latreg_stand$beta_stand, + digits=digits_stand, from=3) cat("\n** Explained Variance R^2\n") - tam_round_data_frame_print(obji=object$latreg_stand$R2_theta, digits=digits_stand) + tam_round_data_frame_print(obji=object$latreg_stand$R2_theta, + digits=digits_stand) cat("** SD Theta\n") - tam_round_data_frame_print(obji=object$latreg_stand$sd_theta, digits=digits_stand) + tam_round_data_frame_print(obji=object$latreg_stand$sd_theta, + digits=digits_stand) cat("** SD Predictors\n") - tam_round_data_frame_print(obji=object$latreg_stand$sd_x, digits=digits_stand) + tam_round_data_frame_print(obji=object$latreg_stand$sd_x, + digits=digits_stand) } } diff --git a/R/summary_tamaan_3pl_intro.R b/R/summary_tamaan_3pl_intro.R index 648aefb..81b28bc 100644 --- a/R/summary_tamaan_3pl_intro.R +++ b/R/summary_tamaan_3pl_intro.R @@ -1,5 +1,5 @@ ## File Name: summary_tamaan_3pl_intro.R -## File Version: 9.27 +## File Version: 9.282 ################################################ @@ -25,14 +25,17 @@ summary_tamaan_3pl_intro <- function(object){ "Normal Distribution", "Discrete Distribution" ), "\n") if (object$skillspace=="normal"){ if (ctr$snodes==0){ - cat("Numeric integration with", dim(object$theta)[1], "integration points\n") + cat("Numeric integration with", dim(object$theta)[1], + "integration points\n") } if (ctr$snodes>0){ if (ctr$QMC){ - cat("Quasi Monte Carlo integration with", dim(object$theta)[1], "integration points\n") + cat("Quasi Monte Carlo integration with", dim(object$theta)[1], + "integration points\n") } if (! ctr$QMC){ - cat("Monte Carlo integration with", dim(object$theta)[1], "integration points\n") + cat("Monte Carlo integration with", dim(object$theta)[1], + "integration points\n") } } } diff --git a/R/tam.cb.R b/R/tam.cb.R index 54b6592..d21b5e5 100644 --- a/R/tam.cb.R +++ b/R/tam.cb.R @@ -1,5 +1,5 @@ ## File Name: tam.cb.R -## File Version: 0.16 +## File Version: 0.172 @@ -98,8 +98,9 @@ tam.cb <- function( dat, wlescore=NULL, group=NULL, max_ncat=30, progress=TRUE, if (l1 < max_ncat){ wt <- weighted_table(v2, w=wgt1) wt <- wt / sum(wt) - dfr.gg$freq[ii] <- paste0( " ", paste0( paste0( names(wt), " : ", round(wt,digits_freq)), - collapse=" # " ) ) + dfr.gg$freq[ii] <- paste0( " ", paste0( + paste0( names(wt), " : ", round(wt,digits_freq)), + collapse=" # " ) ) } if ( ii %in% prg){ cat("-") diff --git a/R/tam.jml.R b/R/tam.jml.R index a4ac039..8030eb8 100644 --- a/R/tam.jml.R +++ b/R/tam.jml.R @@ -1,5 +1,5 @@ ## File Name: tam.jml.R -## File Version: 9.365 +## File Version: 9.367 tam.jml <- function( resp, group=NULL, adj=.3, disattenuate=FALSE, @@ -28,8 +28,8 @@ tam.jml <- function( resp, group=NULL, adj=.3, disattenuate=FALSE, constraint <- "cases" res <- tam_jml_version1( resp=resp, group=group, adj=adj, disattenuate=disattenuate, bias=bias, xsi.fixed=xsi.fixed, - xsi.inits=xsi.inits, A=A, B=B, Q=Q, ndim=ndim, theta.fixed=theta.fixed, - pweights=pweights, control=control ) + xsi.inits=xsi.inits, A=A, B=B, Q=Q, ndim=ndim, + theta.fixed=theta.fixed, pweights=pweights, control=control ) } #**** version=2 if (version>=2){ diff --git a/R/tam.linking.R b/R/tam.linking.R index c1fddda..65583fe 100644 --- a/R/tam.linking.R +++ b/R/tam.linking.R @@ -1,5 +1,5 @@ ## File Name: tam.linking.R -## File Version: 0.347 +## File Version: 0.349 tam.linking <- function( tamobj_list, type="Hae", method="joint", 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", #--- extract parameters parameters_list <- list() for (mm in 1:NM){ - parameters_list[[mm]] <- tam_linking_extract_parameters( tamobj=tamobj_list[[mm]], + parameters_list[[mm]] <- tam_linking_extract_parameters( + tamobj=tamobj_list[[mm]], elim_items=elim_items[[mm]] ) } @@ -55,10 +56,10 @@ tam.linking <- function( tamobj_list, type="Hae", method="joint", s2 <- Sys.time() time <- c(s1, s2) res <- list(parameters_list=parameters_list, linking_list=linking_list, M_SD=M_SD, - trafo_persons=trafo_persons, trafo_items=trafo_items, N_common=N_common, - theta=theta, wgt=wgt, NS=NM, type=type, method=method, - pow_rob_hae=pow_rob_hae, eps_rob_hae=eps_rob_hae, par=par, - CALL=CALL,time=time) + trafo_persons=trafo_persons, trafo_items=trafo_items, + N_common=N_common, theta=theta, wgt=wgt, NS=NM, type=type, + method=method, pow_rob_hae=pow_rob_hae, eps_rob_hae=eps_rob_hae, + par=par, CALL=CALL,time=time) class(res) <- "tam.linking" return(res) } diff --git a/R/tam.mml.3pl.R b/R/tam.mml.3pl.R index 485fe44..57ccf69 100644 --- a/R/tam.mml.3pl.R +++ b/R/tam.mml.3pl.R @@ -1,5 +1,5 @@ ## File Name: tam.mml.3pl.R -## File Version: 9.882 +## File Version: 9.888 tam.mml.3pl <- function( resp, Y=NULL, group=NULL, formulaY=NULL, dataY=NULL, @@ -638,6 +638,7 @@ tam.mml.3pl <- function( resp, Y=NULL, group=NULL, } + # cat("\nM steps slopes") ; a1 <- Sys.time(); print(a1-a0) ; a0 <- a1 #--- guessing parameter estimation diff --git a/R/tam_accelerate_parameters.R b/R/tam_accelerate_parameters.R index 6514b1c..29bc29f 100644 --- a/R/tam_accelerate_parameters.R +++ b/R/tam_accelerate_parameters.R @@ -1,5 +1,5 @@ ## File Name: tam_accelerate_parameters.R -## File Version: 9.18 +## File Version: 9.192 ############################################################################## # acceleration @@ -22,7 +22,8 @@ tam_accelerate_parameters <- function( xsi_acceleration, xsi, iter, itermin=2, i xsi <- xsi + w_accel *(xsi - parm_history[,3] ) parm_history[,1:2] <- parm_history[,2:3] parm_history[,3] <- xsi - xsi_change <- cbind( parm_history[,2] - parm_history[,1], parm_history[,3] - parm_history[,2] ) + xsi_change <- cbind( parm_history[,2] - parm_history[,1], + parm_history[,3] - parm_history[,2] ) lam <- eucl_norm( xsi_change[ind,2] )/ ( eucl_norm( xsi_change[ind,1] ) + eps ) if ( iter > itermin ){ w_accel <- lam / ( 2 - lam ) diff --git a/R/tam_mml_3pl_mstep_item_slopes.R b/R/tam_mml_3pl_mstep_item_slopes.R index 281ae44..69ebb1a 100644 --- a/R/tam_mml_3pl_mstep_item_slopes.R +++ b/R/tam_mml_3pl_mstep_item_slopes.R @@ -1,5 +1,5 @@ ## File Name: tam_mml_3pl_mstep_item_slopes.R -## File Version: 9.647 +## File Version: 9.658 #--- tam.mml.3pl estimate item slopes @@ -90,7 +90,7 @@ tam_mml_3pl_mstep_item_slopes <- function( max.increment, np, if ( ncol(gammaslope.prior)==4 ){ Xlambda <- ifelse( Xlambda < gammaslope.prior[,3], gammaslope.prior[,3] + 1.3* h, Xlambda ) - Xlambda <- ifelse( Xlambda > gammaslope.prior[,4], + Xlambda <- ifelse( Xlambda > gammaslope.prior[,4], gammaslope.prior[,4] - 1.3* h, Xlambda ) } } @@ -145,12 +145,11 @@ tam_mml_3pl_mstep_item_slopes <- function( max.increment, np, skip_B=skip_B, B=B ) #---- OUTPUT - res <- list(gammaslope=Xlambda, se.gammaslope=se.Xlambda, + res <- list(gammaslope=gammaslope, se.gammaslope=se.Xlambda, max.increment.b=max.increment, gammachange=max( abs( Xlambda00 - Xlambda) ), gammaslope_change=gammaslope_change, - gammaslope_acceleration=gammaslope_acceleration, B=B - ) + gammaslope_acceleration=gammaslope_acceleration, B=B ) return(res) } #---------------------------------------------------------- diff --git a/R/tam_mml_create_nodes.R b/R/tam_mml_create_nodes.R index b0d44c9..7195409 100644 --- a/R/tam_mml_create_nodes.R +++ b/R/tam_mml_create_nodes.R @@ -1,5 +1,5 @@ ## File Name: tam_mml_create_nodes.R -## File Version: 0.331 +## File Version: 0.332 tam_mml_create_nodes <- function(snodes, nodes, ndim, QMC, skillspace="normal", theta.k=NULL) @@ -48,7 +48,7 @@ tam_mml_create_nodes <- function(snodes, nodes, ndim, QMC, # sampled theta values if (QMC){ fac <- 1 - r1 <- tam_import_sfsmisc_QUnif(n=snodes, min=0, max=1, n.min=1, + r1 <- tam_import_sfsmisc_QUnif(n=snodes, min=0, max=1, n.min=1, p=ndim, leap=409) theta0.samp <- fac * stats::qnorm(r1) if (ndim==1){ diff --git a/R/tamaanify.tam.mml.3pl.designMatrices.TRAIT.R b/R/tamaanify.tam.mml.3pl.designMatrices.TRAIT.R index df62351..e0dcc2e 100644 --- a/R/tamaanify.tam.mml.3pl.designMatrices.TRAIT.R +++ b/R/tamaanify.tam.mml.3pl.designMatrices.TRAIT.R @@ -1,5 +1,5 @@ ## File Name: tamaanify.tam.mml.3pl.designMatrices.TRAIT.R -## File Version: 9.07 +## File Version: 9.082 ###################################### # TRAIT @@ -25,7 +25,7 @@ tamaanify.tam.mml.3pl.designMatrices.TRAIT <- function( res ){ if ( ! is.null(B_fix) ){ Q.fixed <- NA*Q colnames(B_fix) <- c("item_index", "cat", "dim", "value") - B_fix <- B_fix[ B_fix[,"cat"]==2, ] + B_fix <- B_fix[ B_fix[,"cat"]==2,, drop=FALSE ] h1 <- B_fix[, c("item_index", "dim") ] Q.fixed[ h1 ] <- B_fix[, "value"] } diff --git a/README.md b/README.md index 7e6299e..54c877e 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,16 @@ # TAM #### Test Analysis Modules - -If you use `TAM` and have suggestions for improvement or have found bugs, please email me at robitzsch@ipn.uni-kiel.de. +If you use `TAM` and have suggestions for improvement or have found bugs, please email me at robitzsch@leibniz-ipn.de. +Please always provide a minimal dataset, necessary to demonstrate the problem, +a minimal runnable code necessary to reproduce the issue, which can be run on the given dataset, and +all necessary information on the used librarys, the R version, and the OS it is run on, perhaps a sessionInfo(). #### Manual The manual may be found here [https://alexanderrobitzsch.github.io/TAM/](https://alexanderrobitzsch.github.io/TAM/) -#### CRAN version `TAM` 4.0-16 (2022-05-13) +#### CRAN version `TAM` 4.1-4 (2022-08-28) [![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: utils::install.packages("TAM") ``` -#### GitHub version `TAM` 4.1-1 (2022-05-15) +#### GitHub version `TAM` 4.2-1 (2022-08-29) -[![](https://img.shields.io/badge/github%20version-4.1--1-orange.svg)](https://github.com/alexanderrobitzsch/TAM)   +[![](https://img.shields.io/badge/github%20version-4.2--1-orange.svg)](https://github.com/alexanderrobitzsch/TAM)   The version hosted [here](https://github.com/alexanderrobitzsch/TAM) is the development version of `TAM`. The GitHub version can be installed using `devtools` as: diff --git a/docs/404.html b/docs/404.html index e040c9a..8f04439 100644 --- a/docs/404.html +++ b/docs/404.html @@ -71,7 +71,7 @@ TAM - 4.1-1 + 4.2-1 diff --git a/docs/authors.html b/docs/authors.html index d84dca4..1399ad4 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -71,7 +71,7 @@ TAM - 4.1-1 + 4.2-1 @@ -111,12 +111,12 @@

Citation

Source: inst/CITATION -

Robitzsch, A., Kiefer, T., & Wu, M. (2022). TAM: Test Analysis Modules. R package version 4.1-1. https://CRAN.R-project.org/package=TAM

-
@Manual{TAM_4.1-1,
+    

Robitzsch, A., Kiefer, T., & Wu, M. (2022). TAM: Test Analysis Modules. R package version 4.2-1. https://CRAN.R-project.org/package=TAM

+
@Manual{TAM_4.2-1,
   title = {TAM: Test Analysis Modules},
   author = {Alexander Robitzsch and Thomas Kiefer and Margaret Wu},
   year = {2022},
-  note = {R package version 4.1-1},
+  note = {R package version 4.2-1},
   url = {https://CRAN.R-project.org/package=TAM},
 }
diff --git a/docs/index.html b/docs/index.html index 14abc1e..0276eb2 100644 --- a/docs/index.html +++ b/docs/index.html @@ -43,7 +43,7 @@ TAM - 4.1-1 + 4.2-1 @@ -86,11 +86,11 @@

Test Analysis Modules

If you use TAM and have suggestions for improvement or have found bugs, please email me at

-. +. Please always provide a minimal dataset, necessary to demonstrate the problem, a minimal runnable code necessary to reproduce the issue, which can be run on the given dataset, and all necessary information on the used librarys, the R version, and the OS it is run on, perhaps a sessionInfo().

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index e57c35c..807f3d6 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -2,5 +2,5 @@ pandoc: 1.13.1 pkgdown: 1.5.1 pkgdown_sha: ~ articles: [] -last_built: 2022-05-15T07:23Z +last_built: 2022-08-29T09:18Z diff --git a/docs/reference/DescribeBy.html b/docs/reference/DescribeBy.html index 120c36a..7f0ba87 100644 --- a/docs/reference/DescribeBy.html +++ b/docs/reference/DescribeBy.html @@ -72,7 +72,7 @@ TAM - 4.1-vv + 4.2-vv

diff --git a/docs/reference/IRT.WrightMap.html b/docs/reference/IRT.WrightMap.html index 16c598f..92921a2 100644 --- a/docs/reference/IRT.WrightMap.html +++ b/docs/reference/IRT.WrightMap.html @@ -76,7 +76,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/IRT.cv.html b/docs/reference/IRT.cv.html index 08821c1..2ea87f4 100644 --- a/docs/reference/IRT.cv.html +++ b/docs/reference/IRT.cv.html @@ -72,7 +72,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/IRT.data.tam.html b/docs/reference/IRT.data.tam.html index db676b4..be47255 100644 --- a/docs/reference/IRT.data.tam.html +++ b/docs/reference/IRT.data.tam.html @@ -74,7 +74,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/IRT.drawPV.html b/docs/reference/IRT.drawPV.html index 99f71de..f14b639 100644 --- a/docs/reference/IRT.drawPV.html +++ b/docs/reference/IRT.drawPV.html @@ -75,7 +75,7 @@ TAM - 4.1-vv + 4.2-vv @@ -154,7 +154,7 @@

Examp dat <- data.read # fit Rasch model -mod <- rasch.mml2(dat) +mod <- rasch.mml2(dat) # draw 10 plausible values pv1 <- TAM::IRT.drawPV(mod, NPV=10) }

diff --git a/docs/reference/IRT.expectedCounts.tam.html b/docs/reference/IRT.expectedCounts.tam.html index abf2875..c02df25 100644 --- a/docs/reference/IRT.expectedCounts.tam.html +++ b/docs/reference/IRT.expectedCounts.tam.html @@ -74,7 +74,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/IRT.factor.scores.tam.html b/docs/reference/IRT.factor.scores.tam.html index 5056dea..5d7257a 100644 --- a/docs/reference/IRT.factor.scores.tam.html +++ b/docs/reference/IRT.factor.scores.tam.html @@ -74,7 +74,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/IRT.frequencies.tam.html b/docs/reference/IRT.frequencies.tam.html index 9b0e40a..ae9d86b 100644 --- a/docs/reference/IRT.frequencies.tam.html +++ b/docs/reference/IRT.frequencies.tam.html @@ -74,7 +74,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/IRT.informationCurves.html b/docs/reference/IRT.informationCurves.html index 5c28bf7..ed0afc4 100644 --- a/docs/reference/IRT.informationCurves.html +++ b/docs/reference/IRT.informationCurves.html @@ -72,7 +72,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/IRT.irfprob.tam.html b/docs/reference/IRT.irfprob.tam.html index bc34187..90b5080 100644 --- a/docs/reference/IRT.irfprob.tam.html +++ b/docs/reference/IRT.irfprob.tam.html @@ -74,7 +74,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/IRT.itemfit.html b/docs/reference/IRT.itemfit.html index 8df5af5..249226c 100644 --- a/docs/reference/IRT.itemfit.html +++ b/docs/reference/IRT.itemfit.html @@ -76,7 +76,7 @@ TAM - 4.1-vv + 4.2-vv @@ -205,7 +205,7 @@

Examp a <- rep(1,I) a[c(3,8)] <- c( 1.7, .4 ) # simulate 2PL data -dat <- sirt::sim.raschtype( theta=rnorm(N), b=b, fixed.a=a) +dat <- sirt::sim.raschtype( theta=rnorm(N), b=b, fixed.a=a) # fit 1PL model mod <- TAM::tam.mml( dat ) diff --git a/docs/reference/IRT.likelihood.tam.html b/docs/reference/IRT.likelihood.tam.html index 615847a..c1a5631 100644 --- a/docs/reference/IRT.likelihood.tam.html +++ b/docs/reference/IRT.likelihood.tam.html @@ -74,7 +74,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/IRT.linearCFA.html b/docs/reference/IRT.linearCFA.html index 3437e18..e7ab064 100644 --- a/docs/reference/IRT.linearCFA.html +++ b/docs/reference/IRT.linearCFA.html @@ -76,7 +76,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/IRT.residuals.html b/docs/reference/IRT.residuals.html index 05731ea..ead7b64 100644 --- a/docs/reference/IRT.residuals.html +++ b/docs/reference/IRT.residuals.html @@ -76,7 +76,7 @@ TAM - 4.1-vv + 4.2-vv @@ -177,8 +177,8 @@

Note

factor analysis (see Example 1).

See also

-

See also the eRm::residuals (eRm) or -residuals (mirt) +

See also the eRm::residuals (eRm) or +residuals (mirt) functions.

See also predict.tam.mml.

diff --git a/docs/reference/IRT.simulate.html b/docs/reference/IRT.simulate.html index bb21b36..0237454 100644 --- a/docs/reference/IRT.simulate.html +++ b/docs/reference/IRT.simulate.html @@ -72,7 +72,7 @@ TAM - 4.1-vv + 4.2-vv
diff --git a/docs/reference/IRT.threshold.html b/docs/reference/IRT.threshold.html index 5cac63e..2337c27 100644 --- a/docs/reference/IRT.threshold.html +++ b/docs/reference/IRT.threshold.html @@ -78,7 +78,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/IRT.truescore.html b/docs/reference/IRT.truescore.html index d4c271c..643de1b 100644 --- a/docs/reference/IRT.truescore.html +++ b/docs/reference/IRT.truescore.html @@ -77,7 +77,7 @@ TAM - 4.1-vv + 4.2-vv @@ -157,7 +157,7 @@

Value

true scores \(\tau( \theta ) \).

See also

-

See also sirt::truescore.irt +

See also sirt::truescore.irt for a conversion function for generalized partial credit models.

Examples

diff --git a/docs/reference/IRTLikelihood.cfa.html b/docs/reference/IRTLikelihood.cfa.html index f09ae94..1bfb8be 100644 --- a/docs/reference/IRTLikelihood.cfa.html +++ b/docs/reference/IRTLikelihood.cfa.html @@ -79,7 +79,7 @@ TAM - 4.1-vv + 4.2-vv
diff --git a/docs/reference/IRTLikelihood.ctt.html b/docs/reference/IRTLikelihood.ctt.html index 9888c02..de0ea28 100644 --- a/docs/reference/IRTLikelihood.ctt.html +++ b/docs/reference/IRTLikelihood.ctt.html @@ -73,7 +73,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/Scale.html b/docs/reference/Scale.html index 94d35a4..fb31e4f 100644 --- a/docs/reference/Scale.html +++ b/docs/reference/Scale.html @@ -72,7 +72,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/TAM-defunct.html b/docs/reference/TAM-defunct.html index 6f3b45b..fddc66b 100644 --- a/docs/reference/TAM-defunct.html +++ b/docs/reference/TAM-defunct.html @@ -73,7 +73,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/TAM-package.html b/docs/reference/TAM-package.html index 468609b..e764eff 100644 --- a/docs/reference/TAM-package.html +++ b/docs/reference/TAM-package.html @@ -83,7 +83,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/TAM-utilities.html b/docs/reference/TAM-utilities.html index d571936..d47999d 100644 --- a/docs/reference/TAM-utilities.html +++ b/docs/reference/TAM-utilities.html @@ -72,7 +72,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/WLErel.html b/docs/reference/WLErel.html index 6a60330..69f4da6 100644 --- a/docs/reference/WLErel.html +++ b/docs/reference/WLErel.html @@ -72,7 +72,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/anova.tam.html b/docs/reference/anova.tam.html index ba3b3a7..37d0769 100644 --- a/docs/reference/anova.tam.html +++ b/docs/reference/anova.tam.html @@ -77,7 +77,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/cfa.extract.itempars.html b/docs/reference/cfa.extract.itempars.html index de72ca1..75996bc 100644 --- a/docs/reference/cfa.extract.itempars.html +++ b/docs/reference/cfa.extract.itempars.html @@ -76,7 +76,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/data.cqc.html b/docs/reference/data.cqc.html index 1f3634b..667522c 100644 --- a/docs/reference/data.cqc.html +++ b/docs/reference/data.cqc.html @@ -73,7 +73,7 @@ TAM - 4.1-vv + 4.2-vv @@ -180,7 +180,7 @@

FormatSee also

-

See the sirt::R2conquest function +

See the sirt::R2conquest function for running ConQuest software from within R.

See the WrightMap package for functions connected to reading ConQuest files and creating Wright maps. @@ -219,16 +219,16 @@

Examp #------- ConQuest # estimate model -cmod01 <- sirt::R2conquest( dat, name="mod01", path.conquest=path.conquest) +cmod01 <- sirt::R2conquest( dat, name="mod01", path.conquest=path.conquest) summary(cmod01) # summary output # read shw file with some terms -shw01a <- sirt::read.show( "mod01.shw" ) +shw01a <- sirt::read.show( "mod01.shw" ) cmod01$shw.itemparameter # read person item maps -pi01a <- sirt::read.pimap( "mod01.shw" ) +pi01a <- sirt::read.pimap( "mod01.shw" ) cmod01$shw.pimap # read plausible values (npv=10 plausible values) -pv01a <- sirt::read.pv(pvfile="mod01.pv", npv=10) +pv01a <- sirt::read.pv(pvfile="mod01.pv", npv=10) cmod01$person # read ConQuest model @@ -256,7 +256,7 @@

Examp #--- ConQuest # estimate model maxK <- max( dat, na.rm=TRUE ) -cmod02a <- sirt::R2conquest( dat, itemcodes=0:maxK, model="item+item*step", +cmod02a <- sirt::R2conquest( dat, itemcodes=0:maxK, model="item+item*step", name="mod02a", path.conquest=path.conquest) summary(cmod02a) # summary output @@ -290,7 +290,7 @@

Examp X <- data.cqc03[,"rater",drop=FALSE] X$rater <- as.numeric(substring( X$rater, 2 )) # convert 'rater' in numeric format maxK <- max( resp, na.rm=TRUE) -cmod03a <- sirt::R2conquest( resp, X=X, regression="", model="item+step+rater", +cmod03a <- sirt::R2conquest( resp, X=X, regression="", model="item+step+rater", name="mod03a", path.conquest=path.conquest, set.constraints="cases" ) summary(cmod03a) # summary output diff --git a/docs/reference/data.ctest.html b/docs/reference/data.ctest.html index a958632..0901fde 100644 --- a/docs/reference/data.ctest.html +++ b/docs/reference/data.ctest.html @@ -72,7 +72,7 @@ TAM - 4.1-vv + 4.2-vv

diff --git a/docs/reference/data.examples.html b/docs/reference/data.examples.html index 235213d..2ab2005 100644 --- a/docs/reference/data.examples.html +++ b/docs/reference/data.examples.html @@ -72,7 +72,7 @@ TAM - 4.1-vv + 4.2-vv
diff --git a/docs/reference/data.fims.Aus.Jpn.html b/docs/reference/data.fims.Aus.Jpn.html index 30ea196..2a61826 100644 --- a/docs/reference/data.fims.Aus.Jpn.html +++ b/docs/reference/data.fims.Aus.Jpn.html @@ -74,7 +74,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/data.geiser.html b/docs/reference/data.geiser.html index 2ceac3d..472a515 100644 --- a/docs/reference/data.geiser.html +++ b/docs/reference/data.geiser.html @@ -73,7 +73,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/data.gpcm.html b/docs/reference/data.gpcm.html index f9f997e..dfe5b6c 100644 --- a/docs/reference/data.gpcm.html +++ b/docs/reference/data.gpcm.html @@ -72,7 +72,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/data.janssen.html b/docs/reference/data.janssen.html index 94a9ee4..f8377a0 100644 --- a/docs/reference/data.janssen.html +++ b/docs/reference/data.janssen.html @@ -72,7 +72,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/data.mc.html b/docs/reference/data.mc.html index eb0abc7..afe27b9 100644 --- a/docs/reference/data.mc.html +++ b/docs/reference/data.mc.html @@ -73,7 +73,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/data.numeracy.html b/docs/reference/data.numeracy.html index 8779c23..b3362ac 100644 --- a/docs/reference/data.numeracy.html +++ b/docs/reference/data.numeracy.html @@ -73,7 +73,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/data.sim.mfr.html b/docs/reference/data.sim.mfr.html index ba5364f..a739eaf 100644 --- a/docs/reference/data.sim.mfr.html +++ b/docs/reference/data.sim.mfr.html @@ -72,7 +72,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/data.sim.rasch.html b/docs/reference/data.sim.rasch.html index 67a4deb..11402eb 100644 --- a/docs/reference/data.sim.rasch.html +++ b/docs/reference/data.sim.rasch.html @@ -72,7 +72,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/data.timssAusTwn.html b/docs/reference/data.timssAusTwn.html index 025fe36..9201005 100644 --- a/docs/reference/data.timssAusTwn.html +++ b/docs/reference/data.timssAusTwn.html @@ -75,7 +75,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/designMatrices.html b/docs/reference/designMatrices.html index 9f3d452..c3e5b9c 100644 --- a/docs/reference/designMatrices.html +++ b/docs/reference/designMatrices.html @@ -72,7 +72,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/doparse.html b/docs/reference/doparse.html index 47aa94f..bc038ea 100644 --- a/docs/reference/doparse.html +++ b/docs/reference/doparse.html @@ -83,7 +83,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/index.html b/docs/reference/index.html index 413e628..d31ff7e 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -71,7 +71,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/lavaanify.IRT.html b/docs/reference/lavaanify.IRT.html index 876c4b6..80a7734 100644 --- a/docs/reference/lavaanify.IRT.html +++ b/docs/reference/lavaanify.IRT.html @@ -89,7 +89,7 @@ TAM - 4.1-vv + 4.2-vv @@ -197,11 +197,11 @@

See a

lavaan::lavaanify

-

See sirt::tam2mirt for +

See sirt::tam2mirt for converting objects of class tam into mirt objects.

-

See sirt::lavaan2mirt -for estimating models in the mirt package using lavaan syntax.

+

See sirt::lavaan2mirt +for estimating models in the mirt package using lavaan syntax.

See doparse for the DO and DO2 statements.

Examples

diff --git a/docs/reference/msq.itemfit.html b/docs/reference/msq.itemfit.html index 7f7e67f..306e5f1 100644 --- a/docs/reference/msq.itemfit.html +++ b/docs/reference/msq.itemfit.html @@ -78,7 +78,7 @@ TAM - 4.1-vv + 4.2-vv @@ -196,7 +196,7 @@

Examp # create some misfitting items a[c(1,3)] <- c(.5, 1.5 ) # simulate data -dat <- sirt::sim.raschtype( rnorm(N), b=b, fixed.a=a ) +dat <- sirt::sim.raschtype( rnorm(N), b=b, fixed.a=a ) #*** estimate Rasch model mod1 <- TAM::tam.mml(resp=dat) # compute WLEs @@ -218,7 +218,7 @@

Examp library(mirt) mod1b <- mirt::mirt( dat, model=1, itemtype="Rasch", verbose=TRUE ) print(mod1b) -sirt::mirt.wrapper.coef(mod1b) +sirt::mirt.wrapper.coef(mod1b) fmod1b <- mirt::itemfit(mod1b, Theta=as.matrix(wmod1,ncol=1), Zh=TRUE, X2=FALSE, S_X2=FALSE ) cbind( fit2a$fit_data, fmod1b ) diff --git a/docs/reference/plot.tam.html b/docs/reference/plot.tam.html index f749019..ce4b79b 100644 --- a/docs/reference/plot.tam.html +++ b/docs/reference/plot.tam.html @@ -73,7 +73,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/plotDevianceTAM.html b/docs/reference/plotDevianceTAM.html index 19ad667..413b447 100644 --- a/docs/reference/plotDevianceTAM.html +++ b/docs/reference/plotDevianceTAM.html @@ -72,7 +72,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/predict.html b/docs/reference/predict.html index 1a2df9b..6c38108 100644 --- a/docs/reference/predict.html +++ b/docs/reference/predict.html @@ -75,7 +75,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/tam.ctt.html b/docs/reference/tam.ctt.html index 8e77972..8af0570 100644 --- a/docs/reference/tam.ctt.html +++ b/docs/reference/tam.ctt.html @@ -73,7 +73,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/tam.fa.html b/docs/reference/tam.fa.html index 3404b67..9522b4e 100644 --- a/docs/reference/tam.fa.html +++ b/docs/reference/tam.fa.html @@ -75,7 +75,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/tam.fit.html b/docs/reference/tam.fit.html index f52c4c7..58cd605 100644 --- a/docs/reference/tam.fit.html +++ b/docs/reference/tam.fit.html @@ -74,7 +74,7 @@ TAM - 4.1-vv + 4.2-vv @@ -219,7 +219,7 @@

See a for models fitted with JML.

See tam.personfit for computing person fit statistics.

Item fit and person fit based on estimated person parameters can also be -calculated using the sirt::pcm.fit function +calculated using the sirt::pcm.fit function in the sirt package (see Example 1 and Example 2).

Examples

@@ -251,7 +251,7 @@

Examp # extract item parameters b1 <- - mod1$AXsi[, -1 ] # assess item fit and person fit -fit1a <- sirt::pcm.fit(b=b1, theta=wle$theta, data.sim.rasch ) +fit1a <- sirt::pcm.fit(b=b1, theta=wle$theta, data.sim.rasch ) fit1a$item # item fit statistic fit1a$person # person fit statistic @@ -279,7 +279,7 @@

Examp # extract item parameters b1 <- - mod2$AXsi[, -1 ] # assess fit -fit1a <- sirt::pcm.fit(b=b1, theta=wle$theta, dat) +fit1a <- sirt::pcm.fit(b=b1, theta=wle$theta, dat) fit1a$item ############################################################################# @@ -335,7 +335,7 @@

Examp # create some misfitting items a[c(1,3)] <- c(.5, 1.5 ) # simulate data -dat <- sirt::sim.raschtype( rnorm(N), b=b, fixed.a=a ) +dat <- sirt::sim.raschtype( rnorm(N), b=b, fixed.a=a ) #*** estimate Rasch model mod1 <- TAM::tam.mml(resp=dat) #*** assess item fit by infit and outfit statistic @@ -347,7 +347,7 @@

Examp library(sirt) mod1c <- mirt::mirt( dat, model=1, itemtype="Rasch", verbose=TRUE) print(mod1c) # model summary -sirt::mirt.wrapper.coef(mod1c) # estimated parameters +sirt::mirt.wrapper.coef(mod1c) # estimated parameters fit1c <- mirt::itemfit(mod1c, method="EAP") # model fit in mirt package # compare results of TAM and mirt dfr <- cbind( "TAM"=fit1, "mirt"=fit1c[,-c(1:2)] ) diff --git a/docs/reference/tam.jml.html b/docs/reference/tam.jml.html index 1d4df33..26d8bb0 100644 --- a/docs/reference/tam.jml.html +++ b/docs/reference/tam.jml.html @@ -74,7 +74,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/tam.latreg.html b/docs/reference/tam.latreg.html index 7e382f3..3e1046b 100644 --- a/docs/reference/tam.latreg.html +++ b/docs/reference/tam.latreg.html @@ -78,7 +78,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/tam.linking.html b/docs/reference/tam.linking.html index c94dd25..988a96c 100644 --- a/docs/reference/tam.linking.html +++ b/docs/reference/tam.linking.html @@ -78,7 +78,7 @@ TAM - 4.1-vv + 4.2-vv @@ -304,8 +304,8 @@

See a

Linking or equating of item response models can be also conducted with plink (Weeks, 2010), equate, equateIRT (Battauz, 2015), equateMultiple, kequate and irteQ packages.

-

See also the sirt::linking.haberman, -sirt::invariance.alignment and sirt::linking.haebara functions +

See also the sirt::linking.haberman, +sirt::invariance.alignment and sirt::linking.haebara functions in the sirt package.

Examples

@@ -452,9 +452,9 @@

Examp I <- 30 # number of items b <- seq(-2,2, length=I) # data for group 1 -dat1 <- sirt::sim.raschtype( rnorm(N, mean=0, sd=1), b=b ) +dat1 <- sirt::sim.raschtype( rnorm(N, mean=0, sd=1), b=b ) # data for group 2 -dat2 <- sirt::sim.raschtype( rnorm(N, mean=1, sd=.6), b=b ) +dat2 <- sirt::sim.raschtype( rnorm(N, mean=1, sd=.6), b=b ) # fit group 1 mod1 <- TAM::tam.mml.2pl( resp=dat1 ) diff --git a/docs/reference/tam.mml.3pl.html b/docs/reference/tam.mml.3pl.html index 3d6c15e..8b3c728 100644 --- a/docs/reference/tam.mml.3pl.html +++ b/docs/reference/tam.mml.3pl.html @@ -74,7 +74,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/tam.mml.html b/docs/reference/tam.mml.html index c746446..aabeb63 100644 --- a/docs/reference/tam.mml.html +++ b/docs/reference/tam.mml.html @@ -79,7 +79,7 @@ TAM - 4.1-vv + 4.2-vv @@ -642,9 +642,9 @@

See a

Standard errors are estimated by a rather crude (but quick) approximation. Use tam.se for improved standard errors.

For model comparisons see anova.tam.

-

See sirt::tam2mirt for converting +

See sirt::tam2mirt for converting tam objects into objects of class -mirt::mirt in the mirt package.

+mirt::mirt in the mirt package.

Examples

#############################################################################
@@ -2072,7 +2072,7 @@ 

Examp I <- 100 # number of items set.seed(987) # simulate data according to the Rasch model -dat <- sirt::sim.raschtype( stats::rnorm(N), b=seq(-2,2,len=I) ) +dat <- sirt::sim.raschtype( stats::rnorm(N), b=seq(-2,2,len=I) ) # estimate models mod1n <- TAM::tam.mml( resp=dat, control=list( acceleration="none") ) # no acceler. mod1y <- TAM::tam.mml( resp=dat, control=list( acceleration="Yu") ) # Yu acceler. diff --git a/docs/reference/tam.modelfit.html b/docs/reference/tam.modelfit.html index 356538e..95863ca 100644 --- a/docs/reference/tam.modelfit.html +++ b/docs/reference/tam.modelfit.html @@ -84,7 +84,7 @@ TAM - 4.1-vv + 4.2-vv @@ -333,7 +333,7 @@

Examp I <- 20 # number of items # simulate responses library(sirt) -dat <- sirt::sim.raschtype( stats::rnorm(N), b=seq(-1.5,1.5,len=I) ) +dat <- sirt::sim.raschtype( stats::rnorm(N), b=seq(-1.5,1.5,len=I) ) #*** estimation mod1 <- TAM::tam.mml( dat ) summary(dat) diff --git a/docs/reference/tam.np.html b/docs/reference/tam.np.html index be6e95d..c8d3ad0 100644 --- a/docs/reference/tam.np.html +++ b/docs/reference/tam.np.html @@ -79,7 +79,7 @@ TAM - 4.1-vv + 4.2-vv @@ -256,8 +256,8 @@

R

See also

Nonparametric item response models can also be estimated with the -mirt::itemGAM function in the mirt package and the -KernSmoothIRT::ksIRT in the KernSmoothIRT package.

+mirt::itemGAM function in the mirt package and the +KernSmoothIRT::ksIRT in the KernSmoothIRT package.

See tam.mml and tam.mml.2pl for parametric item response models.

@@ -361,7 +361,7 @@

Examp a <- rep(1,I) a[c(3,8)] <- c(.5, 2) theta <- stats::rnorm(N, sd=1) -dat <- sirt::sim.raschtype(theta, b=b, fixed.a=a) +dat <- sirt::sim.raschtype(theta, b=b, fixed.a=a) #- 1PL model mod1 <- TAM::tam.mml(dat) diff --git a/docs/reference/tam.personfit.html b/docs/reference/tam.personfit.html index 5be8ca6..1163e3b 100644 --- a/docs/reference/tam.personfit.html +++ b/docs/reference/tam.personfit.html @@ -72,7 +72,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/tam.pv.html b/docs/reference/tam.pv.html index 97f1871..c597c72 100644 --- a/docs/reference/tam.pv.html +++ b/docs/reference/tam.pv.html @@ -84,7 +84,7 @@ TAM - 4.1-vv + 4.2-vv @@ -573,7 +573,7 @@

Examp theta <- .5*X[,1] + .4*X[,2] + rnorm( N, sd=.5 ) # simulate item responses itemdiff <- seq( -2, 2, length=I) # item difficulties -dat <- sirt::sim.raschtype( theta, b=itemdiff ) +dat <- sirt::sim.raschtype( theta, b=itemdiff ) #*********************** #*** Model 0: Regression model with true variables diff --git a/docs/reference/tam.se.html b/docs/reference/tam.se.html index d20d6ce..03b64f5 100644 --- a/docs/reference/tam.se.html +++ b/docs/reference/tam.se.html @@ -73,7 +73,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/tam.threshold.html b/docs/reference/tam.threshold.html index 01e3524..5fa5529 100644 --- a/docs/reference/tam.threshold.html +++ b/docs/reference/tam.threshold.html @@ -73,7 +73,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/tam.wle.html b/docs/reference/tam.wle.html index baee2b6..1529fbb 100644 --- a/docs/reference/tam.wle.html +++ b/docs/reference/tam.wle.html @@ -76,7 +76,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/tam_NA_pattern.html b/docs/reference/tam_NA_pattern.html index 38e23aa..c43c372 100644 --- a/docs/reference/tam_NA_pattern.html +++ b/docs/reference/tam_NA_pattern.html @@ -73,7 +73,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/tam_downcode.html b/docs/reference/tam_downcode.html index 409e92c..9576880 100644 --- a/docs/reference/tam_downcode.html +++ b/docs/reference/tam_downcode.html @@ -73,7 +73,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/tam_irf_3pl.html b/docs/reference/tam_irf_3pl.html index 2cab744..6fda230 100644 --- a/docs/reference/tam_irf_3pl.html +++ b/docs/reference/tam_irf_3pl.html @@ -73,7 +73,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/tamaan.html b/docs/reference/tamaan.html index 7f16fd0..a6be9bb 100644 --- a/docs/reference/tamaan.html +++ b/docs/reference/tamaan.html @@ -76,7 +76,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/tamaanify.html b/docs/reference/tamaanify.html index 3e0d40d..3301c1d 100644 --- a/docs/reference/tamaanify.html +++ b/docs/reference/tamaanify.html @@ -75,7 +75,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/tampv2datalist.html b/docs/reference/tampv2datalist.html index dd2f14c..b7d99f3 100644 --- a/docs/reference/tampv2datalist.html +++ b/docs/reference/tampv2datalist.html @@ -75,7 +75,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/docs/reference/weighted_Stats.html b/docs/reference/weighted_Stats.html index b13bb41..12f923c 100644 --- a/docs/reference/weighted_Stats.html +++ b/docs/reference/weighted_Stats.html @@ -75,7 +75,7 @@ TAM - 4.1-vv + 4.2-vv diff --git a/inst/NEWS b/inst/NEWS index 346adf8..f03f85e 100644 --- a/inst/NEWS +++ b/inst/NEWS @@ -42,7 +42,7 @@ http://www.edmeasurementsurveys.com/TAM/Tutorials/ ------------------------------------------------------------- -VERSIONS TAM 4.1 | 2022-05-15 | Last: TAM 4.1-1 +VERSIONS TAM 4.2 | 2022-08-29 | Last: TAM 4.2-1 ------------------------------------------------------------- xxx * ... @@ -53,6 +53,16 @@ EXAMP * included/modified examples: --- +------------------------------------------------------------- +VERSIONS TAM 4.1 | 2022-08-28 | Last: TAM 4.1-4 +------------------------------------------------------------- + +FIXED * fixed issues in handling constraints in tamaan() and + tam.mml.3pl() + +DATA * included/modified datasets: --- +EXAMP * included/modified examples: --- + ------------------------------------------------------------- VERSIONS TAM 4.0 | 2022-05-13 | Last: TAM 4.0-16 ------------------------------------------------------------- diff --git a/man/IRT.residuals.Rd b/man/IRT.residuals.Rd index cd9f286..dc01711 100644 --- a/man/IRT.residuals.Rd +++ b/man/IRT.residuals.Rd @@ -1,5 +1,5 @@ %% File Name: IRT.residuals.Rd -%% File Version: 0.182 +%% File Version: 0.183 \name{IRT.residuals} \alias{IRT.residuals} @@ -83,8 +83,8 @@ factor analysis (see Example 1). %% ~Make other sections like Warning with \section{Warning }{....} ~ \seealso{ -See also the \code{eRm::residuals} (\pkg{eRm}) or -\code{\link[mirt:residuals-method]{residuals}} (\pkg{mirt}) +See also the \code{eRm::residuals} (\bold{eRm}) or +\code{\link[mirt:residuals-method]{residuals}} (\bold{mirt}) functions. See also \code{\link[TAM:predict.tam.mml]{predict.tam.mml}}. diff --git a/man/lavaanify.IRT.Rd b/man/lavaanify.IRT.Rd index 8d9cc54..bfdbfa9 100644 --- a/man/lavaanify.IRT.Rd +++ b/man/lavaanify.IRT.Rd @@ -1,5 +1,5 @@ %% File Name: lavaanify.IRT.Rd -%% File Version: 1.411 +%% File Version: 1.412 \name{lavaanify.IRT} \alias{lavaanify.IRT} @@ -90,7 +90,7 @@ converting objects of class \code{tam} into \code{mirt} objects. See \code{sirt::lavaan2mirt} -for estimating models in the \pkg{mirt} package using \code{lavaan} syntax. +for estimating models in the \bold{mirt} package using \code{lavaan} syntax. See \code{\link{doparse}} for the \code{DO} and \code{DO2} statements. } diff --git a/man/msq.itemfit.Rd b/man/msq.itemfit.Rd index 9707423..8fa2847 100644 --- a/man/msq.itemfit.Rd +++ b/man/msq.itemfit.Rd @@ -1,5 +1,5 @@ %% File Name: msq.itemfit.Rd -%% File Version: 0.402 +%% File Version: 0.404 \name{msq.itemfit} @@ -80,7 +80,7 @@ and infit} \seealso{ See also \code{\link{tam.fit}} for simulation based assessment of item fit. -See also \code{eRm::itemfit} or \code{\link[mirt:itemfit]{mirt::itemfit}}. +See also \code{eRm::itemfit} or \code{mirt::itemfit}. } diff --git a/man/tam.mml.Rd b/man/tam.mml.Rd index 0fe0517..837ff0b 100644 --- a/man/tam.mml.Rd +++ b/man/tam.mml.Rd @@ -1,5 +1,5 @@ %% File Name: tam.mml.Rd -%% File Version: 2.991 +%% File Version: 2.992 \name{tam.mml} @@ -591,7 +591,7 @@ For model comparisons see \code{\link{anova.tam}}. See \code{sirt::tam2mirt} for converting \code{tam} objects into objects of class -\code{\link[mirt:mirt]{mirt::mirt}} in the \pkg{mirt} package. +\code{mirt::mirt} in the \bold{mirt} package. } %% \code{\link{logLik.tam}}, \code{\link{anova.tam}} diff --git a/man/tam.np.Rd b/man/tam.np.Rd index b328718..22a2099 100644 --- a/man/tam.np.Rd +++ b/man/tam.np.Rd @@ -1,5 +1,5 @@ %% File Name: tam.np.Rd -%% File Version: 0.323 +%% File Version: 0.324 \name{tam.np} @@ -123,8 +123,8 @@ learning problems. \emph{Statistics and Computing, 25}(6), 1129-1141. \seealso{ Nonparametric item response models can also be estimated with the -\code{mirt::itemGAM} function in the \pkg{mirt} package and the -\code{KernSmoothIRT::ksIRT} in the \pkg{KernSmoothIRT} package. +\code{mirt::itemGAM} function in the \bold{mirt} package and the +\code{KernSmoothIRT::ksIRT} in the \bold{KernSmoothIRT} package. See \code{\link{tam.mml}} and \code{\link{tam.mml.2pl}} for parametric item response models. diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp index e4bf88d..1b150fe 100644 --- a/src/RcppExports.cpp +++ b/src/RcppExports.cpp @@ -1,5 +1,5 @@ //// File Name: RcppExports.cpp -//// File Version: 4.001001 +//// File Version: 4.002001 // Generated by using Rcpp::compileAttributes() -> do not edit by hand // Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393 diff --git a/src/init.c b/src/init.c index a1d33ad..c28659a 100644 --- a/src/init.c +++ b/src/init.c @@ -1,5 +1,5 @@ //// File Name: init.c -//// File Version: 4.001001 +//// File Version: 4.002001 #include #include #include // for NULL diff --git a/src/tam_rcpp_pv_mcmc.cpp b/src/tam_rcpp_pv_mcmc.cpp index 78bcf76..7de20ad 100644 --- a/src/tam_rcpp_pv_mcmc.cpp +++ b/src/tam_rcpp_pv_mcmc.cpp @@ -1,5 +1,5 @@ //// File Name: tam_rcpp_pv_mcmc.cpp -//// File Version: 0.35 +//// File Version: 0.37 @@ -23,7 +23,7 @@ Rcpp::NumericVector tam_rcpp_pv_mcmc_likelihood( for (int nn=0; nn