@@ -1954,15 +1954,15 @@ function(
19541954 SGPstateData [[" RLI" ]][[" SGP_Configuration" ]][[" fix.duplicates" ]] <- " KEEP.ALL"
19551955 RLI_SGPt_UPDATE_SHELL <- suppressMessages(prepareSGP(SGPdata :: sgptData_LONG [! YEAR %in% tmp.last.window ][,SCALE_SCORE_RASCH : = NULL ], state = " RLI" ))
19561956 SGPstateData [[" RLI" ]][[" Baseline_splineMatrix" ]][[" Coefficient_Matrices" ]] <-
1957- eval(parse(text = paste(" RLI_SGPt_Baseline_Matrices[['RLI_SGPt_Baseline_Matrices_2016_2017 .3']]" )))
1957+ eval(parse(text = paste(" RLI_SGPt_Baseline_Matrices[['RLI_SGPt_Baseline_Matrices_2023_2024 .3']]" )))
19581958 SGPstateData [[" RLI" ]][[" SGP_Configuration" ]][[" goodness.of.fit.minimum.n" ]] <- 50
19591959 SGPstateData [[" RLI" ]][[" Assessment_Program_Information" ]][[" CSEM" ]] <- " SEM"
19601960 RLI_Cutscores <- SGPstateData [[' RLI' ]][[' SGP_Configuration' ]][[' testSGP.cutscores' ]][[' STAR' ]]
19611961
19621962 # ## Calculate SGPs
19631963
19641964 expression.to.evaluate <-
1965- paste0(" RLI1_SGPt_PART_1 <- rliSGP(\n\t sgp_object=RLI_SGPt_UPDATE_SHELL,\n\t additional.data=RLI_Data_LONG_UPDATE,\n\t testing.window='SPRING',\n\t eow.or.update='UPDATE',\n\t configuration.year='2016_2017 ',\n\t return.updated.shell=TRUE,\n\t goodness.of.fit.print=TRUE,\n\t score.type='STAR',\n\t simulate.sgps=TRUE,\n\t cutscore.file.name=RLI_Cutscores,\n\t parallel.config=" , parallel.config , " \n )\n " )
1965+ paste0(" RLI1_SGPt_PART_1 <- rliSGP(\n\t sgp_object=RLI_SGPt_UPDATE_SHELL,\n\t additional.data=RLI_Data_LONG_UPDATE,\n\t testing.window='SPRING',\n\t eow.or.update='UPDATE',\n\t configuration.year='2024_2025 ',\n\t return.updated.shell=TRUE,\n\t goodness.of.fit.print=TRUE,\n\t score.type='STAR',\n\t simulate.sgps=TRUE,\n\t cutscore.file.name=RLI_Cutscores,\n\t parallel.config=" , parallel.config , " \n )\n " )
19661966
19671967 if (save.results ) expression.to.evaluate <- paste(expression.to.evaluate , " save(RLI1_SGPt_PART_1, file='Data/RLI1_SGPt_PART_1.Rdata')" , sep = " \n " )
19681968
@@ -2114,13 +2114,13 @@ function(
21142114
21152115
21162116 # ##############################################################################
2117- # ## PART 3: Using Matrices from Next Window
2117+ # ## PART 3: Using Matrices from OLD Window (2019_2020.2)
21182118 # ##############################################################################
21192119
21202120 # ## Calculate SGPs
21212121
21222122 expression.to.evaluate <-
2123- paste0(" RLI1_SGPt_PART_3 <- rliSGP(\n\t sgp_object=RLI_SGPt_Data_LONG,\n\t coefficient.matrices=RLI_SGPt_Baseline_Matrices$RLI_SGPt_Baseline_Matrices_2016_2017 .2,\n\t return.updated.shell=TRUE,\n\t goodness.of.fit.print=TRUE,\n\t score.type='STAR',\n\t simulate.sgps=TRUE,\n\t cutscore.file.name=RLI_Cutscores,\n\t parallel.config=" , parallel.config , " \n )\n " )
2123+ paste0(" RLI1_SGPt_PART_3 <- rliSGP(\n\t sgp_object=RLI_SGPt_Data_LONG,\n\t coefficient.matrices=RLI_SGPt_Baseline_Matrices$RLI_SGPt_Baseline_Matrices_2019_2020 .2,\n\t return.updated.shell=TRUE,\n\t goodness.of.fit.print=TRUE,\n\t score.type='STAR',\n\t simulate.sgps=TRUE,\n\t cutscore.file.name=RLI_Cutscores,\n\t parallel.config=" , parallel.config , " \n )\n " )
21242124
21252125 if (save.results ) expression.to.evaluate <- paste(expression.to.evaluate , " save(RLI1_SGPt_PART_3, file='Data/RLI1_SGPt_PART_3.Rdata')" , sep = " \n " )
21262126
@@ -2143,9 +2143,9 @@ function(
21432143
21442144# if (identical(sum(RLI1_SGPt_PART_3@SGP[['SGPercentiles']][[paste("READING", tmp.last.window, "BASELINE", sep=".")]][['SGP_BASELINE']], na.rm=TRUE), 110397L)) { ## Pre-RLI1 107188L preSGP 1.6-4.16 +Dups : 108675L
21452145 if (identical(digest(RLI1_SGPt_PART_3 @ SGP [[' SGPercentiles' ]][[paste(" READING" , tmp.last.window , " BASELINE" , sep = " ." )]][[' SGP_BASELINE' ]]), " d11fe88a76e9ef09500aa94f24d08aaf" )) {
2146- tmp.messages <- c(tmp.messages , " \t\t Test of variable SGP_BASELINE (2016_2017 .3 matrices = 2016_2017 .2 matrices), part 3: OK\n " )
2146+ tmp.messages <- c(tmp.messages , " \t\t Test of variable SGP_BASELINE (2019_2020 .3 matrices = 2019_2020 .2 matrices), part 3: OK\n " )
21472147 } else {
2148- tmp.messages <- c(tmp.messages , " \t\t Test of variable SGP_BASELINE (2016_2017 .3 matrices = 2016_2017 .2 matrices), part 3: FAIL\n " )
2148+ tmp.messages <- c(tmp.messages , " \t\t Test of variable SGP_BASELINE (2019_2020 .3 matrices = 2019_2020 .2 matrices), part 3: FAIL\n " )
21492149 if (stop.fail ) {messageSGP(tmp.messages ); stop(" \n\n\t FAILED TEST!" )}
21502150 }
21512151
@@ -2187,14 +2187,14 @@ function(
21872187 RLI_SGPt_UPDATE_SHELL <- suppressMessages(prepareSGP(RLI_Data_LONG [! YEAR %in% tmp.last.window ], state = " RLI" ))
21882188 RLI_Data_LONG_UPDATE <- RLI_Data_LONG [YEAR %in% tmp.last.window ]
21892189 SGPstateData [[" RLI" ]][[" Baseline_splineMatrix" ]][[" Coefficient_Matrices" ]] <-
2190- eval(parse(text = paste(" RLI_SGPt_Baseline_Matrices[['RLI_SGPt_Baseline_Matrices_2016_2017 .3']]" )))
2190+ eval(parse(text = paste(" RLI_SGPt_Baseline_Matrices[['RLI_SGPt_Baseline_Matrices_2023_2024 .3']]" )))
21912191 SGPstateData [[" RLI" ]][[" SGP_Configuration" ]][[" goodness.of.fit.minimum.n" ]] <- 50
21922192 RLI_Cutscores <- SGPstateData [[' RLI' ]][[' SGP_Configuration' ]][[' testSGP.cutscores' ]][[' RASCH' ]]
21932193
21942194 # ## Calculate SGPs
21952195
21962196 expression.to.evaluate <-
2197- paste0(" RLI2_SGPt_PART_1 <- rliSGP(\n\t sgp_object=RLI_SGPt_UPDATE_SHELL,\n\t additional.data=RLI_Data_LONG_UPDATE,\n\t testing.window='SPRING',\n\t eow.or.update='UPDATE',\n\t configuration.year='2016_2017 ',\n\t return.updated.shell=TRUE,\n\t goodness.of.fit.print=TRUE,\n\t cutscore.file.name=RLI_Cutscores,\n\t parallel.config=" , parallel.config , " \n )\n " )
2197+ paste0(" RLI2_SGPt_PART_1 <- rliSGP(\n\t sgp_object=RLI_SGPt_UPDATE_SHELL,\n\t additional.data=RLI_Data_LONG_UPDATE,\n\t testing.window='SPRING',\n\t eow.or.update='UPDATE',\n\t configuration.year='2024_2025 ',\n\t return.updated.shell=TRUE,\n\t goodness.of.fit.print=TRUE,\n\t cutscore.file.name=RLI_Cutscores,\n\t parallel.config=" , parallel.config , " \n )\n " )
21982198
21992199 if (save.results ) expression.to.evaluate <- paste(expression.to.evaluate , " save(RLI2_SGPt_PART_1, file='Data/RLI2_SGPt_PART_1.Rdata')" , sep = " \n " )
22002200
0 commit comments