Merge pull request #1437 from dbetebenner/master

Fixing edge case issue with getTargetData

CITATION.cff

@@ -11,7 +11,7 @@ authors:
 - family-names: "Yi"
   given-names: "Shang"
 title: "SGP: Student Growth Percentiles & Percentile Growth Trajectories"
-version: 2.1-0.8
+version: 2.1-0.10
 doi: 10.5281/zenodo.3634024
-date-released: 2024-5-22
+date-released: 2024-6-6
 url: "https://sgp.io"

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: SGP
 Type: Package
 Title: Student Growth Percentiles & Percentile Growth Trajectories
-Version: 2.1-0.9
-Date: 2024-5-23
+Version: 2.1-0.10
+Date: 2024-6-6
 Authors@R: c(person(given=c("Damian", "W."), family="Betebenner", email="[email protected]", role=c("aut", "cre")),
 		person(given=c("Adam", "R."), family="Van Iwaarden", email="[email protected]", role="aut"),
 		person(given="Ben", family="Domingue", email="[email protected]", role="aut"),

R/combineSGP.R

@@ -217,7 +217,7 @@ function(
 		if ("YEAR_WITHIN" %in% names(tmp.target.data)) {
 			tmp.var.names <- c("ID", "CONTENT_AREA", "YEAR", "YEAR_WITHIN", intersect(names(tmp.target.data), c("GRADE", "SGP_PROJECTION_GROUP_SCALE_SCORES")))
 		} else tmp.var.names <- c("ID", "CONTENT_AREA", "YEAR", intersect(names(tmp.target.data), c("GRADE", "SGP_PROJECTION_GROUP_SCALE_SCORES")))
-		tmp.data <- tmp.target.data[SGP_PROJECTION_GROUP==projection_group.iter, c(tmp.var.names, tmp.target.level.names), with=FALSE]
+		tmp.data <- tmp.target.data[SGP_PROJECTION_GROUP==projection_group.iter, intersect(c(tmp.var.names, tmp.target.level.names), names(tmp.target.data)), with=FALSE]
 		na.omit(tmp.data, cols=grep("MOVE_UP_STAY_UP", tmp.target.level.names, invert=TRUE, value=TRUE))
 	}
 

R/gofSGP.R

@@ -204,9 +204,9 @@ function(
 		tmp.list <- list()
 
         if (!is.null(state)) {
-            if (!is.null(SGPstateData[[state]][["Student_Report_Information"]][["Content_Areas_Labels"]][[content_area]])) {
+            if (!is.null(SGP::SGPstateData[[state]][["Student_Report_Information"]][["Content_Areas_Labels"]][[content_area]])) {
                 content_area_title <-
-                    SGPstateData[[state]][["Student_Report_Information"]][["Content_Areas_Labels"]][[content_area]]
+                    SGP::SGPstateData[[state]][["Student_Report_Information"]][["Content_Areas_Labels"]][[content_area]]
             } else content_area_title <- content_area
         } else content_area_title <- content_area
 

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=""),' (5-24-2024). For help: >help("SGP") or visit sgp.io'))
+		packageStartupMessage(magenta$bold('SGP',paste(paste0(unlist(strsplit(as.character(packageVersion("SGP")), "[.]")), c(".", "-", ".", "")), collapse=""),' (6-6-2024). For help: >help("SGP") or visit sgp.io'))
 	}
 }

inst/CITATION

@@ -9,12 +9,12 @@ bibentry(
                     person(given = c("Yi"), family = "Shang")
                    ),
     year         = "2024",
-    note         = "R package version 2.1-0.9",
+    note         = "R package version 2.1-0.10",
     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.9)",
+                    "(R package version 2.1-0.10)",
                     "URL: https://sgp.io"
                   )
 )

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.9\cr
-Date: \tab 2024-5-24\cr
+Version: \tab 2.1-0.10\cr
+Date: \tab 2024-6-6\cr
 License: \tab GPL-3\cr
 LazyLoad: \tab yes\cr
 }