version 1.7-0.0

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: SGP
 Type: Package
 Title: Student Growth Percentiles & Percentile Growth Trajectories
-Version: 1.6-0.0
-Date: 2017-1-1
+Version: 1.7-0.0
+Date: 2017-4-21
 Authors@R: c(person(given=c("Damian", "W."), family="Betebenner", email="dbetebenner@nciea.org", role=c("aut", "cre")),
 		person(given=c("Adam", "R."), family="Van Iwaarden", email="avaniwaarden@gmail.com", role="aut"),
 		person(given="Ben", family="Domingue", email="ben.domingue@gmail.com", role="aut"),
@@ -72,9 +72,9 @@ Authors@R: c(person(given=c("Damian", "W."), family="Betebenner", email="dbetebe
 		person(given="Nathan", family="Wall", role="ctb", comment="eMetric working with Nevada Department of Education and South Dakota Department of Education"),
 		person(given="Narek", family="Sahakyan", role="ctb", comment="World Class Instruction and Design (WIDA)"))
 Maintainer: Damian W. Betebenner <dbetebenner@nciea.org>
-Depends: R (>= 2.13)
-Suggests: SGPdata (>= 13.0-0)
-Imports: Cairo, colorspace, crayon, datasets, data.table (>= 1.9.8),
+Depends: R (>= 3.0)
+Suggests: SGPdata (>= 17.0-0)
+Imports: Cairo, colorspace, crayon, datasets, data.table (>= 1.10.0),
         digest, doParallel, doRNG, equate (>= 2.0-5), foreach,
         graphics, grid, grDevices, gridBase, iterators, gtools,
         jsonlite, matrixStats, methods, parallel, quantreg, RSQLite,
@@ -95,7 +95,7 @@ LazyDataCompression: xz
 License: GPL-3
 ByteCompile: TRUE
 NeedsCompilation: no
-Packaged: 2017-01-01 01:48:12 UTC; damian
+Packaged: 2017-04-21 20:45:30 UTC; damian
 Author: Damian W. Betebenner [aut, cre],
   Adam R. Van Iwaarden [aut],
   Ben Domingue [aut],
@@ -165,4 +165,4 @@ Author: Damian W. Betebenner [aut, cre],
   Nathan Wall [ctb] (eMetric working with Nevada Department of Education and South Dakota Department of Education),
   Narek Sahakyan [ctb] (World Class Instruction and Design (WIDA))
 Repository: CRAN
-Date/Publication: 2017-01-01 10:09:00
+Date/Publication: 2017-04-21 22:50:06 UTC

MD5

@@ -1,116 +1,117 @@
-aebab8f377ddbf708954dd4e69b2be07 *DESCRIPTION
+90e331e496e64af0575d9d66be53bf6c *DESCRIPTION
 458dabc7712922f73dffc3578458c73b *NAMESPACE
 d19c9b6c3c54bdeb640d0e11cca5f9fd *R/SGP-class.R
-667decf4db6dd352cf47da331d464258 *R/abcSGP.R
-bfcb9506ef4893e75263f28f5cd07fc9 *R/analyzeSGP.R
+e3ca16f65cb7d0d1851bed3263edf30a *R/abcSGP.R
+a5cbe109afca53dc729587a64dd8a601 *R/analyzeSGP.R
 0254a1b05d5a02c39d73427b8159e5ee *R/as.splineMatrix.R
 67bee325e4e9fce37c4787c376963a09 *R/baselineSGP.R
 9e13967e0cbee903cb1f07311a52b982 *R/bubblePlot.R
 142f42425f41d852f7ef03d98e7ca707 *R/bubblePlot_Styles.R
 3e431acb6264892cb69a8d262c91c5ab *R/capwords.R
 a37a6ed0a3ab353499e9ea33babbfcc5 *R/checkConfig.R
-5547dc6f08c16a0dc7c853354e3b7b01 *R/checkSGP.R
+3f0f811828e66bce31e27936cc5b92b7 *R/checkSGP.R
 f994b746c2530e944a02b165709489fe *R/checksplineMatrix.R
-e8c02a92661d2b8a6187a9eda4324e55 *R/combineSGP.R
+3db478a3e1109c2efc2e7c80d3c64438 *R/combineSGP.R
 fddb751af4cd884f4657f8f1785829bc *R/convertScaleScore.R
 509669d9672c8c0ba7f9b21ea227dac5 *R/convertTime.R
-c401b19167fe0f3402e09c22597b7894 *R/courseProgressionSGP.R
+7cce3ea5aa0ef46384559b24b181e34f *R/courseProgressionSGP.R
 9eef0b1d134113d39220e9e8903f3c1b *R/createKnotsBoundaries.R
 cc3b037c2def1418819365f1eacf539d *R/createLongCutscores.R
-01dc0a202e1ca7f5820c9000ee5b1fb6 *R/createUniqueLongData.R
+4be795fb03e8d2032b509a13cbf8b2e9 *R/createUniqueLongData.R
 43779952b5858ba636be823d5bc30b74 *R/csemScoreSimulator.R
 1e0adf8f7a2f150a1eccb029ac6a083c *R/ddcast.R
 e496d69382c4af7b5e96aa9be4043df9 *R/detectSGPCores.R
 5c5c713759772aaf7b638d6d282af1ea *R/equateSGP.R
-bc8fb72353931735abc328a2a4469fd3 *R/getAchievementLevel.R
+b25ba0493e86869fba9ff248c8b234fe *R/getAchievementLevel.R
 a249a550bdbb600418649ed22e4f1487 *R/getCohortDataInfo.R
 aeb24f9dd92daec37ea8886f7afdadab *R/getErrorReports.R
 69e17758fe7cab507230b6b10ec68103 *R/getFirstAndLastInGroup.R
 407eafcd682ea24a4f9db95143dd9ba8 *R/getHighNeedStatus.R
 8b08502c587013d00cee0538b435e14c *R/getJSON.R
-696ca833da396c7a514d160608aa29a7 *R/getKey.R
-f894d9886d0fc608fe02b2ca20c9bd01 *R/getKnotsBoundaries.R
+1645f45af43f613717e6eba8481602b9 *R/getKey.R
+44e5144a7496eb4e8e9e7f7cd2d5356d *R/getKnotsBoundaries.R
 cc62312d3e07735d4cf333b2671b8738 *R/getMaxOrderForProgression.R
 b43e3d48ad7a3d98b8d23cd6962623f4 *R/getMyLabel.R
 02a0d37fa3aca199f6c08adbeb7c9b33 *R/getNewCutscores.R
-4561bd74854a669af73817d6ccf3302e *R/getPanelData.R
-079cc856e2888810c940c32b52549b98 *R/getPanelDataVnames.R
+41f24bef6006027b263243ac32cfa129 *R/getPanelData.R
+e95b4aebd3a2c750d68e6b9ed566d34c *R/getPanelDataVnames.R
 30af8bd462cecba331c737895bd57465 *R/getPercentileTableNames.R
-8281395e62d309d4ed81f29b70a7d1e7 *R/getPreferredSGP.R
+7e873095796faa17e2df41004fa7157c *R/getPreferredSGP.R
 9e68e25702e4e48fad8fcd9d3b41c0a2 *R/getSGPBaselineConfig.R
 d6c28c43b162444cf2de7a92ea32a1d2 *R/getSGPColor.R
-f96563b8cdf4344c16e21f228d1a5b20 *R/getSGPConfig.R
+04a9a79e6ef31b5689e6eef6a767ee5e *R/getSGPConfig.R
 c290642d8b0d504d3fe4a08bb5bfd03c *R/getSGPtNames.R
-1b888faa51921eb81247014a5100829a *R/getStateAbbreviation.R
+df6614b8b094701b34b640a2b4471773 *R/getStateAbbreviation.R
 ba386b034ee345933695b293d382cb8c *R/getTableNameYear.R
 b463a073998eb81eb01023091534a3e9 *R/getTargetAchievementLevels.R
 0d6d72ab1f4bcd2952b192720d1a477a *R/getTargetInitialStatus.R
 82d26335f75f99481d6e330cdcdc6745 *R/getTargetName.R
-c5046e5b235efd13f3c9a9e03c13aba4 *R/getTargetSGP.R
+fba5e109e6e0908b609a91bd2eac5266 *R/getTargetSGP.R
 ceb00f6dbe433af54d204c9071770438 *R/getTargetSGPContentArea.R
 45e60d1ef852cd169efe056c3914e184 *R/getTargetSGPLevel.R
-7021c53f93e0d3b92bce98728c1a5d45 *R/getTargetScaleScore.R
+9de550a68819f896145a1f4e05fe8f5a *R/getTargetScaleScore.R
 aeef1ae533b8bb7f43965d9a0ca8b162 *R/getTimeShiftIndex.R
 cb4feeffb49ccbb852de5a2556e183b6 *R/getVersion.R
 21f58307a32eca8d4e974b3519fd649f *R/getYearsContentAreasGrades.R
 9ec814ee7e91d435324b3a9df8c316c9 *R/getsplineMatrices.R
-0f0d6e60eb37af48eac996d0e7803ef0 *R/gofSGP.R
-7e354789c32a1f7daa5e17005260f224 *R/growthAchievementPlot.R
+4c81face5969343a89054512e4578aac *R/gofSGP.R
+2957b58c80bd66e5272819642a94de82 *R/growthAchievementPlot.R
 7ccaa36434eb10115cb63b8b32aad23b *R/is.SGP.R
 a5d7345ef6ae6cc5119799dcf496ed57 *R/is.splineMatrix.R
 945a93f8133fac75f3e0033850ee2644 *R/linkagePlot.R
 ebdaef711fa5af6fc247665e1e196292 *R/mergeSGP.R
 3b2169782bdb95cdbb01998350186341 *R/messageSGP.R
-a60c74b9d3626b679550604428452aba *R/outputSGP.R
+d0cecbd113c941f928b0d0e80d8f0b48 *R/outputSGP.R
 cb717975248a45cdc8fc7e1f9abfed0f *R/piecewiseTransform.R
-01419138a6a6c8803bb20c4ab6aa8def *R/prepareSGP.R
+e8a1fecac74e0d8bb4d9b1480392c80b *R/prepareSGP.R
 f8fce50754c8714ab5cc9334ad3043b4 *R/prettyDate.R
-dcfdb821170b794cdc00d4861edb6dab *R/rliSGP.R
+5f6874f64a7553343aada08ec6db69e8 *R/rliCutscoreCreation.R
+bc6c58e949c70abea38fe58c771af094 *R/rliSGP.R
 8ff80e6f477e8f75b9c9c3070543296a *R/splineMatrix-class.R
-57ff61ce79fcbed181471b13643ea14b *R/sqliteSGP.R
+ab589d8a30f32a5f11c740b3c44ac8b4 *R/sqliteSGP.R
 bdd704e683094f0d89359a51ab9ae954 *R/startParallel.R
 449b774ae60fb304d69a5aed48586295 *R/stopParallel.R
-fa38ea6a752e11a6826d45882354d08f *R/studentGrowthPercentiles.R
+31eefe220882f752921f8abaca5bf287 *R/studentGrowthPercentiles.R
 9bf8809657b13961fe57f81e3fcfeac7 *R/studentGrowthPlot.R
 b3ee1791da1e52f8c49a613558017953 *R/studentGrowthPlot_Styles.R
-60026dcede580e3d95a3a8d6723e31e7 *R/studentGrowthProjections.R
-c08eb2f31a8b4d6a208aca6096af9a92 *R/summarizeSGP.R
-8d3ba6a1760c95ddae79b44e6efa8299 *R/summarizeSGP_Utilities.R
-4ebeb38de3215b27ecb0ecb2b645e200 *R/testSGP.R
+7d82094d985f717cd7171fff48955151 *R/studentGrowthProjections.R
+622261b71a9d545abcc3d080dd088762 *R/summarizeSGP.R
+48b3d68132fb6c7fad2365abf8ef887f *R/summarizeSGP_Utilities.R
+4f33304fc0abba68d3082a8ceb3388ac *R/testSGP.R
 756bf89f134acbfb56b35ee50a77befd *R/transformScaleScore.R
 6c6a39757e3141655526630c579a46a2 *R/unfoldstudentGrowthPlots.R
 daaa79778be7c7abd0457013345cba40 *R/unique.splineMatrix.R
-e5a3ddbea3114fe3f5864e1d4e9cbd08 *R/updateSGP.R
-934cb388d966eb2771121d9d2e90822f *R/visualizeSGP.R
+1b2ddda733650b28ca7ad0e1f3d450de *R/updateSGP.R
+a549b49b75d67ac1aa238c505a4e9bfb *R/visualizeSGP.R
 d1abdc4128fc2e02fa18a60b03f23e38 *R/yearIncrement.R
-0668f6cdae8df3bd396061e31e17eb6e *R/zzz.R
-4016486921b8118bd37d4126a1a8aa42 *data/SGPstateData.rda
+c095fec425cd45a09f206df6b7e03aa7 *R/zzz.R
+85cf51962dfd191169049f22711aaa98 *data/SGPstateData.rda
 3406f6148aa153daa87a96b2d8a2c0c6 *data/datalist
-d62683f167b6706f3de79259481ad492 *inst/CITATION
-5c37a24771afaa94f974a4a11e692859 *inst/NEWS
+b71323138ae63d49881d25ecf3fcf341 *inst/CITATION
+eaac7c7556ea5d2819b08d665a470f56 *inst/NEWS
 0b0c8eb765a726f639c62a57569fac16 *man/SGP-class.Rd
-4a0b7affa4ede2b753da25a7753d11a4 *man/SGP-package.Rd
+0b2b750893716fb2e89d60a0c5cfbe66 *man/SGP-package.Rd
 6ba8d1948a708c5c49f570e48dd67cd3 *man/SGPstateData.Rd
-96e34a3d802a8e5b728975d3d868cd66 *man/abcSGP.Rd
-475684fab7e9c8d01d57772a6070b121 *man/analyzeSGP.Rd
+d70ee158014450e41c3ea4ead39a197e *man/abcSGP.Rd
+b16f7352c12b2f6c7d39cd4f1be6ab2f *man/analyzeSGP.Rd
 b0ecf1e6b611605692d5d2d622cac18d *man/baselineSGP.Rd
 2f2f67efdd14fbb019aa65e6c196e225 *man/bubblePlot.Rd
 ed349ec2be6b3277e0d588caf1b4e6d7 *man/bubblePlot_Styles.Rd
 cadecb9c0c330c1f5a4730da2bd29276 *man/capwords.Rd
-fddeebdb1a8f2a69f3a483daba29a7f3 *man/combineSGP.Rd
+161ef8c4c1ce0d7dd2c81a3772dcbb2e *man/combineSGP.Rd
 8aa3c293e29529d09beddd5477875554 *man/courseProgressionSGP.Rd
 8b28a546c51cb0ad4e06fe3444fbbfd0 *man/createKnotsBoundaries.Rd
 840c34f3c49b928b7e48c677a94e5813 *man/gofSGP.Rd
 aad5254969eee39dd8e2b43b9643e7b3 *man/growthAchievementPlot.Rd
 4649337002089f1aaf08ddffc1743c92 *man/outputSGP.Rd
 f4bb600e15c530425d382b2ad366272a *man/prepareSGP.Rd
-33657ae4f85ecf475726a89a0d7e5ebc *man/rliSGP.Rd
+809c8a090b31cea546e2ff4cb98a0074 *man/rliSGP.Rd
 6557bd43cd0d58b70a2aef4be609a396 *man/splineMatrix-class.Rd
-6f03a4253d8d7aa68f23ea47eaae7bbb *man/studentGrowthPercentiles.Rd
+03418c6eda13fbe133f5979a43ac267e *man/studentGrowthPercentiles.Rd
 65c9ddd67b7d11771aca73f0468c253e *man/studentGrowthPlot.Rd
 dd98ad6ec21189ffed78f89cf097e1e2 *man/studentGrowthPlot_Styles.Rd
-a022d7d37315f2faf14d0979acf2ad5b *man/studentGrowthProjections.Rd
+76c831a5567f5d74439024be3535373d *man/studentGrowthProjections.Rd
 0a7ed8eed12af6278dc22ba01b680213 *man/summarizeSGP.Rd
 299c607b5909c7e3710c45d886de7361 *man/testSGP.Rd
-ad5cd95b1ad00906f38742ccfa485c53 *man/updateSGP.Rd
+60868b8ba4de01806a1a5436e229fb1b *man/updateSGP.Rd
 f52be971921476bd154e5b6e4e67f644 *man/visualizeSGP.Rd

R/abcSGP.R

@@ -34,13 +34,15 @@ function(sgp_object,
 	confidence.interval.groups=NULL,
 	plot.types=c("bubblePlot", "studentGrowthPlot", "growthAchievementPlot"),
 	outputSGP.output.type=c("LONG_Data", "LONG_FINAL_YEAR_Data", "WIDE_Data", "INSTRUCTOR_Data"),
+	outputSGP.directory="Data",
 	verbose.output=FALSE,
 	sgp.sqlite = FALSE,
 	sgp.percentiles.equated=NULL,
 	sgp.percentiles.equating.method=NULL,
 	sgp.percentiles.calculate.sgps=TRUE,
 	get.cohort.data.info=FALSE,
-	SGPt=NULL) {
+	SGPt=NULL,
+	fix.duplicates=NULL) {
 
     started.at <- proc.time()
 	messageSGP(paste("\nStarted abcSGP", prettyDate()), "\n")
@@ -55,6 +57,12 @@ function(sgp_object,
 		state <- getStateAbbreviation(tmp.name, "abcSGP")
 	}
 
+	### Configure arguments
+
+	if (is.null(fix.duplicates) & !is.null(SGP::SGPstateData[[state]][["SGP_Configuration"]][["fix.duplicates"]])) {
+		fix.duplicates <- SGP::SGPstateData[[state]][["SGP_Configuration"]][["fix.duplicates"]]
+	}
+
 
 	### prepareSGP ###
 
@@ -64,8 +72,9 @@ function(sgp_object,
 				data_supplementary=data_supplementary,
 				state=state,
 				var.names=prepareSGP.var.names,
-				create.additional.variables=prepareSGP.create.additional.variables)
-	        if (save.intermediate.results) save(sgp_object, file="sgp_object.Rdata")
+				create.additional.variables=prepareSGP.create.additional.variables,
+				fix.duplicates=fix.duplicates)
+		if (save.intermediate.results) save(sgp_object, file="sgp_object.Rdata")
 	}
 
 
@@ -76,7 +85,7 @@ function(sgp_object,
         ### Check for consistency between simulate.sgps and existence of CSEMs ###
 
 		if (simulate.sgps & is.null(SGP::SGPstateData[[state]][["Assessment_Program_Information"]][["CSEM"]])) {
-        	        messageSGP("\tCSEMs are required in SGPstateData to simulate SGPs for confidence interval calculations. Confidence intervals will not be calculated.")
+			messageSGP("\tCSEMs are required in SGPstateData to simulate SGPs for confidence interval calculations. Confidence intervals will not be calculated.")
 			simulate.sgps <- FALSE
 		}
 
@@ -121,9 +130,10 @@ function(sgp_object,
 			sgp.percentiles.equating.method=sgp.percentiles.equating.method,
 			sgp.percentiles.calculate.sgps=sgp.percentiles.calculate.sgps,
 			get.cohort.data.info=get.cohort.data.info,
-			SGPt=SGPt)
+			SGPt=SGPt,
+			fix.duplicates=fix.duplicates)
 
-                if (save.intermediate.results) save(sgp_object, file="sgp_object.Rdata")
+		if (save.intermediate.results) save(sgp_object, file="sgp_object.Rdata")
 	}
 
 
