3.7-3

alexanderrobitzsch · Apr 30, 2021 · 62cbee2 · 62cbee2
1 parent 45253ef
commit 62cbee2
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 25 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: TAM
 Type: Package
 Title: Test Analysis Modules
-Version: 3.7-1
-Date: 2021-04-22 22:17:23
+Version: 3.7-3
+Date: 2021-04-30 12:08:26
 Author:
     Alexander Robitzsch [aut,cre] (<https://orcid.org/0000-0002-8226-3132>),
     Thomas Kiefer [aut], 

diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -1,5 +1,5 @@
 ## File Name: RcppExports.R
-## File Version: 3.007001
+## File Version: 3.007003
 # Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 

diff --git a/R/tam.mml.2pl.R b/R/tam.mml.2pl.R
@@ -1,5 +1,5 @@
 ## File Name: tam.mml.2pl.R
-## File Version: 9.585
+## File Version: 9.586
 
 tam.mml.2pl <- function( resp, Y=NULL, group=NULL,  irtmodel="2PL",
                  formulaY=NULL, dataY=NULL,
@@ -445,7 +445,7 @@ tam.mml.2pl <- function( resp, Y=NULL, group=NULL,  irtmodel="2PL",
   #******
 
     #*** include NAs in AXsi
-    AXsi <- tam_mml_include_NA_AXsi(AXsi=AXsi, maxcat=maxcat)
+    AXsi <- tam_mml_include_NA_AXsi(AXsi=AXsi, maxcat=maxcat, A=A, xsi=xsi)
 
     #******
     # generate input for fixed parameters

diff --git 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.877
+## File Version: 9.878
 
 tam.mml.3pl <- function( resp, Y=NULL, group=NULL,
             formulaY=NULL, dataY=NULL,
@@ -718,6 +718,9 @@ tam.mml.3pl <- function( resp, Y=NULL, group=NULL,
     se.xsi.min -> se.xsi
     se.B.min -> se.B
 
+    #*** include NAs in AXsi
+    AXsi <- tam_mml_include_NA_AXsi(AXsi=AXsi, maxcat=maxcat, A=A, xsi=xsi)
+
     #**** standard errors AXsi
     se.AXsi <- tam_mml_se_AXsi( AXsi=AXsi, A=A, se.xsi=se.xsi, maxK=maxK )
 

diff --git a/R/tam.mml.R b/R/tam.mml.R
@@ -1,5 +1,5 @@
 ## File Name: tam.mml.R
-## File Version: 9.802
+## File Version: 9.803
 
 tam.mml <- function( resp, Y=NULL, group=NULL,  irtmodel="1PL",
             formulaY=NULL, dataY=NULL,
@@ -400,7 +400,7 @@ tam.mml <- function( resp, Y=NULL, group=NULL,  irtmodel="1PL",
 
 
     #*** include NAs in AXsi
-    AXsi <- tam_mml_include_NA_AXsi(AXsi=AXsi, maxcat=maxcat)
+    AXsi <- tam_mml_include_NA_AXsi(AXsi=AXsi, maxcat=maxcat, A=A, xsi=xsi)
 
     #--- generate input for fixed parameters
     xsi.fixed.estimated <- tam_generate_xsi_fixed_estimated( xsi=xsi, A=A )

diff --git a/R/tam.mml.mfr.R b/R/tam.mml.mfr.R
@@ -1,5 +1,5 @@
 ## File Name: tam.mml.mfr.R
-## File Version: 9.942
+## File Version: 9.943
 
 tam.mml.mfr <- function( resp, Y=NULL, group=NULL,  irtmodel="1PL",
             formulaY=NULL, dataY=NULL, ndim=1, pid=NULL, xsi.fixed=NULL,
@@ -448,7 +448,7 @@ tam.mml.mfr <- function( resp, Y=NULL, group=NULL,  irtmodel="1PL",
     resp.ind <- gresp.noStep.ind
 
     #*** include NAs in AXsi
-    AXsi <- tam_mml_include_NA_AXsi(AXsi=AXsi, maxcat=maxcat)
+    AXsi <- tam_mml_include_NA_AXsi(AXsi=AXsi, maxcat=maxcat, A=A, xsi=xsi)
 
     #****
     # look for non-estimable xsi parameters

diff --git a/R/tam_mml_include_NA_AXsi.R b/R/tam_mml_include_NA_AXsi.R
@@ -1,9 +1,12 @@
 ## File Name: tam_mml_include_NA_AXsi.R
-## File Version: 0.02
+## File Version: 0.04
 
 
-tam_mml_include_NA_AXsi <- function(AXsi, maxcat=NULL)
+tam_mml_include_NA_AXsi <- function(AXsi, maxcat=NULL, A=NULL, xsi=NULL)
 {
+    if (!is.null(xsi)){
+        AXsi <- tam_AXsi_compute(A=A, xsi=xsi)
+    }
     if (is.null(maxcat)){
         maxcat <- rep( ncol(AXsi), nrow(AXsi) )
     }

diff --git a/README.md b/README.md
@@ -22,9 +22,9 @@ The CRAN version can be installed from within R using:
 utils::install.packages("TAM")
 ```
 
-#### GitHub version `TAM` 3.7-1 (2021-04-22)
+#### GitHub version `TAM` 3.7-3 (2021-04-30)
 
-[![](https://img.shields.io/badge/github%20version-3.7--1-orange.svg)](https://github.com/alexanderrobitzsch/TAM)&#160;&#160;
+[![](https://img.shields.io/badge/github%20version-3.7--3-orange.svg)](https://github.com/alexanderrobitzsch/TAM)&#160;&#160;
 
 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
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git 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: 2021-04-22T20:31Z
+last_built: 2021-04-30T10:24Z
 
diff --git a/inst/NEWS b/inst/NEWS
@@ -42,10 +42,12 @@ http://www.edmeasurementsurveys.com/TAM/Tutorials/
 
 
 -------------------------------------------------------------
-VERSIONS TAM 3.7  |  2021-04-22  |  Last: TAM 3.7-1
+VERSIONS TAM 3.7  |  2021-04-30  |  Last: TAM 3.7-3
 -------------------------------------------------------------
 
-xxx   * ...
+NOTE  * changed computation of AXsi and xsi.item in outputs to
+        prevent numerical differences with xsi
+        (thanks to Rudolf Debelak)
 
 
 DATA  * included/modified datasets: ---

diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -1,5 +1,5 @@
 //// File Name: RcppExports.cpp
-//// File Version: 3.007001
+//// File Version: 3.007003
 // 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
@@ -1,5 +1,5 @@
 //// File Name: init.c
-//// File Version: 3.007001
+//// File Version: 3.007003
 #include <R.h>
 #include <Rinternals.h>
 #include <stdlib.h> // for NULL