3.6-2

alexanderrobitzsch · Feb 18, 2024 · f524f48 · f524f48
1 parent 227f279
commit f524f48
Show file tree

Hide file tree

Showing 26 changed files with 94 additions and 80 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.5-3
-Date: 2022-04-05 11:45:31
+Version: 3.6-2
+Date: 2024-02-18 19:47:04
 Author: BIFIE [aut], Alexander Robitzsch [aut, cre], 
  Konrad Oberwimmer [aut]
 Maintainer: Alexander Robitzsch <[email protected]>
@@ -29,12 +29,12 @@ Depends:
 Imports:
  methods, miceadds, Rcpp, stats, utils
 Suggests:
- graphics, grDevices, lavaan, lavaan.survey, mitools, survey, TAM
+ graphics, grDevices, lavaan, mitools, survey, TAM
 Enhances:
  Hmisc, intsvy, LSAmitR
 LinkingTo: 
  Rcpp, RcppArmadillo 
 License: GPL (>= 2)
 URL:
  https://github.com/alexanderrobitzsch/BIFIEsurvey,
- https://sites.google.com/site/alexanderrobitzsch2/software
+ https://sites.google.com/view/alexander-robitzsch/software
diff --git a/R/BIFIE.by.R b/R/BIFIE.by.R
@@ -1,5 +1,5 @@
 ## File Name: BIFIE.by.R
-## File Version: 1.56
+## File Version: 1.571
 
 
 #######################################################################
@@ -131,5 +131,5 @@ summary.BIFIE.by <- function( object, digits=4, ... )
  BIFIE.summary(object)
  cat("Statistical Inference for User Defined Function \n")
  obji <- object$stat
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
 }
diff --git a/R/BIFIE.correl.R b/R/BIFIE.correl.R
@@ -1,5 +1,5 @@
 ## File Name: BIFIE.correl.R
-## File Version: 0.46
+## File Version: 0.471
 
 
 #######################################################################
@@ -222,17 +222,17 @@ BIFIE.correl <- function( BIFIEobj, vars, group=NULL, group_values=NULL, se=TRUE
 
 ####################################################################################
 # summary for BIFIE.correl function
-summary.BIFIE.correl <- function( object, digits=4, ... ){
+summary.BIFIE.correl <- function( object, digits=4, ... )
+{
  BIFIE.summary(object)
  cat("Statistical Inference for Correlations \n")
  obji <- object$stat.cor
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
  cat("\nCorrelation Matrices \n\n")
  obji <- object$cor_matrix
  GG <- object$GG
  for (gg in 1:GG){
  obji[[gg]] <- round( obji[[gg]], digits=digits)
  }
  print(obji)
-# print.object.summary( obji, digits=digits )
- }
+}
diff --git a/R/BIFIE.crosstab.R b/R/BIFIE.crosstab.R
@@ -1,5 +1,5 @@
 ## File Name: BIFIE.crosstab.R
-## File Version: 0.43
+## File Version: 0.441
 
 
 #######################################################################
@@ -284,11 +284,11 @@ summary.BIFIE.crosstab <- function( object, digits=3, ... )
  BIFIE.summary(object)
  cat("Joint and Conditional Probabilities\n")
  obji <- object$stat.probs
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
  cat("\nMarginal Probabilities\n")
  obji <- object$stat.marg
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
  cat("\nEffect Sizes\n")
  obji <- object$stat.es
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
 }
diff --git a/R/BIFIE.derivedParameters.R b/R/BIFIE.derivedParameters.R
@@ -1,5 +1,5 @@
 ## File Name: BIFIE.derivedParameters.R
-## File Version: 0.385
+## File Version: 0.386
 
 
 #--- statistical inference for derived parameters
@@ -112,7 +112,7 @@ summary.BIFIE.derivedParameters <- function( object, digits=4, ... )
  }
  cat("\nStatistical Inference for Derived Parameters \n\n")
  obji <- object$stat
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
 
  #- Wald test
  cat("\n")

diff --git a/R/BIFIE.ecdf.R b/R/BIFIE.ecdf.R
@@ -1,5 +1,5 @@
 ## File Name: BIFIE.ecdf.R
-## File Version: 0.34
+## File Version: 0.36
 
 
 #######################################################################
@@ -106,5 +106,5 @@ summary.BIFIE.ecdf <- function( object, digits=4, ... )
  BIFIE.summary(object)
  cat("Empirical Distribution Function \n")
  obji <- object$ecdf
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
 }
diff --git a/R/BIFIE.freq.R b/R/BIFIE.freq.R
@@ -1,5 +1,5 @@
 ## File Name: BIFIE.freq.R
-## File Version: 0.52
+## File Version: 0.531
 
 
 #######################################################################
@@ -158,9 +158,10 @@ BIFIE.freq <- function( BIFIEobj, vars, group=NULL, group_values=NULL, se=TRUE )
 ####################################################################################
 # summary for BIFIE.freq function
 
