Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIDA custom ISRs and score target merging issue #1440

Merged
merged 2 commits into from
Jun 20, 2024
Merged

WIDA custom ISRs and score target merging issue #1440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96a4b52
Change Year to 2024 for WIDA custom ISRs
adamvi Jun 20, 2024
85e4ba3
Fix errors thrown for merging WIDA_CO score targets
adamvi Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"),
Expand Down
11 changes: 8 additions & 3 deletions R/combineSGP.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion R/zzz.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
}
}
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Binary file modified data/SGPstateData.rda
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions inst/CITATION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
)
4 changes: 2 additions & 2 deletions man/SGP-package.Rd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Loading