changed 'x' parameter to 'xintercept'

to help with the more stringent ggplot2 checking.
OuhscBbmc · Nov 11, 2015 · 1e3543a · 1e3543a
1 parent 57f6478
commit 1e3543a
Show file tree

Hide file tree

Showing 17 changed files with 67 additions and 81 deletions.
diff --git a/DocumentationPeek.pdf b/DocumentationPeek.pdf
diff --git a/R/CartesianPeriodic.R b/R/CartesianPeriodic.R
@@ -33,25 +33,25 @@
 ##' @keywords Cartesian
 ##' @examples
 ##' library(Wats) #Load the package
-##' changeMonth <- base::as.Date("1996-02-15") 
+##' changeMonth <- base::as.Date("1996-02-15")
 ##' dsLinear <- CountyMonthBirthRate2005Version
 ##' dsLinear <- dsLinear[dsLinear$CountyName=="oklahoma", ]
 ##' dsLinear <- AugmentYearDataWithMonthResolution(dsLinear=dsLinear, dateName="Date")
 ##' hSpread <- function( scores ) { return( quantile(x=scores, probs=c(.25, .75)) ) }
 ##' portfolio <- AnnotateData(
-##'     dsLinear, 
+##'     dsLinear,
 ##'     dvName = "BirthRate",
-##'     centerFunction = median, 
+##'     centerFunction = median,
 ##'     spreadFunction = hSpread
 ##' )
 ##' 
 ##' CartesianPeriodic(
-##'   portfolio$dsLinear, 
-##'   portfolio$dsPeriodic, 
-##'   xName = "Date", 
+##'   portfolio$dsLinear,
+##'   portfolio$dsPeriodic,
+##'   xName = "Date",
 ##'   yName = "BirthRate",
-##'   stageIDName = "StageID", 
-##'   changePoints = changeMonth, 
+##'   stageIDName = "StageID",
+##'   changePoints = changeMonth,
 ##'   changePointLabels = "Bombing Effect"
 ##' )
 
@@ -107,7 +107,7 @@ CartesianPeriodic <- function(dsLinear, dsPeriodic,
 
   if( !is.null(changePoints) ) {
     for( i in seq_along(changePoints) )  {
-      p <- p + ggplot2::geom_vline(x=as.integer(changePoints[i]), color=paletteLight[i+1], alpha=changeLineAlpha, size=changeLineSize)
+      p <- p + ggplot2::geom_vline(xintercept=as.integer(changePoints[i]), color=paletteLight[i+1], alpha=changeLineAlpha, size=changeLineSize)
       p <- p + ggplot2::annotate("text", x=changePoints[i], y=Inf, vjust=1.1, color=paletteLight[i+1], label=changePointLabels[i])
     }
   }

diff --git a/R/CartesianRolling.R b/R/CartesianRolling.R
@@ -107,7 +107,7 @@ CartesianRolling <- function(dsLinear, xName, yName, stageIDName,
 
   if( !is.null(changePoints) ) {
     for( i in seq_along(changePoints) )  {
-      p <- p + ggplot2::geom_vline(x=as.integer(changePoints[i]), color=paletteLight[i+1], alpha=changeLineAlpha, size=changeLineSize)
+      p <- p + ggplot2::geom_vline(xintercept=as.integer(changePoints[i]), color=paletteLight[i+1], alpha=changeLineAlpha, size=changeLineSize)
       p <- p + ggplot2::annotate("text", x=changePoints[i], y=Inf, vjust=1.1, color=paletteLight[i+1], label=changePointLabels[i])
     }
   }

diff --git a/inst/doc/MbrFigures.html b/inst/doc/MbrFigures.html
diff --git a/inst/doc/OkFertilityWithIntercensalEstimates.html b/inst/doc/OkFertilityWithIntercensalEstimates.html
diff --git a/man/CartesianPeriodic.Rd b/man/CartesianPeriodic.Rd
diff --git a/vignettes/figure_mbr_rmd/Figure2IndividualBasic-1.png b/vignettes/figure_mbr_rmd/Figure2IndividualBasic-1.png
diff --git a/vignettes/figure_mbr_rmd/Figure2Stylized-1.png b/vignettes/figure_mbr_rmd/Figure2Stylized-1.png
diff --git a/vignettes/figure_mbr_rmd/Figure4Basic-1.png b/vignettes/figure_mbr_rmd/Figure4Basic-1.png
diff --git a/vignettes/figure_mbr_rmd/Figure4Stylized-1.png b/vignettes/figure_mbr_rmd/Figure4Stylized-1.png
diff --git a/vignettes/figure_mbr_rmd/Figure6-1.png b/vignettes/figure_mbr_rmd/Figure6-1.png
diff --git a/vignettes/figure_mbr_rmd/Figure7-1.png b/vignettes/figure_mbr_rmd/Figure7-1.png
diff --git a/vignettes/figure_mbr_rmd/Figure7AllCounties-1.png b/vignettes/figure_mbr_rmd/Figure7AllCounties-1.png
diff --git a/vignettes/figure_mbr_rmd/Figure8-1.png b/vignettes/figure_mbr_rmd/Figure8-1.png
diff --git a/vignettes/figure_okc_fertility_intercensal_rmd/CartesianPeriodic-1.png b/vignettes/figure_okc_fertility_intercensal_rmd/CartesianPeriodic-1.png
diff --git a/vignettes/figure_okc_fertility_intercensal_rmd/CartesianRolling-1.png b/vignettes/figure_okc_fertility_intercensal_rmd/CartesianRolling-1.png
diff --git a/vignettes/figure_okc_fertility_intercensal_rmd/PolarPeriodic-1.png b/vignettes/figure_okc_fertility_intercensal_rmd/PolarPeriodic-1.png