diff --git a/DESCRIPTION b/DESCRIPTION index 3918f678..bfa6fc30 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: sirt Type: Package Title: Supplementary Item Response Theory Models -Version: 3.0-14 -Date: 2018-09-28 14:55:05 +Version: 3.0-21 +Date: 2018-10-18 16:04:25 Author: Alexander Robitzsch [aut,cre] () Maintainer: Alexander Robitzsch Description: diff --git a/R/RcppExports.R b/R/RcppExports.R index cc1fa6db..1b13217f 100644 --- a/R/RcppExports.R +++ b/R/RcppExports.R @@ -1,5 +1,5 @@ ## File Name: RcppExports.R -## File Version: 3.000014 +## File Version: 3.000021 # Generated by using Rcpp::compileAttributes() -> do not edit by hand # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393 diff --git a/R/rasch.jml.R b/R/rasch.jml.R index 986dee88..d20b757d 100644 --- a/R/rasch.jml.R +++ b/R/rasch.jml.R @@ -1,5 +1,5 @@ ## File Name: rasch.jml.R -## File Version: 3.294 +## File Version: 3.295 rasch.jml <- function( dat, method="MLE", b.init=NULL, constraints=NULL, weights=NULL, @@ -34,6 +34,7 @@ rasch.jml <- function( dat, method="MLE", b.init=NULL, constraints=NULL, weights if (! is.null(constraints) ){ prox <- FALSE centerpersons <- FALSE + center <- "none" } # data preparations diff --git a/README.md b/README.md index aed115b3..511c70fb 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ If you use `sirt` and have suggestions for improvement or have found bugs, pleas #### CRAN version `sirt` 2.7-50 (2018-07-09) -[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/sirt)](https://cran.r-project.org/package=sirt) +[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version-last-release/sirt)](https://cran.r-project.org/package=sirt)    @@ -18,9 +18,9 @@ The CRAN version can be installed from within R using: utils::install.packages("sirt") ``` -#### GitHub version `sirt` 3.0-14 (2018-09-28) +#### GitHub version `sirt` 3.0-21 (2018-10-18) -[![](https://img.shields.io/badge/github%20version-3.0--14-orange.svg)](https://github.com/alexanderrobitzsch/sirt)   +[![](https://img.shields.io/badge/github%20version-3.0--21-orange.svg)](https://github.com/alexanderrobitzsch/sirt)   The version hosted [here](https://github.com/alexanderrobitzsch/sirt) is the development version of `sirt`. The GitHub version can be installed using `devtools` as: diff --git a/inst/NEWS b/inst/NEWS index ae22e91e..539f0775 100644 --- a/inst/NEWS +++ b/inst/NEWS @@ -35,7 +35,7 @@ CHANGELOG sirt ------------------------------------------------------------------------ -VERSIONS sirt 3.0 | 2018-09-28 | Last: sirt 3.0-14 +VERSIONS sirt 3.0 | 2018-10-18 | Last: sirt 3.0-21 ------------------------------------------------------------------------ NOTE * included estimation details of btm() function @@ -46,8 +46,10 @@ NOTE * included argument 'center' in rasch.jml() which now also allows FIXED * exclude non-converged model estimates for permutation datasets in lsem.permutationTest() (reported by Moritz Breit) NOTE * added argument 'save.gamma.testlet' in mcmc.3pno.testlet() - (requested by Vladimir Volokhonsky, issue #4) - + (requested by Vladimir Volokhonsky, issue #4) +NOTE * corrected internet address for DIMTEST software in ?conf.detect + (thanks to Julius Fenn) + DATA * included/modified datasets: --- EXAMP * included/modified examples: rasch.jml (1) diff --git a/man/conf.detect.Rd b/man/conf.detect.Rd index 5d7e6599..121d8568 100644 --- a/man/conf.detect.Rd +++ b/man/conf.detect.Rd @@ -1,5 +1,5 @@ %% File Name: conf.detect.Rd -%% File Version: 1.42 +%% File Version: 1.43 \name{conf.detect} \alias{conf.detect} @@ -139,7 +139,7 @@ Alexander Robitzsch \seealso{ For a download of the free \emph{DIM-Pack} software (DIMTEST, DETECT) see -\url{http://psychometrictools.measuredprogress.org/home}. +\emph{https://psychometrics.onlinehelp.measuredprogress.org/tools/dim/}. See \code{\link{expl.detect}} for exploratory DETECT analysis. } diff --git a/man/rasch.pairwise.Rd b/man/rasch.pairwise.Rd index f2601f0c..97e2f6c1 100644 --- a/man/rasch.pairwise.Rd +++ b/man/rasch.pairwise.Rd @@ -1,5 +1,5 @@ %% File Name: rasch.pairwise.Rd -%% File Version: 0.25 +%% File Version: 0.27 \name{rasch.pairwise} \alias{rasch.pairwise} @@ -88,32 +88,33 @@ estimation) can be conducted with \code{\link{rasch.pml3}}. ############################################################################# data(data.read) +dat <- data.read #*** Model 1: no constraint on item difficulties -mod1 <- sirt::rasch.pairwise( data.read ) +mod1 <- sirt::rasch.pairwise(dat) summary(mod1) #*** Model 2: sum constraint on item difficulties -mod2 <- sirt::rasch.pairwise( data.read, zerosum=TRUE) +mod2 <- sirt::rasch.pairwise(dat, zerosum=TRUE) summary(mod2) \dontrun{ +#** obtain standard errors by bootstrap mod2$item$b # extract item difficulties -# Bootstrap for item difficulties +# Bootstrap of item difficulties boot_pw <- function(data, indices ){ - dd <- data[ indices, ] # bootstrap of indices - mod <- sirt::rasch.pairwise( dd, zerosum=TRUE, progress=FALSE) - mod$item$b - } + dd <- data[ indices, ] # bootstrap of indices + mod <- sirt::rasch.pairwise( dat=dd, zerosum=TRUE, progress=FALSE) + return(mod$item$b) +} set.seed(986) library(boot) -dat <- data.read -bmod2 <- boot::boot( dat, boot_pw, R=999 ) -bmod2 +bmod2 <- boot::boot(data=dat, statistic=boot_pw, R=999 ) +print(bmod2) summary(bmod2) # quantiles for bootstrap sample (and confidence interval) -apply( bmod2$t, 2, quantile, c(.025,.5, .975) ) +apply(bmod2$t, 2, stats::quantile, probs=c(.025, .5, .975) ) } } % Add one or more standard keywords, see file 'KEYWORDS' in the diff --git a/src/Makevars b/src/Makevars index e74c919a..2ac8c74c 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,3 +1,3 @@ ## Use the R_HOME indirection to support installations of multiple R version PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"` $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) - +PKG_CPPFLAGS = -I../inst/include -DBOOST_NO_LONG_LONG -DBOOST_NO_AUTO_PTR -DRCPP_USE_UNWIND_PROTECT diff --git a/src/Makevars.win b/src/Makevars.win index 779bb79d..4b48f462 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -2,4 +2,4 @@ ## This assume that we can call Rscript to ask Rcpp about its locations ## Use the R_HOME indirection to support installations of multiple R version PKG_LIBS = $(shell $(R_HOME)/bin/Rscript.exe -e "Rcpp:::LdFlags()") $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) - +PKG_CPPFLAGS = -I../inst/include -DBOOST_NO_LONG_LONG -DBOOST_NO_AUTO_PTR -DRCPP_USE_UNWIND_PROTECT \ No newline at end of file diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp index 983fb1ca..7d269188 100644 --- a/src/RcppExports.cpp +++ b/src/RcppExports.cpp @@ -1,5 +1,5 @@ //// File Name: RcppExports.cpp -//// File Version: 3.000014 +//// File Version: 3.000021 // Generated by using Rcpp::compileAttributes() -> do not edit by hand // Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393