Skip to content
This repository has been archived by the owner on May 22, 2024. It is now read-only.

Commit

Permalink
Use *?/+? extensively
Browse files Browse the repository at this point in the history
  • Loading branch information
Qian, Hai committed Apr 20, 2014
1 parent 3fdd7d8 commit 1c0f2bf
Show file tree
Hide file tree
Showing 9 changed files with 68 additions and 68 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.43
Version: 0.1.15.44
Date: 2014-03-10
Author: Predictive Analytics Team at Pivotal Inc. <user@madlib.net>,
with contributions from Data Scientist Team at Pivotal Inc.
Expand Down
6 changes: 3 additions & 3 deletions R/db_conn-generic.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,16 +230,16 @@ db.disconnect <- function (conn.id = 1, verbose = TRUE, force = FALSE)
dbms.str <- dbms(conn.id = conn.id)
if (gsub(".*(HAWQ).*", "\\1", dbms.str, perl=T) == "HAWQ") {
db.str <- "HAWQ"
version.str <- gsub(".*HAWQ[^\\d]+([\\d\\.]+).*", "\\1",
version.str <- gsub(".*HAWQ[^\\d]+?([\\d\\.]+?).*", "\\1",
dbms.str, perl=T)
} else if (gsub(".*(Greenplum).*", "\\1", dbms.str,
perl=T) == "Greenplum") {
db.str <- "Greenplum"
version.str <- gsub(".*Greenplum[^\\d]+([\\d\\.]+).*",
version.str <- gsub(".*Greenplum[^\\d]+?([\\d\\.]+?).*",
"\\1", dbms.str, perl=T)
} else {
db.str <- "PostgreSQL"
version.str <- gsub(".*PostgreSQL[^\\d]+([\\d\\.]+).*",
version.str <- gsub(".*PostgreSQL[^\\d]+?([\\d\\.]+?).*",
"\\1", dbms.str, perl=T)
}
list(db.str = db.str, version.str = version.str)
Expand Down
6 changes: 3 additions & 3 deletions R/elnet-cd.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
for (i in seq_len(length(col.name)))
if (col.name[i] != appear[i])
rows <- gsub(col.name[i], appear[i], rows)
rows <- gsub("\\(([^\\[\\]]*)\\)\\[(\\d+)\\]", "\\1[\\2]", rows)
rows <- gsub("\\(([^\\[\\]]*?)\\)\\[(\\d+?)\\]", "\\1[\\2]", rows)
rows <- .reverse.consistent.func(rows)
rows <- gsub("\\s", "", rows)
names(rst$coef) <- rows
Expand Down Expand Up @@ -227,7 +227,7 @@
for (i in seq_len(length(col.name)))
if (col.name[i] != appear[i])
rows <- gsub(col.name[i], appear[i], rows)
rows <- gsub("\\(([^\\[\\]]*)\\)\\[(\\d+)\\]", "\\1[\\2]", rows)
rows <- gsub("\\(([^\\[\\]]*?)\\)\\[(\\d+?)\\]", "\\1[\\2]", rows)
rows <- .reverse.consistent.func(rows)
rows <- gsub("\\s", "", rows)
names(rst$coef) <- rows
Expand Down Expand Up @@ -269,7 +269,7 @@

.convert.to.double.array <- function (x)
{
as.numeric(strsplit(gsub("^\\{(.*)\\}$", "\\1", x), ",")[[1]])
as.numeric(strsplit(gsub("^\\{(.*?)\\}$", "\\1", x), ",")[[1]])
}

## ----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion R/madlib-elnet.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ madlib.elnet <- function (formula, data,
for (i in seq_len(length(col.name)))
if (col.name[i] != appear[i])
rows <- gsub(col.name[i], appear[i], rows)
rows <- gsub("\\(([^\\[\\]]*)\\)\\[(\\d+)\\]", "\\1[\\2]", rows)
rows <- gsub("\\(([^\\[\\]]*?)\\)\\[(\\d+?)\\]", "\\1[\\2]", rows)
rows <- .reverse.consistent.func(rows)
rows <- gsub("\\s", "", rows)
names(rst$coef) <- rows
Expand Down
4 changes: 2 additions & 2 deletions R/madlib-glm.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ print.logregr.madlib.grps <- function (x,
for (j in seq_len(length(x[[i]]$col.name)))
if (x[[i]]$col.name[j] != x[[i]]$appear[j])
rows <- gsub(x[[i]]$col.name[j], x[[i]]$appear[j], rows)
rows <- .gsub("\\(([^\\[\\]]*)\\)\\[(\\d+)\\]", "\\1[\\2]", rows)
rows <- gsub("\\(([^\\[\\]]*?)\\)\\[(\\d+?)\\]", "\\1[\\2]", rows)
rows <- .reverse.consistent.func(rows)
rows <- gsub("\\s", "", rows)
ind.width <- .max.width(rows)
Expand Down Expand Up @@ -309,7 +309,7 @@ print.logregr.madlib <- function (x,
for (i in seq_len(length(x$col.name)))
if (x$col.name[i] != x$appear[i])
rows <- gsub(x$col.name[i], x$appear[i], rows)
rows <- gsub("\\(([^\\[\\]]*)\\)\\[(\\d+)\\]", "\\1[\\2]", rows)
rows <- gsub("\\(([^\\[\\]]*?)\\)\\[(\\d+?)\\]", "\\1[\\2]", rows)
rows <- .reverse.consistent.func(rows)
rows <- gsub("\\s", "", rows)
ind.width <- .max.width(rows)
Expand Down
6 changes: 3 additions & 3 deletions R/madlib-lm.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ print.lm.madlib.grps <- function (x,
for (j in seq_len(length(x[[i]]$col.name)))
if (x[[i]]$col.name[j] != x[[i]]$appear[j])
rows <- gsub(x[[i]]$col.name[j], x[[i]]$appear[j], rows)
rows <- .gsub("\\(([^\\[\\]]*)\\)\\[(\\d+)\\]", "\\1[\\2]", rows)
rows <- gsub("\\(([^\\[\\]]*?)\\)\\[(\\d+?)\\]", "\\1[\\2]", rows)
rows <- .reverse.consistent.func(rows)
rows <- gsub("\\s", "", rows)
ind.width <- .max.width(rows)
Expand Down Expand Up @@ -305,7 +305,7 @@ print.lm.madlib <- function (x,
for (i in seq_len(length(x$col.name)))
if (x$col.name[i] != x$appear[i])
rows <- gsub(x$col.name[i], x$appear[i], rows)
rows <- gsub("\\(([^\\[\\]]*)\\)\\[(\\d+)\\]", "\\1[\\2]", rows)
rows <- gsub("\\(([^\\[\\]]*?)\\)\\[(\\d+?)\\]", "\\1[\\2]", rows)
rows <- .reverse.consistent.func(rows)
rows <- gsub("\\s", "", rows)
ind.width <- .max.width(rows)
Expand Down Expand Up @@ -362,7 +362,7 @@ show.lm.madlib <- function (object)
for (i in seq_len(length(col.name)))
if (col.name[i] != appear[i])
rows <- gsub(col.name[i], appear[i], rows)
rows <- gsub("\\(([^\\[\\]]*)\\)\\[(\\d+)\\]", "\\1[\\2]", rows)
rows <- gsub("\\(([^\\[\\]]*?)\\)\\[(\\d+?)\\]", "\\1[\\2]", rows)
rows <- .reverse.consistent.func(rows)
rows <- gsub("\\s", "", rows)
rows
Expand Down
40 changes: 20 additions & 20 deletions R/margins.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ margins <- function (model, dydx = ~ Vars(model), newdata = model$data,
{
vars <- gsub("::[\\w\\s]+", "", ind.vars, perl = T)
vars <- gsub("\"", "`", vars)
vars <- .gsub("\\(`([^\\[\\]]*)`\\)\\[(\\d+)\\]", "`\"\\1\"[\\2]`", vars)
vars <- gsub("\\(`([^\\[\\]]*?)`\\)\\[(\\d+?)\\]", "`\"\\1\"[\\2]`", vars)
vars <- gsub("\\s", "", vars)
vars <- .reverse.consistent.func(vars)
vars
Expand Down Expand Up @@ -49,7 +49,7 @@ Vars <- function(model)
v, perl = TRUE)
for (i in seq_along(model.vars))
v <- gsub(no.conflict.names[i], model.vars[i], v, perl = TRUE)
v <- .gsub("([^`]|^)\"([^\\[\\]]*)\"\\[(\\d+)\\]([^`]|$)",
v <- gsub("([^`]|^)\"([^\\[\\]]*?)\"\\[(\\d+?)\\]([^`]|$)",
"(`\"\\2\"[\\3]`)", v, perl = TRUE)
v
}
Expand Down Expand Up @@ -114,9 +114,9 @@ Vars <- function(model)
} else if (grepl("^[^\\[\\]]*\\[[^\\[\\]]*\\]$",
f.vars[i], perl = T)) {
var <- gsub("`", "", f.vars[i])
x.str <- .gsub("([^\\[\\]]*)\\[[^\\[\\]]*\\]", "\\1", var,
x.str <- gsub("([^\\[\\]]*?)\\[[^\\[\\]]*?\\]", "\\1", var,
perl = TRUE)
idx <- .gsub("[^\\[\\]]*\\[([^\\[\\]]*)\\]", "\\1", var,
idx <- gsub("[^\\[\\]]*?\\[([^\\[\\]]*?)\\]", "\\1", var,
perl = TRUE)
idx <- eval(parse(text = idx))
expand.vars <- c(expand.vars, paste("`\"", .strip(x.str, "\""),
Expand Down Expand Up @@ -154,8 +154,8 @@ Vars <- function(model)
function(i) {
sub <- factors[factors[,1] == factors[i,1],]
paste("\"", factors[i,1],
.gsub(paste(".*(", .unique.pattern(), ").*", sep = ""),
"\\1", factors[i,3], perl = TRUE),
gsub(paste(".*(", .unique.pattern(), ").*", sep = ""),
"\\1", factors[i,3], perl = TRUE),
factors[i,4], "\"", sep = "")
}))

Expand Down Expand Up @@ -220,10 +220,10 @@ Vars <- function(model)
"or the table column names!")

expand.vars <- paste("\"", expand.vars, "\"", sep = "")
expand.vars <- .gsub("\"`\"([^\\[\\]]*)\"\\[([^\\[\\]]*)\\]`\"", "\"\\1\"[\\2]",
expand.vars, perl = TRUE)
expand.vars <- .gsub("\"`([^\\[\\]]*)\\[([^\\[\\]]*)\\]`\"", "\"\\1\"[\\2]",
expand.vars, perl = TRUE)
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,
Expand Down Expand Up @@ -264,8 +264,8 @@ margins.lm.madlib <- function(model, dydx = ~ Vars(model),
avgs <- lk(mean(newdata))
avgs <- .expand.avgs(avgs)
names(avgs) <- paste("\"", gsub("_avg$", "", names(avgs)), "\"", sep = "")
names(avgs) <- .gsub("([^`]|^)\"([^\\[\\]]*)_avg\\[(\\d+)\\]\"([^`]|$)",
"\"\\2\"[\\3]", names(avgs))
names(avgs) <- gsub("([^`]|^)\"([^\\[\\]]*?)_avg\\[(\\d+?)\\]\"([^`]|$)",
"\"\\2\"[\\3]", names(avgs))
## } else if (length(at) > 0) {
## at.mean <- TRUE
## avgs <- at
Expand Down Expand Up @@ -308,7 +308,7 @@ margins.lm.madlib <- function(model, dydx = ~ Vars(model),
rows[f$is.factor][i], 1:2],
collapse = ".")
}
rows <- .gsub("([^\\[\\]]*)\"\\[(\\d+)\\]", "\\1[\\2]", rows)
rows <- gsub("([^\\[\\]]*?)\"\\[(\\d+?)\\]", "\\1[\\2]", rows)

res <- data.frame(cbind(Estimate = mar, `Std. Error` = se, `t value` = t,
`Pr(>|t|)` = p), row.names = rows,
Expand Down Expand Up @@ -383,8 +383,8 @@ margins.logregr.madlib <- function(model, dydx = ~ Vars(model),
avgs <- .expand.avgs(avgs)
names(avgs) <- gsub("_avg$", "", names(avgs))
names(avgs) <- paste("\"", gsub("_avg$", "", names(avgs)), "\"", sep = "")
names(avgs) <- .gsub("([^`]|^)\"([^\\[\\]]*)_avg\\[(\\d+)\\]\"([^`]|$)",
"\"\\2\"[\\3]", names(avgs))
names(avgs) <- gsub("([^`]|^)\"([^\\[\\]]*?)_avg\\[(\\d+?)\\]\"([^`]|$)",
"\"\\2\"[\\3]", names(avgs))
expr <- gsub("\\s", "",
paste(deparse(eval(parse(text = paste("substitute(",
expr, ", avgs)", sep = "")))),
Expand Down Expand Up @@ -430,7 +430,7 @@ margins.logregr.madlib <- function(model, dydx = ~ Vars(model),
rows[f$is.factor][i], 1:2],
collapse = ".")
}
rows <- .gsub("([^\\[\\]]*)\"\\[(\\d+)\\]", "\\1[\\2]", rows)
rows <- gsub("([^\\[\\]]*?)\"\\[(\\d+?)\\]", "\\1[\\2]", rows)

res <- data.frame(cbind(Estimate = mar, `Std. Error` = se, `z value` = z,
`Pr(>|z|)` = p),
Expand Down Expand Up @@ -1022,10 +1022,10 @@ margins.logregr.madlib.grps <- function(model, dydx = ~ Vars(model),
{
unique.string <- .unique.pattern()
if (grepl(unique.string, var, perl = TRUE)) {
res1 <- .gsub(paste("^(.*)", unique.string, ".*$", sep = ""), "\\1",
var, perl = TRUE)
res2 <- .gsub(paste("^.*", unique.string, "(.*)$", sep = ""), "\\1",
var, perl = TRUE)
res1 <- gsub(paste("^(.*)", unique.string, ".*$", sep = ""), "\\1",
var, perl = TRUE)
res2 <- gsub(paste("^.*", unique.string, "(.*)$", sep = ""), "\\1",
var, perl = TRUE)
c(res1, res2)
} else
var
Expand Down
Loading

0 comments on commit 1c0f2bf

Please sign in to comment.