Merge pull request #1467 from dbetebenner/master

Update of RLI meta-data

Author: dbetebenner

CITATION.cff

@@ -11,7 +11,7 @@ authors:
 - family-names: "Shang"
   given-names: "Yi"
 title: "SGP: Student Growth Percentiles & Percentile Growth Trajectories"
-version: 2.2-1.3
+version: 2.2-1.95
 doi: 10.5281/zenodo.13921157
-date-released: 2025-1-28
+date-released: 2025-3-14
 url: "https://sgp.io"

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: SGP
 Type: Package
 Title: Student Growth Percentiles & Percentile Growth Trajectories
-Version: 2.2-1.3
-Date: 2025-1-28
+Version: 2.2-1.95
+Date: 2025-3-14
 Authors@R: c(person(given=c("Damian", "W."), family="Betebenner", email="[email protected]", role=c("aut", "cre"), comment=c(ORCID = "0000-0003-0476-5599")),
 		person(given=c("Adam", "R."), family="Van Iwaarden", email="[email protected]", role="aut"),
 		person(given="Ben", family="Domingue", email="[email protected]", role="aut"),

R/rliSGP.R

@@ -2,8 +2,9 @@
 function(sgp_object,
 	additional.data=NULL,
 	state=NULL,
-	content_areas=c("MATHEMATICS", "MATHEMATICS_SPANISH", "READING", "READING_SPANISH", "READING_UNIFIED", "EARLY_LITERACY", "EARLY_LITERACY_SPANISH"),
+	content_areas=c('MATHEMATICS', 'MATHEMATICS_SPANISH', 'READING', "READING_SPANISH", "READING_UNIFIED", "EARLY_LITERACY", "EARLY_LITERACY_SPANISH"),
 	testing.window=NULL, ### FALL, WINTER, SPRING
+	testing.window.type=NULL, ### FALL: FF, WSF/SF; WINTER: SFW/FW; SPRING: FWS/WS, SS, FS
 	eow.or.update="UPDATE", ### UPDATE or EOW
 	update.save.shell.only=FALSE,
 	configuration.year=NULL,
@@ -41,9 +42,6 @@ function(sgp_object,
 
 	if (!score.type %in% c("RASCH", "STAR")) stop("\tNOTE: 'score.type argument must be set to either RASCH or STAR.'")
 
-	if (score.type=="STAR") content_areas <- setdiff(content_areas, c("EARLY_LITERACY_SPANISH", "MATHEMATICS_SPANISH", "READING_SPANISH", "READING_UNIFIED"))
-
-
 	### Utility functions
 
 	convertToBaseline <- function(baseline_matrices) {
@@ -85,10 +83,11 @@ function(sgp_object,
 		}
 	}
 
-	getRLIConfig <- function(content_areas, configuration.year, testing.window, score.type) {
+	getRLIConfig <- function(content_areas, configuration.year, testing.window, testing.window.type, score.type) {
 		tmp.list <- list()
 		for (i in content_areas) {
 			tmp.list[[i]] <- SGPstateData$RLI$SGP_Configuration$sgp.config.function$value(configuration.year, i, testing.window, score.type)
+			if (!is.null(testing.window.type)) tmp.list[[i]] <- tmp.list[[i]][grep(testing.window.type, names(tmp.list[[i]]))]
 		}
 		if (score.type=="RASCH") setattr(tmp.list, "names", paste(names(tmp.list), "RASCH", sep="_"))
 		return(unlist(tmp.list, recursive=FALSE))
@@ -222,7 +221,7 @@ function(sgp_object,
 			fix.duplicates=fix.duplicates,
 			get.cohort.data.info=get.cohort.data.info,
 			parallel.config=parallel.config,
-			sgp.config=getRLIConfig(content_areas, configuration.year, testing.window, score.type))
+			sgp.config=getRLIConfig(content_areas, configuration.year, testing.window, testing.window.type, score.type))
 
 		if (!is.null(update.ids)) {
 			assign(update.shell.name, sgp_object)
@@ -278,7 +277,7 @@ function(sgp_object,
 				sgp.percentiles.calculate.sgps=eow.calculate.sgps,
 				get.cohort.data.info=get.cohort.data.info,
 				parallel.config=parallel.config,
-				sgp.config=getRLIConfig(content_areas, configuration.year, testing.window, score.type))
+				sgp.config=getRLIConfig(content_areas, configuration.year, testing.window, testing.window.type, score.type))
 
 			### Create and save new UPDATE_SHELL
 
@@ -299,7 +298,8 @@ function(sgp_object,
 			new.matrices <-convertToBaseline(sgp_object@SGP$Coefficient_Matrices[grep(configuration.year, names(sgp_object@SGP$Coefficient_Matrices))])
 			old.matrix.label <- paste0(paste(state, "SGPt_Baseline_Matrices", sep="_"), "$", tail(sort(names(get(paste(state, "SGPt_Baseline_Matrices", sep="_")))), 1L))
 			old.matrices <- eval(parse(text=old.matrix.label))
-			if (score.type=="RASCH") tmp.content_areas <- paste0(c("EARLY_LITERACY", "EARLY_LITERACY_SPANISH", "MATHEMATICS", "MATHEMATICS_SPANISH", "READING", "READING_SPANISH", "READING_UNIFIED"), "_RASCH.BASELINE") else tmp.content_areas <- paste0(c("EARLY_LITERACY", "MATHEMATICS", "READING"), ".BASELINE")
+			tmp.content_areas <- c("EARLY_LITERACY", "EARLY_LITERACY_SPANISH", "MATHEMATICS", "MATHEMATICS_SPANISH", "READING", "READING_SPANISH", "READING_UNIFIED")		
+			if (score.type=="RASCH") tmp.content_areas <- paste0(tmp.content_areas, "_RASCH.BASELINE") else tmp.content_areas <- paste0(tmp.content_areas, ".BASELINE")
 			year.to.replace <- head(sort(unique(sapply(lapply(sapply(names(old.matrices[["READING_RASCH.BASELINE"]]), strsplit, '[.]'), '[', 2:3), paste, collapse="."))), 1L)
 			for (content_area.iter in tmp.content_areas) {
 				old.matrices[[content_area.iter]][grep(year.to.replace, names(old.matrices[[content_area.iter]]))] <- NULL

R/zzz.R

@@ -35,7 +35,7 @@ function(libname, pkgname) {
 
         # Define a friendly startup message
 		message_text <- paste0(
-		    magenta(bold("\uD83C\uDF89 SGP v", installed.version, sep="")), " - ", toOrdinal::toOrdinalDate("2025-1-28"), "\n",
+		    magenta(bold("\uD83C\uDF89 SGP v", installed.version, sep="")), " - ", toOrdinal::toOrdinalDate("2025-3-14"), "\n",
 			strrep("\u2501", 40), "\n",
     	    bold("\U1F4E6 CRAN: "), cran.version, "\n",
     	    bold("\U1F527 Dev: "), dev.version, "\n",

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.2--1.3-brightgreen.svg)](https://github.com/CenterForAssessment/SGP)
+[![Development Version](https://img.shields.io/badge/devel-2.2--1.95-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)

data/SGPstateData.rda

@@ -9,12 +9,12 @@ bibentry(
                     person(given = c("Yi"), family = "Shang")
                    ),
     year         = "2025",
-    note         = "R package version 2.2-1.3",
+    note         = "R package version 2.2-1.95",
     url          = "https://sgp.io",
     textVersion  = paste(
                     "Damian W. Betebenner, Adam R. Van Iwaarden, Benjamin Domingue and Yi Shang (2025).",
                     "SGP: Student Growth Percentiles & Percentile Growth Trajectories.",
-                    "(R package version 2.2-1.3)",
+                    "(R package version 2.2-1.95)",
                     "URL: https://sgp.io"
                   )
 )

inst/CITATION

@@ -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.2-1.3\cr
-Date: \tab 2025-1-28\cr
+Version: \tab 2.2-1.95\cr
+Date: \tab 2025-3-14\cr
 License: \tab GPL-3\cr
 LazyLoad: \tab yes\cr
 }

man/SGP-package.Rd

@@ -14,6 +14,7 @@ rliSGP(
 			"READING_SPANISH", "READING_UNIFIED", "EARLY_LITERACY", 
 			"EARLY_LITERACY_SPANISH"),
   testing.window,
+  testing.window.type=NULL,
   eow.or.update="UPDATE",
 	update.save.shell.only=FALSE,
   configuration.year,
@@ -50,6 +51,8 @@ rliSGP(
   }
   \item{testing.window}{Argument indicating testing window being analyzed. Either 'FALL', 'WINTER', 'SPRING' indicating what testing window's data is being analyzed.
   }
+  \item{testing.window.type}{Argument indicating testing window type being analyzed. Either 'FF', 'SF', 'FW', 'WS', 'SS', 'FS' indicating what testing window's data is being analyzed. Default is NULL indicating all testing windows types are being analyzed in that testing window.
+  }
   \item{eow.or.update}{Argument indicating whether end-of-window or within-window updates are being done. Either 'EOW' (end of window) or 'UPDATE' (within window).
   }
   \item{update.save.shell.only}{Boolean argument indicating whether End of Window processing should only produce/save RLI_SGP_UPDATE_SHELL and bypass coefficient matrix production.