Merge pull request #10 from jaredlander/fix/aes_string

Removing aes_string usage

Author: jaredlander

R/hartigan.r

@@ -46,7 +46,7 @@ PlotHartigan <- function(hartigan, title="Hartigan's Rule", smooth=FALSE, lineco
     thePlot <- ggplot(data=hartigan, aes(x=.data[['Clusters']], y=.data[['Hartigan']])) + 
         geom_hline(aes(yintercept=10), linetype=linetype, colour=linecolor, linewidth=linesize) + 
         #geom_line() +
-        geom_point(aes_string(colour="AddCluster")) +
+        geom_point(aes(colour=.data[['AddCluster']])) +
         scale_colour_discrete(name="Add Cluster") +
         ggtitle(label=title) + if(minor) scale_x_continuous(minor_breaks=(1:(max(hartigan$Clusters)+1)))
 

R/kmeansPlotting.r

@@ -78,6 +78,7 @@ fortify.kmeans <- function(model, data=NULL, ...)
 #' k1 <- kmeans(x=iris[, 1:4], centers=3)
 #' plot(k1)
 #' plot(k1, data=iris)
+#' plot(k1, data=iris, class=Species)
 #' 
 plot.kmeans <-
     function(x, data=NULL, class=NULL, size=2, 
@@ -94,8 +95,9 @@ plot.kmeans <-
       # convert class to factor just in case it is not already
       if(!is.null(class)) toPlot[, class] <- factor(toPlot[, class])
 
-      ggplot(toPlot, aes_string(x='.x', y='.y', colour='.Cluster')) + 
-          geom_point(aes_string(shape=class), size=size) + 
+      ggplot(toPlot, aes(x=.data[['.x']], y=.data[['.y']], colour=.data[['.Cluster']])) + 
+          # geom_point(aes_string(shape='class'), size=size) + 
+          geom_point(aes(shape={{class}}), size=size) +
           scale_color_discrete("Cluster") +
           theme(legend.position=legend.position) +
           labs(title=title, x=xlab, y=ylab)

R/tsPlot.r

@@ -95,7 +95,7 @@ ts.plotter <- function(data, time=NULL,
     y <- names(data)[2]
 
     # build the plot
-    ggplot(data, aes_string(x=x, y=y)) + geom_line(aes(group=1)) +
+    ggplot(data, aes(x=.data[[x]], y=.data[[y]])) + geom_line(aes(group=1)) +
         labs(title=title, x=xlab, y=ylab)
 }
 
@@ -177,8 +177,8 @@ autoplot.acf <- function(object,
     y <- names(data)[2]
 
     # build plot
-    ggplot(data, aes_string(x=x)) + 
-        geom_linerange(aes_string(ymin=pmin(y, 0), ymax=pmax(y, 0))) +
+    ggplot(data, aes(x=.data[[x]])) + 
+        geom_linerange(aes(ymin=pmin(.data[[y]], 0), ymax=pmax(.data[[y]], 0))) +
         labs(title=title, x=xlab, y=ylab)
 }