diff --git a/DESCRIPTION b/DESCRIPTION index 9cdf6947..efd617cd 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: SGP Type: Package Title: Student Growth Percentiles & Percentile Growth Trajectories -Version: 2.1-0.12 -Date: 2024-6-15 +Version: 2.1-0.13 +Date: 2024-6-19 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 85ac0e61..6639e873 100644 --- a/R/combineSGP.R +++ b/R/combineSGP.R @@ -127,9 +127,14 @@ function( } else return.sgp.target.num.years <- FALSE ### Check whether to calculate current year lagged targets - if (1 %in% max.sgp.target.years.forward || identical(SGP::SGPstateData[[state]][["SGP_Configuration"]][['current.year.lagged.target']], TRUE)) current.year.lagged.target <- TRUE else current.year.lagged.target <- FALSE - - + if (1 %in% max.sgp.target.years.forward || identical(SGP::SGPstateData[[state]][["SGP_Configuration"]][['current.year.lagged.target']], TRUE)) { + current.year.lagged.target <- TRUE + } else current.year.lagged.target <- FALSE + + ## Odd things happened (e.g. in WIDA_CO) when max.sgp.targe.years.forward = 1 (length 1 only) + if (identical(SGP::SGPstateData[[state]][["SGP_Configuration"]][['current.year.lagged.target']], FALSE)) { + current.year.lagged.target <- FALSE + } ### Utility functions diff --git a/R/zzz.R b/R/zzz.R index 130cb8fd..1907518c 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=""),' (6-15-2024). For help: >help("SGP") or visit sgp.io')) + packageStartupMessage(magenta$bold('SGP',paste(paste0(unlist(strsplit(as.character(packageVersion("SGP")), "[.]")), c(".", "-", ".", "")), collapse=""),' (6-19-2024). For help: >help("SGP") or visit sgp.io')) } } diff --git a/README.md b/README.md index 890a7cb2..1b7da17d 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.9-brightgreen.svg)](https://github.com/CenterForAssessment/SGP) +[![Development Version](https://img.shields.io/badge/devel-2.1--0.13-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/data/SGPstateData.rda b/data/SGPstateData.rda index bb975782..ce7c2e2b 100644 Binary files a/data/SGPstateData.rda and b/data/SGPstateData.rda differ diff --git a/inst/CITATION b/inst/CITATION index aa689a93..7cbe65ca 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.12", + note = "R package version 2.1-0.13", 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.12)", + "(R package version 2.1-0.13)", "URL: https://sgp.io" ) ) diff --git a/man/SGP-package.Rd b/man/SGP-package.Rd index b6c1b8ce..98c25771 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.12\cr -Date: \tab 2024-6-15\cr +Version: \tab 2.1-0.13\cr +Date: \tab 2024-6-19\cr License: \tab GPL-3\cr LazyLoad: \tab yes\cr }