Merge pull request CenterForAssessment#1470 from dbetebenner/master

Minor updates to package. See individual commits

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.98
+version: 2.2-1.993
 doi: 10.5281/zenodo.13921157
-date-released: 2025-4-14
+date-released: 2025-5-5
 url: "https://sgp.io"

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: SGP
 Type: Package
 Title: Student Growth Percentiles & Percentile Growth Trajectories
-Version: 2.2-1.98
-Date: 2025-4-14
+Version: 2.2-1.993
+Date: 2025-5-5
 Authors@R: c(person(given=c("Damian", "W."), family="Betebenner", email="dbetebenner@nciea.org", role=c("aut", "cre"), comment=c(ORCID = "0000-0003-0476-5599")),
 		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"),
@@ -76,7 +76,7 @@ Authors@R: c(person(given=c("Damian", "W."), family="Betebenner", email="dbetebe
 Maintainer: Damian W. Betebenner <dbetebenner@nciea.org>
 Depends: R (>= 4.1.0)
 Suggests: SGPdata (>= 28.0-0), knitr, rmarkdown
-Imports: Cairo, callr, collapse, colorspace, crayon, datasets, data.table (>= 1.14.0), digest, doParallel, equate (>= 2.0-5), foreach, graphics, grid, grDevices, gridBase, iterators, gtools, jsonlite, matrixStats, methods, parallel, pkgsearch, quantreg, randomNames (>= 0.0-5), rngtools (>= 1.5), RSQLite, sn (>= 1.0-0), splines, stats, svglite, toOrdinal, utils
+Imports: Cairo, callr, collapse, colorspace, crayon, curl, datasets, data.table (>= 1.14.0), digest, doParallel, equate (>= 2.0-5), foreach, graphics, grid, grDevices, gridBase, iterators, gtools, jsonlite, matrixStats, methods, parallel, pkgsearch, quantreg, randomNames (>= 0.0-5), rngtools (>= 1.5), RSQLite, sn (>= 1.0-0), splines, stats, svglite, toOrdinal, utils
 Description: An analytic framework for the calculation of norm- and criterion-referenced academic growth estimates using large scale, longitudinal education assessment data as developed in Betebenner (2009) <doi:10.1111/j.1745-3992.2009.00161.x>.
 SystemRequirements: (PDF)LaTeX (https://www.latex-project.org/) with 'pdfpages' package for studentGrowthPlot option in visualizeSGP to bind together student growth plots into school catalogs
 URL: https://sgp.io, https://github.com/CenterForAssessment/SGP, https://CRAN.R-project.org/package=SGP

NAMESPACE

@@ -8,7 +8,6 @@ export(capwords)
 export(combineSGP)
 export(courseProgressionSGP)
 export(createKnotsBoundaries)
-export(createSuperCohortData)
 export(getStateAbbreviation)
 export(gofPrint)
 export(gofSGP)
@@ -38,6 +37,7 @@ importFrom(callr,r_bg)
 importFrom(collapse, add_stub, add_vars, collapv, ffirst, fmean, fmedian, fnrow, fsd, ftransform, ftransformv, fvar, get_vars, join, na_omit, pivot, .quantile, replace_outliers, roworderv, rm_stub)
 importFrom(colorspace,rainbow_hcl,diverge_hcl)
 importFrom(crayon,bold,cyan,green,magenta,red,yellow)
+importFrom(curl,curl_fetch_memory,new_handle)
 importFrom(digest,digest)
 importFrom(doParallel,registerDoParallel)
 importFrom(equate,freqtab,equate)

R/baselineSGP.R

@@ -19,7 +19,7 @@ function(sgp_object,
 
 
 	started.at <- proc.time()
-	messageSGP(paste("\tStarted baselineSGP", prettyDate(), "\n"))
+	messageSGP(paste0("\tStarted baselineSGP ", prettyDate(), ".\n"))
 
 	VALID_CASE <- YEAR <- GRADE <- CONTENT_AREA <- YEAR_WITHIN <- COHORT_YEAR <- panel.data.vnames <- NULL ### To prevent R CMD check warnings
 
@@ -170,7 +170,7 @@ function(sgp_object,
 				SGPt=SGPt,
 				...)[["Coefficient_Matrices"]])
 
-		messageSGP(paste("\tStarted baselineSGP Coefficient Matrix Calculation:", started.date))
+		messageSGP(paste0("\tStarted baselineSGP Coefficient Matrix Calculation: ", started.date, "."))
 		messageSGP(paste0("\tContent Area: ", tail(content_areas, 1L), ", Grade Progression: ", paste(grade.sequences, collapse=", "), ". "))
 		messageSGP(paste0("\tFinished baselineSGP Coefficient Matrix Calculation ", prettyDate(), " in ", convertTime(timetakenSGP(started.at)), ".\n"))
 
@@ -338,7 +338,7 @@ function(sgp_object,
 	###
 	############################################################
 
-	messageSGP(paste("\tFinished baselineSGP", prettyDate(), "in", convertTime(timetakenSGP(started.at)), "\n"))
+	messageSGP(paste0("\tFinished baselineSGP ", prettyDate(), " in ", convertTime(timetakenSGP(started.at)), ".\n"))
 
 	if (return.matrices.only) {
 		tmp.list <- list()

R/getAchievementLevel.R

@@ -46,7 +46,7 @@ function(sgp_data,
 		} else {
 			return("Achievement_Levels")
 		}
-	}
+	} ### END get.achievement_level.label Function
 
 	getAchievementLevel_INTERNAL <- function(state, content_area, year, grade, scale_score) {
 		if (!is.null(SGP::SGPstateData[[state]][["Achievement"]][["Cutscores"]][[get.cutscore.label(state, year, content_area)]][[paste0("GRADE_", grade)]])) {
@@ -64,7 +64,7 @@ function(sgp_data,
 		} else {
 			rep(as.character(NA), length(scale_score))
 		}
-	}
+	} ### END getAchievementLevel_INTERNAL Function
 
 	if ("STATE" %in% names(sgp_data) & !is.null(SGP::SGPstateData[[state]][["Achievement"]][["Cutscore_Information"]])) {
 		cutscore.states <- SGP::SGPstateData[[state]][["Achievement"]][["Cutscore_Information"]][["Cutscore_States"]]

R/rliCutscoreCreation.R

@@ -56,7 +56,6 @@ function(rli.cs.long,
 
 
 	###  cutscore.list creation.
-
 	for (state in unique(rli.cs$STATE)) {
 
 		for (ca in content_areas) {

R/zzz.R

@@ -7,35 +7,41 @@ function(libname, pkgname) {
 
 `.onAttach` <- function(libname, pkgname) {
     if (interactive()) {
-		# Utility function 
-        get_dev_version <- function(package) {
+		# Utility function with timeout
+        get_dev_version <- function(package, timeout = 2) {
             url <- paste0("https://raw.githubusercontent.com/CenterForAssessment/", package, "/refs/heads/master/DESCRIPTION")
             tryCatch({
-                lines <- readLines(url, warn = FALSE)
-                version_line <- grep("^Version:", lines, value = TRUE)
-                if (length(version_line) > 0) {
-                    return(cyan("v", strsplit(version_line, ": ")[[1]][2], sep=""))
-                } else {
-                    return(red("Not Available"))
+                # Use curl with timeout
+                response <- curl::curl_fetch_memory(url, handle = curl::new_handle(timeout = timeout))
+                if (response$status_code == 200) {
+                    lines <- strsplit(rawToChar(response$content), "\n")[[1]]
+                    version_line <- grep("^Version:", lines, value = TRUE)
+                    if (length(version_line) > 0) {
+                        return(cyan("v", strsplit(version_line, ": ")[[1]][2], sep=""))
+                    }
                 }
+                return(red("Not Available"))
             }, error = function(e) {
                 return(red("Not Available"))
             }, warning = function(w) {
                 return(red("Not Available"))
             })
         }
 
-        # Extract version information
+        # Extract version information with timeout
         installed.version <- utils::packageDescription("SGP")[['Version']]
-        cran.version <- tryCatch(
-            green("v", pkgsearch::cran_package("SGP")[['Version']], sep=""),
-            error = function(e) red("Not Available"),
-            warning = function(w) red("Not Available"))
+        cran.version <- tryCatch({
+            # Add timeout to CRAN check
+            curl::curl_fetch_memory("https://cran.r-project.org/web/packages/SGP/index.html", 
+                                  handle = curl::new_handle(timeout = 2))
+            green("v", pkgsearch::cran_package("SGP")[['Version']], sep="")
+        }, error = function(e) red("Not Available"),
+           warning = function(w) red("Not Available"))
         dev.version <- get_dev_version("SGP")
 
         # Define a friendly startup message
 		message_text <- paste0(
-		    magenta(bold("\uD83C\uDF89 SGP v", installed.version, sep="")), " - ", toOrdinal::toOrdinalDate("2025-4-14"), "\n",
+		    magenta(bold("\uD83C\uDF89 SGP v", installed.version, sep="")), " - ", toOrdinal::toOrdinalDate("2025-5-5"), "\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.98-brightgreen.svg)](https://github.com/CenterForAssessment/SGP)
+[![Development Version](https://img.shields.io/badge/devel-2.2--1.993-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.98",
+    note         = "R package version 2.2-1.993",
     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.98)",
+                    "(R package version 2.2-1.993)",
                     "URL: https://sgp.io"
                   )
 )