-summary.BIFIE.freq <- function( object, digits=3, ... ){
+summary.BIFIE.freq <- function( object, digits=3, ... )
+{
  BIFIE.summary(object)
  cat("Relative Frequencies \n")
  obji <- object$stat
- print.object.summary( obji, digits=digits )
- }
+ print_object_summary( obji, digits=digits )
+}
diff --git a/R/BIFIE.linreg.R b/R/BIFIE.linreg.R
@@ -1,5 +1,5 @@
 ## File Name: BIFIE.linreg.R
-## File Version: 0.584
+## File Version: 0.586
 
 
 #--- Linear regression
@@ -142,5 +142,5 @@ summary.BIFIE.linreg <- function( object, digits=4, ... )
  BIFIE.summary(object)
  cat("Statistical Inference for Linear Regression \n\n")
  obji <- object$stat
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
 }
diff --git a/R/BIFIE.logistreg.R b/R/BIFIE.logistreg.R
@@ -1,5 +1,5 @@
 ## File Name: BIFIE.logistreg.R
-## File Version: 0.434
+## File Version: 0.435
 
 
 #-- logistic regression
@@ -137,5 +137,5 @@ summary.BIFIE.logistreg <- function( object, digits=4, ... )
  BIFIE.summary(object)
  cat("Statistical Inference for Logistic Regression \n")
  obji <- object$stat
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
 }
diff --git a/R/BIFIE.mva.R b/R/BIFIE.mva.R
@@ -1,5 +1,5 @@
 ## File Name: BIFIE.mva.R
-## File Version: 0.32
+## File Version: 0.331
 
 
 #######################################################################
@@ -154,5 +154,5 @@ summary.BIFIE.mva <- function( object, digits=4, ... )
  BIFIE.summary(object)
  cat("Missing Value Analysis \n")
  obji <- object$stat.mva
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
 }
diff --git a/R/BIFIE.pathmodel.R b/R/BIFIE.pathmodel.R
@@ -1,5 +1,5 @@
 ## File Name: BIFIE.pathmodel.R
-## File Version: 1.319
+## File Version: 1.321
 
 
 #--- path model
@@ -281,5 +281,5 @@ summary.BIFIE.pathmodel <- function( object, digits=4, ... )
  # estimated parameters
  cat("Statistical Inference for Path Model \n\n")
  obji <- object$stat
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
 }
diff --git a/R/BIFIE.twolevelreg.R b/R/BIFIE.twolevelreg.R
@@ -1,5 +1,5 @@
 ## File Name: BIFIE.twolevelreg.R
-## File Version: 0.581
+## File Version: 0.583
 
 #--- BIFIE.twolevelreg
 BIFIE.twolevelreg <- function( BIFIEobj, dep, formula.fixed, formula.random,
@@ -264,5 +264,5 @@ summary.BIFIE.twolevelreg <- function( object, digits=4, ... )
  cat("Statistical Inference for Two-Level Linear Regression \n\n")
  obji <- object$stat
  rownames(obji) <- NULL
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
 }
diff --git a/R/BIFIE.univar.R b/R/BIFIE.univar.R
@@ -1,5 +1,5 @@
 ## File Name: BIFIE.univar.R
-## File Version: 1.842
+## File Version: 1.844
 
 
 #--- univariate statistics
@@ -228,8 +228,8 @@ summary.BIFIE.univar <- function( object, digits=3, ... )
  BIFIE.summary(object)
  cat("Univariate Statistics | Means\n")
  obji <- object$stat_M
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
  cat("\nUnivariate Statistics | Standard Deviations\n")
  obji <- object$stat_SD
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
 }
diff --git a/R/BIFIE.univar.test.R b/R/BIFIE.univar.test.R
@@ -1,5 +1,5 @@
 ## File Name: BIFIE.univar.test.R
-## File Version: 0.46
+## File Version: 0.471
 
 
 #######################################################################
@@ -178,12 +178,12 @@ summary.BIFIE.univar.test <- function( object, digits=4, ... )
  if ( object$wald_test ){
  cat("F Test (ANOVA) \n")
  obji <- object$stat.F
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
  }
  cat("\nEta Squared \n")
  obji <- object$stat.eta
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
  cat("\nCohen's d Statistic \n")
  obji <- object$stat.dstat
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
 }
diff --git a/R/BIFIE_lavaan_survey_lavaan_survey.R b/R/BIFIE_lavaan_survey_lavaan_survey.R
@@ -1,10 +1,10 @@
 ## File Name: BIFIE_lavaan_survey_lavaan_survey.R
-## File Version: 0.05
+## File Version: 0.078
 
 BIFIE_lavaan_survey_lavaan_survey <- function(lavaan.fit, survey.design, ...)
 {
- requireNamespace("lavaan.survey")
- res <- lavaan.survey::lavaan.survey(lavaan.fit=lavaan.fit,
-  survey.design=survey.design, ...)
+ args <- c(as.list(environment()), list(...))
+ do.call(what=requireNamespace, args=list(package="lavaan.survey"))
+ res <- do.call(what="lavaan.survey", args=args)
  return(res)
 }
