Correctly load mgcv package whenever method='gam'

wch · wch · commit b316892628ef · 2013-06-17T16:30:38.000-05:00
diff --git a/R/stat-smooth.r b/R/stat-smooth.r
@@ -129,7 +129,6 @@ StatSmooth <- proto(Stat, {
                 ' so using loess.',
                 ' Use \'method = x\' to change the smoothing method.')
       } else {
-        try_require("mgcv")
         method <- "gam"
         formula <- y ~ s(x, bs = "cs")
         message('geom_smooth: method="auto" and size of largest group is >=1000,',
@@ -138,6 +137,8 @@ StatSmooth <- proto(Stat, {
       }
     }
 
+    if (method == "gam") try_require("mgcv")
+
     .super$calculate_groups(., data, scales, method = method, formula = formula, ...)
   }
   

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,6 @@ StatSmooth <- proto(Stat, {`
`129`	`129`	`' so using loess.',`
`130`	`130`	`' Use \'method = x\' to change the smoothing method.')`
`131`	`131`	`} else {`
`132`		`- try_require("mgcv")`
`133`	`132`	`method <- "gam"`
`134`	`133`	`formula <- y ~ s(x, bs = "cs")`
`135`	`134`	`message('geom_smooth: method="auto" and size of largest group is >=1000,',`
`@@ -138,6 +137,8 @@ StatSmooth <- proto(Stat, {`
`138`	`137`	`}`
`139`	`138`	`}`
`140`	`139`
	`140`	`+ if (method == "gam") try_require("mgcv")`
	`141`	`+`
`141`	`142`	`.super$calculate_groups(., data, scales, method = method, formula = formula, ...)`
`142`	`143`	`}`
`143`	`144`