Merge pull request CenterForAssessment#45 from adamvi/master

Restrict GES growth estimates to include only sgp_grades.

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: cfaTools
-Version: 0.0-1.95
-Date: 2021-8-25
+Version: 0.0-1.96
+Date: 2021-8-27
 Title: Center for Assessment Tools for Large Scale Educational Assessment Analysis
 Description: Center for Assessment developed Tools for Large Scale Educational Assessment.
 Authors@R: c(person(given=c("Damian", "W."), family="Betebenner", email="[email protected]", role=c("aut", "cre")),

R/academicImpactSummary.R

@@ -201,19 +201,19 @@
 
  ges_data <- copy(sgp_data)
  ges_data[YEAR < prior_year, SGP_BASELINE := SGP]
- ges_sgp_prior <- ges_data[,
+ ges_sgp_prior <- ges_data[GRADE %in% sgp_grades,
  as.list(gammaEffectSizeLong(.SD, "SGP_BASELINE", SGP:::yearIncrement(prior_year, -2), prior_year, quantiles=c(0.5), digits=2)),
  keyby=c("CONTENT_AREA", aggregation_group)][, YEAR := prior_year]
 
  ## Now replace 2019 BASELINEs with COHORT (only for BASELINES that were present originally)
  ges_data[YEAR == prior_year, SGP_BASELINE := SGP]
- ges_sgp_crnt <- ges_data[,
+ ges_sgp_crnt <- ges_data[GRADE %in% sgp_grades,
  as.list(gammaEffectSizeLong(.SD, "SGP_BASELINE", prior_year, current_year, quantiles=c(0.5), digits=2)),
  keyby=c("CONTENT_AREA", aggregation_group)][, YEAR := current_year]
 
  ges_sgp <- rbindlist(list(ges_sgp_prior, ges_sgp_crnt)); rm(ges_data)
 
- setnames(ges_sgp, "Q_50", "GES_MEDIAN_SGP")
+ setnames(ges_sgp, c("Q_50", "V1"), rep("GES_MEDIAN_SGP", 2), skip_absent=TRUE) # Edge cases where first result is NA causes returned var to be named `V1`
  setkeyv(ges_sgp, c(aggregation_group, "YEAR", "CONTENT_AREA"))
  setkeyv(group_aggregates, c(aggregation_group, "YEAR", "CONTENT_AREA"))
 
@@ -350,7 +350,7 @@
  as.list(gammaEffectSizeLong(.SD, "SCALE_SCORE_STANDARDIZED", prior_year, current_year, quantiles=c(0.5), digits=2)),
  keyby=c("CONTENT_AREA", aggregation_group)][, YEAR := current_year]))
 
- setnames(ges_sss, "Q_50", "GES_MEDIAN_SSS")
+ setnames(ges_sss, c("Q_50", "V1"), rep("GES_MEDIAN_SSS", 2), skip_absent=TRUE)
  setkeyv(ges_sss, c(aggregation_group, "YEAR", "CONTENT_AREA"))
  setkeyv(group_aggregates, c(aggregation_group, "YEAR", "CONTENT_AREA"))
 
@@ -392,7 +392,7 @@
  as.list(gammaEffectSizeLong(.SD, "SCALE_SCORE_PERCENTILE", prior_year, current_year, quantiles=c(0.5), digits=2)),
  keyby=c("CONTENT_AREA", aggregation_group)][, YEAR := current_year]))
 
- setnames(ges_ssp, "Q_50", "GES_MEDIAN_SSP")
+ setnames(ges_ssp, c("Q_50", "V1"), rep("GES_MEDIAN_SSP", 2), skip_absent=TRUE)
  setkeyv(ges_ssp, c(aggregation_group, "YEAR", "CONTENT_AREA"))
  setkeyv(group_aggregates, c(aggregation_group, "YEAR", "CONTENT_AREA"))
 

R/zzz.R

@@ -5,6 +5,6 @@ function(libname, pkgname) {
 `.onAttach` <-
 function(libname, pkgname) {
  if (interactive()) {
- packageStartupMessage(magenta$bold('cfaTools',paste(paste0(unlist(strsplit(as.character(packageVersion("cfaTools")), "[.]")), c(".", "-", ".", "")), collapse=""),' (8-25-2021). For help: >help("cfaTools") or visit https://centerforassessment.github.io/cfaTools'))
+ packageStartupMessage(magenta$bold('cfaTools',paste(paste0(unlist(strsplit(as.character(packageVersion("cfaTools")), "[.]")), c(".", "-", ".", "")), collapse=""),' (8-27-2021). For help: >help("cfaTools") or visit https://centerforassessment.github.io/cfaTools'))
  }
 }

README.md

@@ -4,7 +4,7 @@ cfaTools
 [![R-CMD-check](https://github.com/CenterForAssessment/cfaTools/workflows/R-CMD-check/badge.svg)](https://github.com/CenterForAssessment/cfaTools/actions)
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/centerforassessment/cfaTools?branch=master&svg=true)](https://ci.appveyor.com/project/centerforassessment/cfaTools)
 [![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/cfaTools)](https://cran.r-project.org/package=cfaTools)
-[![Development Version](https://img.shields.io/badge/devel-0.0--1.95-brightgreen.svg)](https://github.com/CenterForAssessment/cfaTools)
+[![Development Version](https://img.shields.io/badge/devel-0.0--1.96-brightgreen.svg)](https://github.com/CenterForAssessment/cfaTools)
 [![License](https://img.shields.io/badge/license-GPL%203-brightgreen.svg?style=flat)](https://github.com/CenterForAssessment/cfaTools/blob/master/LICENSE.md)
 
 

inst/CITATION

@@ -4,11 +4,11 @@ citEntry(entry = "Manual",
  title = "{cfaTools}: Center for Assessment Tools for Large Scale Educational Assessment Analysis",
  author = personList(as.person("Damian W. Betebenner"), as.person("Adam R. Van Iwaarden"), as.person("Nathan Dadey"), as.person("Joseph Martineau")),
  year = "2021",
- note = "R package version 0.0-1.95",
+ note = "R package version 0.0-1.96",
  url = "https://centerforassessment.github.io/cfaTools/",
 
  textVersion = paste("Damian W. Betebenner, Adam R. Van Iwaarden, Nathan Dadey and Joseph Martineau (2021).",
  "cfaTools: Center for Assessment Tools for Large Scale Educational Assessment Analysis",
- "(R package version 0.0-1.95",
+ "(R package version 0.0-1.96",
  "URL https://centerforassessment.github.io/cfaTools/")
 )

man/cfaTools-package.Rd

@@ -12,8 +12,8 @@ Center for Assessment developed Tools for Large Scale Educational Assessment.
 \tabular{ll}{
 Package: \tab cfaTools\cr
 Type: \tab Package\cr
-Version: \tab 0.0-1.95\cr
-Date: \tab 2021-8-25\cr
+Version: \tab 0.0-1.96\cr
+Date: \tab 2021-8-27\cr
 License: \tab GPL-3\cr
 LazyLoad: \tab yes\cr
 }