diff --git a/R/BIFIE_waldtest_summary_print_test_statistics.R b/R/BIFIE_waldtest_summary_print_test_statistics.R
@@ -1,11 +1,11 @@
 ## File Name: BIFIE_waldtest_summary_print_test_statistics.R
-## File Version: 0.04
+## File Version: 0.051
 
 BIFIE_waldtest_summary_print_test_statistics <- function(object, digits,
  value_name="stat.D")
 {
  if ( ! object$NMI ){ cat("D1 and D2 Statistic for Wald Test \n\n") }
- if (  object$NMI ){ cat("D1 Statistic for Wald Test \n\n") }
+ if ( object$NMI ){ cat("D1 Statistic for Wald Test \n\n") }
  obji <- object[[ value_name ]]
- print.object.summary( obji, digits=digits )
+ print_object_summary( obji, digits=digits )
 }
diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -1,5 +1,5 @@
 ## File Name: RcppExports.R
-## File Version: 3.005003
+## File Version: 3.006002
 # Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 

diff --git a/R/print.object.summary.R → R/print_object_summary.R b/R/print.object.summary.R → R/print_object_summary.R
@@ -1,7 +1,7 @@
-## File Name: print.object.summary.R
-## File Version: 0.13
+## File Name: print_object_summary.R
+## File Version: 0.161
 
-print.object.summary <- function( obji, digits )
+print_object_summary <- function( obji, digits)
 {
  V <- ncol(obji)
  for (vv in 1L:V){

diff --git a/R/vcov.BIFIE.survey.R → R/vcov_BIFIE.survey.R b/R/vcov.BIFIE.survey.R → R/vcov_BIFIE.survey.R
@@ -1,9 +1,9 @@
-## File Name: vcov.BIFIE.survey.R
-## File Version: 0.294
+## File Name: vcov_BIFIE.survey.R
+## File Version: 0.297
 
 
-#--- vcov.BIFIEsurvey
-vcov.BIFIEsurvey <- function( object, type=NULL, eps=1E-10, avoid.singul=FALSE )
+#--- vcov_BIFIEsurvey
+vcov_BIFIEsurvey <- function( object, type=NULL, eps=1E-10, avoid.singul=FALSE )
 {
  # extract replicated parameters
  parsres <- extract.replicated.pars( BIFIE.method=object, type=type )
@@ -46,57 +46,57 @@ vcov.BIFIEsurvey <- function( object, type=NULL, eps=1E-10, avoid.singul=FALSE )
 
 vcov.BIFIE.correl <- function( object, type=NULL, ... )
 {
- pars <- vcov.BIFIEsurvey( object=object, type=type, ... )
+ pars <- vcov_BIFIEsurvey( object=object, type=type, ... )
  return(pars)
 }
 # further BIFIE functions
 vcov.BIFIE.by <- function( object, ... )
 {
- pars <- vcov.BIFIEsurvey( object=object, type=NULL, ...)
+ pars <- vcov_BIFIEsurvey( object=object, type=NULL, ...)
  return(pars)
 }
 vcov.BIFIE.derivedParameters <- function( object, ... )
 {
- pars <- vcov.BIFIEsurvey( object=object, type=NULL, ... )
+ pars <- vcov_BIFIEsurvey( object=object, type=NULL, ... )
  return(pars)
 }
 vcov.BIFIE.crosstab <- function( object, ... )
 {
- pars <- vcov.BIFIEsurvey( object=object, type=NULL, ... )
+ pars <- vcov_BIFIEsurvey( object=object, type=NULL, ... )
  return(pars)
 }
 vcov.BIFIE.freq <- function( object, ... )
 {
- pars <- vcov.BIFIEsurvey( object=object, type=NULL, ...)
+ pars <- vcov_BIFIEsurvey( object=object, type=NULL, ...)
  return(pars)
 }
 vcov.BIFIE.linreg <- function( object, ... )
 {
- pars <- vcov.BIFIEsurvey( object=object, type=NULL, ... )
+ pars <- vcov_BIFIEsurvey( object=object, type=NULL, ... )
  return(pars)
 }
 vcov.BIFIE.logistreg <- function( object, ... )
 {
- pars <- vcov.BIFIEsurvey( object=object, type=NULL, ...)
+ pars <- vcov_BIFIEsurvey( object=object, type=NULL, ...)
  return(pars)
 }
 vcov.BIFIE.univar <- function( object, ... )
 {
- pars <- vcov.BIFIEsurvey( object=object, type=NULL, ...)
+ pars <- vcov_BIFIEsurvey( object=object, type=NULL, ...)
  return(pars)
 }
 vcov.BIFIE.twolevelreg <- function( object, ... )
 {
  if (object$se){
- pars <- vcov.BIFIEsurvey( object=object, type=NULL, ... )
+ pars <- vcov_BIFIEsurvey( object=object, type=NULL, ... )
  } else {
  pars <- vcov( object$micombs )
  }
  return(pars)
 }
 vcov.BIFIE.pathmodel <- function( object, ... )
 {
- pars <- vcov.BIFIEsurvey( object=object, type=NULL, ...)
+ pars <- vcov_BIFIEsurvey( object=object, type=NULL, ...)
  return(pars)
 }