Skip to content

Commit ea8d8a3

Browse files
dbetebennerdbetebenner
authored
Merge pull request #1427 from dbetebenner/master
Final mods for CRAN submission
2 parents 0b05764 + 4757373 commit ea8d8a3

12 files changed

Lines changed: 3018 additions & 315 deletions

File tree

.github/workflows/check-standard.yaml renamed to .github/workflows/R-CMD-check.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
config:
21-
- {os: macOS-latest, r: 'release'}
21+
- {os: macos-latest, r: 'release'}
2222
- {os: windows-latest, r: 'release'}
2323
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
2424
- {os: ubuntu-latest, r: 'release'}
@@ -29,12 +29,17 @@ jobs:
2929
R_KEEP_PKG_SOURCE: yes
3030

3131
steps:
32+
- name: Install Homebrew
33+
if: runner.os == 'macOS'
34+
run: |
35+
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
36+
3237
- name: Install XQUARTZ dependencies on MacOS
3338
if: runner.os == 'macOS'
3439
run: |
3540
brew install --cask xquartz
3641
37-
- uses: actions/checkout@v2
42+
- uses: actions/checkout@v3
3843

3944
- uses: r-lib/actions/setup-pandoc@v2
4045

‎CITATION.cff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ authors:
1313
title: "SGP: Student Growth Percentiles & Percentile Growth Trajectories"
1414
version: 2.1-0.0
1515
doi: 10.5281/zenodo.3634024
16-
date-released: 2023-10-20
16+
date-released: 2023-10-23
1717
url: "https://sgp.io"

‎DESCRIPTION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Package: SGP
22
Type: Package
33
Title: Student Growth Percentiles & Percentile Growth Trajectories
44
Version: 2.1-0.0
5-
Date: 2023-10-20
5+
Date: 2023-10-23
66
Authors@R: c(person(given=c("Damian", "W."), family="Betebenner", email="[email protected]", role=c("aut", "cre")),
77
person(given=c("Adam", "R."), family="Van Iwaarden", email="[email protected]", role="aut"),
88
person(given="Ben", family="Domingue", email="[email protected]", role="aut"),

‎R/checksplineMatrix.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function(list.of.splineMatrix,
2020
as.splineMatrix(matrix_argument=list.of.splineMatrix[[i]][[j]], matrix_argument_name=j, content_area=content_area, year=year, sgp_object=sgp_object)
2121
}
2222
}
23-
list.of.splineMatrix[[i]] <- unique.splineMatrix(list.of.splineMatrix[[i]])
23+
list.of.splineMatrix[[i]] <- uniquesplineMatrix(list.of.splineMatrix[[i]])
2424
} else {
2525
list.of.splineMatrix[[i]] <- SGP::SGPstateData[[state]][['Baseline_splineMatrix']][['Coefficient_Matrices']][[i]]
2626
}
@@ -36,7 +36,7 @@ function(list.of.splineMatrix,
3636
as.splineMatrix(matrix_argument=list.of.splineMatrix[[i]][[grd_ord]][[lambda]][[j]], matrix_argument_name=j, content_area=content_area, year=year, sgp_object=sgp_object)
3737
}
3838
}
39-
list.of.splineMatrix[[i]][[grd_ord]][[lambda]] <- unique.splineMatrix(list.of.splineMatrix[[i]][[grd_ord]][[lambda]])
39+
list.of.splineMatrix[[i]][[grd_ord]][[lambda]] <- uniquesplineMatrix(list.of.splineMatrix[[i]][[grd_ord]][[lambda]])
4040
}
4141
}
4242
}

‎R/mergeSGP.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ function(list_1,
4949
for (k in names(list_2[[j]])) {
5050
if (!grepl("SIMEX", k)) {
5151
if (!identical(list_1[[j]][[k]], list_2[[j]][[k]])) {
52-
list_1[[j]][[k]] <- unique.splineMatrix(c(list_1[[j]][[k]], list_2[[j]][[k]]))
52+
list_1[[j]][[k]] <- uniquesplineMatrix(c(list_1[[j]][[k]], list_2[[j]][[k]]))
5353
}
5454
} else {
5555
for (grd_ord in names(list_2[[j]][[k]])) {
5656
for (lambda in grep("lambda", names(list_2[[j]][[k]][[grd_ord]]), value=TRUE)) {
5757
if (!identical(list_1[[j]][[k]][[grd_ord]][[lambda]], list_2[[j]][[k]][[grd_ord]][[lambda]])) {
58-
list_1[[j]][[k]][[grd_ord]][[lambda]] <- unique.splineMatrix(c(list_1[[j]][[k]][[grd_ord]][[lambda]], list_2[[j]][[k]][[grd_ord]][[lambda]]))
58+
list_1[[j]][[k]][[grd_ord]][[lambda]] <- uniquesplineMatrix(c(list_1[[j]][[k]][[grd_ord]][[lambda]], list_2[[j]][[k]][[grd_ord]][[lambda]]))
5959
}
6060
}
6161
for (rst in grep("ranked_simex_table", names(list_2[[j]][[k]][[grd_ord]]), value=TRUE)) {

R/unique.splineMatrix.R renamed to R/uniquesplineMatrix.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
`unique.splineMatrix` <-
1+
`uniquesplineMatrix` <-
22
function(list.of.splineMatrices) {
33

44
### First identify/remove exact duplicates (not newer/older Versions). Fixes issue of mergeSGP with existing SIMEX Baseline Matrices - 10/8/14
@@ -17,4 +17,4 @@ function(list.of.splineMatrices) {
1717
} else {
1818
list.of.splineMatrices
1919
}
20-
} ### END unique.splineMatrix
20+
} ### END uniquesplineMatrix

‎R/zzz.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ function(libname, pkgname) {
77
`.onAttach` <-
88
function(libname, pkgname) {
99
if (interactive()) {
10-
packageStartupMessage(magenta$bold('SGP',paste(paste0(unlist(strsplit(as.character(packageVersion("SGP")), "[.]")), c(".", "-", ".", "")), collapse=""),' (10-20-2023). For help: >help("SGP") or visit sgp.io'))
10+
packageStartupMessage(magenta$bold('SGP',paste(paste0(unlist(strsplit(as.character(packageVersion("SGP")), "[.]")), c(".", "-", ".", "")), collapse=""),' (10-23-2023). For help: >help("SGP") or visit sgp.io'))
1111
}
1212
}

0 commit comments

Comments
 (0)