Skip to content

Commit

Permalink
4.0-19
Browse files Browse the repository at this point in the history
  • Loading branch information
alexanderrobitzsch committed Sep 16, 2023
1 parent deaa696 commit 53c9ab9
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 15 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: sirt
Type: Package
Title: Supplementary Item Response Theory Models
Version: 4.0-17
Date: 2023-08-29 11:07:58.723017
Version: 4.0-19
Date: 2023-09-16 12:28:54.454634
Author: Alexander Robitzsch [aut,cre] (<https://orcid.org/0000-0002-8226-3132>)
Maintainer: Alexander Robitzsch <[email protected]>
Description:
Expand Down
2 changes: 1 addition & 1 deletion R/RcppExports.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## File Name: RcppExports.R
## File Version: 4.000017
## File Version: 4.000019
# Generated by using Rcpp::compileAttributes() -> do not edit by hand
# Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393

Expand Down
6 changes: 3 additions & 3 deletions R/mcmclist2coda.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## File Name: mcmclist2coda.R
## File Version: 0.10
## File Version: 0.11


# write elements from mcmcmlist into code file
Expand All @@ -11,10 +11,10 @@ mcmclist2coda <- function( mcmclist, name, coda.digits=5 )
BB <- nrow(m1)
VV <- length(vars)
c1 <- paste( vars, seq( 1, BB*VV, BB ), seq( BB, BB*VV, BB ) )
writeLines( c1, paste0( name, "_codaIndex.txt" ) )
writeLines( c1, paste0( name, '_codaIndex.txt' ) )
#--- create coda file
m2 <- matrix( m1, ncol=1 )
m2 <- paste( rep(1:BB, VV ), round( m2[,1], coda.digits ) )
writeLines( m2, paste0( name, "_coda1.txt" ) )
writeLines( m2, paste0( name, '_coda1.txt' ) )
}

6 changes: 4 additions & 2 deletions R/mgsem.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## File Name: mgsem.R
## File Version: 0.547
## File Version: 0.553

mgsem <- function(suffstat, model, data=NULL, group=NULL, weights=NULL,
estimator="ML", p_me=2, p_pen=1, pen_type="scad",
Expand Down Expand Up @@ -168,6 +168,7 @@ mgsem <- function(suffstat, model, data=NULL, group=NULL, weights=NULL,
vcov <- res$vcov
se <- res$se
comp_se_me <- res$comp_se_me
me_delta_method <- res

#-- residual statistics
residuals <- mgsem_output_proc_residuals(implied=implied, suffstat=suffstat)
Expand Down Expand Up @@ -202,7 +203,8 @@ mgsem <- function(suffstat, model, data=NULL, group=NULL, weights=NULL,
pen_type=pen_type, eps_approx=eps_approx,
technical=technical, comp_se=comp_se, groups=groups, group=group,
data=data, data_proc=data_proc, case_ll=case_ll,
suffstat_vcov=suffstat_vcov, CALL=CALL, s1=s1, s2=s2)
suffstat_vcov=suffstat_vcov, me_delta_method=me_delta_method,
CALL=CALL, s1=s1, s2=s2)
class(res) <- 'mgsem'
return(res)
}
8 changes: 6 additions & 2 deletions R/mgsem_vcov_me.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## File Name: mgsem_vcov_me.R
## File Version: 0.162
## File Version: 0.169

mgsem_vcov_me <- function(coef, opt_fun_args, suffstat_vcov, comp_se,
se_delta_formula=FALSE)
Expand All @@ -9,6 +9,8 @@ mgsem_vcov_me <- function(coef, opt_fun_args, suffstat_vcov, comp_se,
if ( (estimator=='ML') & comp_se & se_delta_formula ){
comp_se_me <- TRUE
}
A <- NULL
V <- NULL
if (comp_se_me){
NP <- length(coef)
parnames <- names(coef)
Expand All @@ -29,6 +31,8 @@ mgsem_vcov_me <- function(coef, opt_fun_args, suffstat_vcov, comp_se,
suffstat_pars <- suffstat_vcov$suffstat_pars
SP <- nrow(suffstat_pars)
V <- suffstat_vcov$suffstat_vcov
rownames(V) <- suffstat_pars$label
colnames(V) <- suffstat_pars$label
grad_der_suffstat <- matrix(0, nrow=NP, ncol=SP)
rownames(grad_der_suffstat) <- parnames
colnames(grad_der_suffstat) <- suffstat_pars$label
Expand Down Expand Up @@ -76,6 +80,6 @@ mgsem_vcov_me <- function(coef, opt_fun_args, suffstat_vcov, comp_se,
}

#--- output
res <- list(vcov=vcov, se=se, comp_se_me=comp_se_me)
res <- list(vcov=vcov, se=se, A=A, V=V, comp_se_me=comp_se_me)
return(res)
}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ The CRAN version can be installed from within R using:
utils::install.packages("sirt")
```

#### GitHub version `sirt` 4.0-17 (2023-08-29)
#### GitHub version `sirt` 4.0-19 (2023-09-16)

[![](https://img.shields.io/badge/github%20version-4.0--17-orange.svg)](https://github.com/alexanderrobitzsch/sirt)&#160;&#160;
[![](https://img.shields.io/badge/github%20version-4.0--19-orange.svg)](https://github.com/alexanderrobitzsch/sirt)&#160;&#160;

The version hosted [here](https://github.com/alexanderrobitzsch/sirt) is the development version of `sirt`.
The GitHub version can be installed using `devtools` as:
Expand Down
2 changes: 1 addition & 1 deletion inst/NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ CHANGELOG sirt


------------------------------------------------------------------------
VERSIONS sirt 4.0 | 2023-08-29 | Last: sirt 4.0-17
VERSIONS sirt 4.0 | 2023-09-16 | Last: sirt 4.0-19
------------------------------------------------------------------------

FIXED * fixed incorrect handling of lower and upper bounds of item
Expand Down
4 changes: 3 additions & 1 deletion man/mgsem.Rd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%% File Name: mgsem.Rd
%% File Version: 0.082
%% File Version: 0.083

\name{mgsem}
\alias{mgsem}
Expand Down Expand Up @@ -124,6 +124,8 @@ A list with following values
\item{ic}{Information criteria}
\item{technical}{Specifications of optimizer}
\item{suffstat_vcov}{Variance matrix of sufficient statistics}
\item{me_delta_method}{Input and output matrices for delta method if
\code{estimator="ME"}}
\item{data_proc}{Processed data}
\item{case_ll}{Casewise log-likelihood function}
\item{\dots}{Further values}
Expand Down
2 changes: 1 addition & 1 deletion src/RcppExports.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//// File Name: RcppExports.cpp
//// File Version: 4.000017
//// File Version: 4.000019
// Generated by using Rcpp::compileAttributes() -> do not edit by hand
// Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393

Expand Down

0 comments on commit 53c9ab9

Please sign in to comment.