Bug fix: array index cannot be larger than 10 in margins

DESCRIPTION

@@ -2,7 +2,7 @@ Package: PivotalR
 Type: Package
 Title: R front-end to PostgreSQL and Pivotal (Greenplum) database,
         wrapper for MADlib
-Version: 0.1.15.21
+Version: 0.1.15.22
 Date: 2014-03-10
 Author: Predictive Analytics Team at Pivotal Inc. <user@madlib.net>,
         with contributions from Data Scientist Team at Pivotal Inc.

R/margins.R

@@ -204,8 +204,10 @@ Vars <- function(model)
     ## ------- Add quotes -------
     mvars <- Vars(model)
     model.vars <- .add.quotes(gsub("`", "", model.vars), mvars)
+
     model.vars <- lapply(model.vars, function(x)
                          eval(parse(text=paste("quote(", x, ")", sep = ""))))
+
     names(model.vars) <- paste("\"term.", seq_len(n), "\"", sep = "")
 
     if (any(! (gsub("\"", "", gsub("`", "", expand.vars)) %in%
@@ -215,8 +217,10 @@ Vars <- function(model)
              "or the table column names!")
 
     expand.vars <- paste("\"", expand.vars, "\"", sep = "")
-    expand.vars <- gsub("\"`\"([^\\[\\]]*)\"\\[([^\\[\\]]*)\\]`\"", "\"\\1\"[\\2]", expand.vars)
-    expand.vars <- gsub("\"`([^\\[\\]]*)\\[([^\\[\\]]*)\\]`\"", "\"\\1\"[\\2]", expand.vars)
+    expand.vars <- gsub("\"`\"([^\\[\\]]*)\"\\[([^\\[\\]]*)\\]`\"", "\"\\1\"[\\2]",
+                        expand.vars, perl = TRUE)
+    expand.vars <- gsub("\"`([^\\[\\]]*)\\[([^\\[\\]]*)\\]`\"", "\"\\1\"[\\2]",
+                        expand.vars, perl = TRUE)
 
     return (list(vars = expand.vars, is.ind = expand.is.ind,
                  is.factor = is.factor, factors = factors,
@@ -1020,5 +1024,3 @@ margins.logregr.madlib.grps <- function(model, dydx = ~ Vars(model),
     } else
         var
 }
-
-