diff --git a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/model.R b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/model.R index 861b58860338027a5e7f74cd9a069e81e87df93d..ccd97715e87943174ac560ac2b5e9b987887d9bd 100644 --- a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/model.R +++ b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/model.R @@ -782,7 +782,7 @@ modelframe <- function(formula, rownames, variables, varnames, dots, dotnames, s } data[[j]] <- dots[[i]] - dataNames[[j]] <- paste("(", ss, ")") + dataNames[[j]] <- paste0("(", ss, ")") j <- j + 1L } } else { diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test index 5ef348d3f90f03ce43dace634a436873c4bafd96..acc052bd1ca96d8140feb69883cb3d501dd58135 100644 --- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test +++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test @@ -163468,6 +163468,14 @@ data frame with 0 columns and 0 rows 9 m 8 c 10 f 9 c +##com.oracle.truffle.r.test.library.stats.TestFormulae.testModelFrameWithWeights# +#model.frame(formula = cyl ~ disp, data = mtcars[1:4,], weights = seq_len(nrow(mtcars[1:4,]))) + cyl disp (weights) +Mazda RX4 6 160 1 +Mazda RX4 Wag 6 160 2 +Datsun 710 4 108 3 +Hornet 4 Drive 6 258 4 + ##com.oracle.truffle.r.test.library.stats.TestFormulae.testModelMatrix# #{y<-0:9;z<-1:10;k<-2:11;w<-3:12;m<-4:13;u<-5:14;v<-6:15;; model.matrix(model.frame(terms.formula(u~z*k+w*m))) } (Intercept) z k w m z:k w:m diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestFormulae.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestFormulae.java index f2d4ab6beb53ac8fca8e9ce86e6c3355877b0ecb..d3a56d60ae5847319716f77e6f77ae564a4bae7d 100644 --- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestFormulae.java +++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/stats/TestFormulae.java @@ -115,4 +115,9 @@ public class TestFormulae extends TestBase { public void testDotWithNoFramenames() { assertEval(Output.IgnoreErrorContext, "terms.formula(x ~ .^4)"); } + + @Test + public void testModelFrameWithWeights() { + assertEval("model.frame(formula = cyl ~ disp, data = mtcars[1:4,], weights = seq_len(nrow(mtcars[1:4,])))"); + } }