3.4-6

alexanderrobitzsch · May 12, 2019 · 1bedae8 · 1bedae8
1 parent 5975073
commit 1bedae8
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 22 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: BIFIEsurvey
 Type: Package
 Title: Tools for Survey Statistics in Educational Assessment
-Version: 3.3-4
-Date: 2019-05-10 11:21:32
+Version: 3.3-6
+Date: 2019-05-12 11:41:41
 Author: BIFIE [aut], Alexander Robitzsch [aut, cre], 
         Konrad Oberwimmer [aut]
 Maintainer: Alexander Robitzsch <robitzsch@ipn.uni-kiel.de>

diff --git a/R/BIFIE_create_pseudogroup.R b/R/BIFIE_create_pseudogroup.R
@@ -1,8 +1,8 @@
 ## File Name: BIFIE_create_pseudogroup.R
-## File Version: 1.13
+## File Version: 1.16
 
-################################################
-# multiple grouping helper functions
+
+#**** multiple grouping helper functions
 BIFIE_create_pseudogroup <- function( datalistM,
     group, group_index, group_values )
 {
@@ -11,7 +11,6 @@ BIFIE_create_pseudogroup <- function( datalistM,
                 "group"=group, "group_index"=group_index, "GR"=GR,
                 "group_values"=group_values)
 
-    #****************
     #*** multiple groupings
     if (GR>1){
         group_values <- as.list( 1:GR )
@@ -25,7 +24,8 @@ BIFIE_create_pseudogroup <- function( datalistM,
         for (gg in 1:GR){
             datalistM2[,gg] <- match( datalistM2[,gg], group_values[[gg]] )
         }
-        maxval_exp <- 3
+        # maxval_exp <- 3
+        maxval_exp <- max(ceiling(log10(unlist(lapply(group_values, length)))+1)) + 1                
         maxval <- 10^maxval_exp
         res0$maxval <- maxval
         pseudogroup <- datalistM2[,1]
@@ -60,6 +60,6 @@ BIFIE_create_pseudogroup <- function( datalistM,
     #--- output
     return(res0)
 }
-###################################################
+
 
 
diff --git a/R/BIFIE_table_multiple_groupings.R b/R/BIFIE_table_multiple_groupings.R
@@ -1,7 +1,7 @@
 ## File Name: BIFIE_table_multiple_groupings.R
-## File Version: 0.13
+## File Version: 0.14
 
-#####################################################################
+#- reidentify multiple grouping
 BIFIE_table_multiple_groupings <- function( dfr, res00 )
 {
     GR <- res00$GR
@@ -19,4 +19,3 @@ BIFIE_table_multiple_groupings <- function( dfr, res00 )
     }
     return(dfr)
 }
-#######################################################################
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("BIFIEsurvey")
 ```
 
-#### GitHub version `BIFIEsurvey` 3.3-4 (2019-05-10)
+#### GitHub version `BIFIEsurvey` 3.3-6 (2019-05-12)
 
-[![](https://img.shields.io/badge/github%20version-3.3--4-orange.svg)](https://github.com/alexanderrobitzsch/BIFIEsurvey)&#160;&#160;
+[![](https://img.shields.io/badge/github%20version-3.3--6-orange.svg)](https://github.com/alexanderrobitzsch/BIFIEsurvey)&#160;&#160;
 
 The version hosted [here](https://github.com/alexanderrobitzsch/BIFIEsurvey) is the development version of `BIFIEsurvey`. 
 The GitHub version can be installed using `devtools` as:

diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/reference/BIFIE.lavaan.survey.html b/docs/reference/BIFIE.lavaan.survey.html
diff --git a/inst/NEWS b/inst/NEWS
@@ -50,10 +50,12 @@ CHANGELOG BIFIEsurvey
 
 
 --------------------------------------------------------------------------
-VERSIONS BIFIEsurvey 3.3  |  2019-05-10  |  Last: BIFIEsurvey 3.3-4
+VERSIONS BIFIEsurvey 3.3  |  2019-05-12  |  Last: BIFIEsurvey 3.3-6
 --------------------------------------------------------------------------
 
-xxx   * ---
+NOTE  * changed behavior of BIFIE_create_pseudogroup() for many group 
+        values (thanks to Thomas Kiefer)
+
 
 DATA  * ---
 EXAMP * ---

diff --git a/man/BIFIE.lavaan.survey.Rd b/man/BIFIE.lavaan.survey.Rd
@@ -1,5 +1,5 @@
 %% File Name: BIFIE.lavaan.survey.Rd
-%% File Version: 0.210
+%% File Version: 0.211
 
 \name{BIFIE.lavaan.survey}
 \alias{BIFIE.lavaan.survey}
@@ -56,7 +56,7 @@ object from \pkg{survey} package (generated by \code{\link{BIFIEdata2svrepdesign
 \item{lavaan_fun}{Estimation funcion in \pkg{lavaan}. Can be \code{"lavaan"},
 \code{"sem"}, \code{"cfa"} or \code{"growth"}.
 }
-\item{lavaan_survey_default}{Logical indicating whether the the \pkg{lavaan.survey}
+\item{lavaan_survey_default}{Logical indicating whether the \pkg{lavaan.survey}
 package should be used for statistical inference for multiply imputed datasets.
 }
 \item{object}{Object of class \code{BIFIE.by}}

diff --git a/src/BIFIEsurvey.dll b/src/BIFIEsurvey.dll