@@ -145,9 +155,10 @@ function(sgp_object,
 			sgp.target.scale.scores.only=sgp.target.scale.scores.only,
 			sgp.config=sgp.config,
 			SGPt=SGPt,
+			fix.duplicates=fix.duplicates,
 			parallel.config=parallel.config)
 
-                if (save.intermediate.results) save(sgp_object, file="sgp_object.Rdata")
+		if (save.intermediate.results) save(sgp_object, file="sgp_object.Rdata")
 	}
 
 
@@ -165,7 +176,7 @@ function(sgp_object,
 			parallel.config=parallel.config,
 			save.old.summaries=save.old.summaries)
 
-                if (save.intermediate.results) save(sgp_object, file="sgp_object.Rdata")
+		if (save.intermediate.results) save(sgp_object, file="sgp_object.Rdata")
 	}
 
 
@@ -194,6 +205,7 @@ function(sgp_object,
 			sgp_object=sgp_object,
 			state=state,
 			output.type=outputSGP.output.type,
+			outputSGP.directory=outputSGP.directory,
 			outputSGP_SUMMARY.years=years,
 			outputSGP_SUMMARY.content_areas=content_areas,
 			outputSGP_INDIVIDUAL.years=years,
@@ -204,6 +216,6 @@ function(sgp_object,
 
 	### Print finish and return SGP object
 
-        messageSGP(paste("Finished abcSGP", prettyDate(), "in", convertTime(timetaken(started.at)), "\n"))
+	messageSGP(paste("Finished abcSGP", prettyDate(), "in", convertTime(timetaken(started.at)), "\n"))
 	return(sgp_object)
 } ## END abcSGP Function