diff --git a/DESCRIPTION b/DESCRIPTION index 3d390d5d..94a6013a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: SGP Type: Package Title: Student Growth Percentiles & Percentile Growth Trajectories -Version: 2.1-0.22 -Date: 2024-8-12 +Version: 2.1-0.23 +Date: 2024-8-23 Authors@R: c(person(given=c("Damian", "W."), family="Betebenner", email="dbetebenner@nciea.org", role=c("aut", "cre")), person(given=c("Adam", "R."), family="Van Iwaarden", email="avaniwaarden@nciea.org", role="aut"), person(given="Ben", family="Domingue", email="ben.domingue@gmail.com", role="aut"), diff --git a/R/combineSGP.R b/R/combineSGP.R index 6639e873..00b0e1bf 100644 --- a/R/combineSGP.R +++ b/R/combineSGP.R @@ -272,7 +272,7 @@ function( tmp.list <- list() for (i in tmp.names) { - tmp.list[[i]] <- data.table( + tmp.list[[i]] <- data.table( CONTENT_AREA=unlist(strsplit(i, "[.]"))[1L], YEAR=getTableNameYear(i), sgp_object@SGP[["SGPercentiles"]][[i]]) diff --git a/R/studentGrowthPercentiles.R b/R/studentGrowthPercentiles.R index 9edc4877..ff6475dc 100644 --- a/R/studentGrowthPercentiles.R +++ b/R/studentGrowthPercentiles.R @@ -849,12 +849,12 @@ function(panel.data, ## REQUIRED if (!missing(growth.levels)) { tmp.growth.levels <- list() if (!is.list(growth.levels) && !is.character(growth.levels)) { - tmp.messages <- c(tmp.messages, "\t\tNOTE: growth.levels must be supplied as a list or character abbreviation. See help page for details.\n\t\t\t`studentGrowthPercentiles` will be calculated without augmented growth.levels") + tmp.messages <- c(tmp.messages, "\t\tNOTE: `growth.levels` must be supplied as a list or character abbreviation. See help page for details.\n\t\t\t`studentGrowthPercentiles` will be calculated without augmented growth levels.\n") tf.growth.levels <- FALSE } if (is.list(growth.levels)) { if (!identical(names(growth.levels), c("my.cuts", "my.levels"))) { - tmp.messages <- c(tmp.messages, "\t\tNOTE: Please specify an appropriate list for growth.levels. See help page for details.\n\t\t\tStudent growth percentiles will be calculated without augmented growth.levels") + tmp.messages <- c(tmp.messages, "\t\tNOTE: Please specify an appropriate list for `growth.levels`. See help page for details.\n\t\t\tStudent growth percentiles will be calculated without augmented growth levels.\n") tf.growth.levels <- FALSE } else { tmp.growth.levels <- growth.levels @@ -863,7 +863,7 @@ function(panel.data, ## REQUIRED } if (is.character(growth.levels)) { if (is.null(SGP::SGPstateData[[growth.levels]][["Growth"]][["Levels"]])) { - tmp.messages <- c(tmp.messages, "\t\tNOTE: Growth Levels are currently not specified for the indicated state.\n\t\t\tPlease contact the SGP package administrator to have your state's data included in the package.\n\t\t\tStudent growth percentiles will be calculated without augmented growth levels") + tmp.messages <- c(tmp.messages, "\t\tNOTE: Growth Levels are currently not specified for the indicated state.\n\t\t\tPlease contact the SGP package administrator to have your state's data included in the package.\n\t\t\tStudent growth percentiles will be calculated without augmented growth levels.\n") tf.growth.levels <- FALSE } else { tmp.growth.levels[["my.cuts"]] <- SGP::SGPstateData[[growth.levels]][["Growth"]][["Cutscores"]][["Cuts"]] diff --git a/R/visualizeSGP.R b/R/visualizeSGP.R index 5205b571..7db43d0f 100644 --- a/R/visualizeSGP.R +++ b/R/visualizeSGP.R @@ -792,7 +792,7 @@ if (sgPlot.wide.data) { ### When WIDE data is provided setkeyv(slot.data, long.key) if (is.null(sgPlot.students)) { - report.ids <- unique(slot.data[tmp.districts.and.schools][["ID"]]) + report.ids <- unique(slot.data[tmp.districts.and.schools][["ID"]]) %w/o% NA if (sgPlot.reports.by.instructor) report.ids <- intersect(student.teacher.lookup[['ID']], report.ids) setkeyv(slot.data, c("CONTENT_AREA", "GRADE", "YEAR")) tmp.table <- data.table(slot.data[getYearsContentAreasGrades(state, years=tmp.years.subset, content_areas_domains=tmp.content_areas_domains, diff --git a/R/zzz.R b/R/zzz.R index 604c8769..b0caa0ac 100644 --- a/R/zzz.R +++ b/R/zzz.R @@ -7,6 +7,6 @@ function(libname, pkgname) { `.onAttach` <- function(libname, pkgname) { if (interactive()) { - packageStartupMessage(magenta$bold('SGP',paste(paste0(unlist(strsplit(as.character(packageVersion("SGP")), "[.]")), c(".", "-", ".", "")), collapse=""),' (8-12-2024). For help: >help("SGP") or visit sgp.io')) + packageStartupMessage(magenta$bold('SGP',paste(paste0(unlist(strsplit(as.character(packageVersion("SGP")), "[.]")), c(".", "-", ".", "")), collapse=""),' (8-23-2024). For help: >help("SGP") or visit sgp.io')) } } diff --git a/README.md b/README.md index b2ef8932..e262cc31 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ SGP [![R-CMD-check](https://github.com/CenterForAssessment/SGP/workflows/R-CMD-check/badge.svg)](https://github.com/CenterForAssessment/SGP/actions) [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/centerforassessment/SGP?branch=master&svg=true)](https://ci.appveyor.com/project/centerforassessment/SGP) [![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/SGP)](https://cran.r-project.org/package=SGP) -[![Development Version](https://img.shields.io/badge/devel-2.1--0.21-brightgreen.svg)](https://github.com/CenterForAssessment/SGP) +[![Development Version](https://img.shields.io/badge/devel-2.1--0.23-brightgreen.svg)](https://github.com/CenterForAssessment/SGP) [![Rstudio mirror downloads](https://cranlogs.r-pkg.org/badges/grand-total/SGP)](https://github.com/metacran/cranlogs.app) [![License](https://img.shields.io/badge/license-GPL%203-brightgreen.svg?style=flat)](https://github.com/CenterForAssessment/SGP/blob/master/LICENSE.md) [![Join the chat at https://gitter.im/CenterForAssessment/SGP](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/CenterForAssessment/SGP?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) diff --git a/inst/CITATION b/inst/CITATION index bd2d6b7c..dba20de8 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -9,12 +9,12 @@ bibentry( person(given = c("Yi"), family = "Shang") ), year = "2024", - note = "R package version 2.1-0.22", + note = "R package version 2.1-0.23", url = "https://sgp.io", textVersion = paste( "Damian W. Betebenner, Adam R. Van Iwaarden, Benjamin Domingue and Yi Shang (2024).", "SGP: Student Growth Percentiles & Percentile Growth Trajectories.", - "(R package version 2.1-0.22)", + "(R package version 2.1-0.23)", "URL: https://sgp.io" ) ) diff --git a/man/SGP-package.Rd b/man/SGP-package.Rd index 7c59b33d..9a5155ba 100644 --- a/man/SGP-package.Rd +++ b/man/SGP-package.Rd @@ -19,8 +19,8 @@ growth projections to be calculated across assessment transitions by equating th \tabular{ll}{ Package: \tab SGP\cr Type: \tab Package\cr -Version: \tab 2.1-0.22\cr -Date: \tab 2024-8-12\cr +Version: \tab 2.1-0.23\cr +Date: \tab 2024-8-23\cr License: \tab GPL-3\cr LazyLoad: \tab yes\cr }