You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2018/12/08 14:23:56 UTC
spark git commit: [SPARK-24207][R] follow-up PR for SPARK-24207 to
fix code style problems
Repository: spark
Updated Branches:
refs/heads/master 2ea9792fd -> 678e1aca6
[SPARK-24207][R] follow-up PR for SPARK-24207 to fix code style problems
## What changes were proposed in this pull request?
follow-up PR for SPARK-24207 to fix code style problems
Closes #23256 from huaxingao/spark-24207-cnt.
Authored-by: Huaxin Gao <hu...@us.ibm.com>
Signed-off-by: Hyukjin Kwon <gu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/678e1aca
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/678e1aca
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/678e1aca
Branch: refs/heads/master
Commit: 678e1aca6901944c119d2ec56169d4e69fce66de
Parents: 2ea9792
Author: Huaxin Gao <hu...@us.ibm.com>
Authored: Sat Dec 8 22:23:50 2018 +0800
Committer: Hyukjin Kwon <gu...@apache.org>
Committed: Sat Dec 8 22:23:50 2018 +0800
----------------------------------------------------------------------
R/pkg/R/mllib_fpm.R | 7 +++--
R/pkg/tests/fulltests/test_mllib_fpm.R | 29 ++++++++++----------
R/pkg/vignettes/sparkr-vignettes.Rmd | 7 +++--
examples/src/main/r/ml/prefixSpan.R | 9 +++---
.../spark/examples/ml/FPGrowthExample.scala | 3 --
.../spark/examples/ml/PrefixSpanExample.scala | 3 --
6 files changed, 28 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/678e1aca/R/pkg/R/mllib_fpm.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/mllib_fpm.R b/R/pkg/R/mllib_fpm.R
index ac37580..c248e9e 100644
--- a/R/pkg/R/mllib_fpm.R
+++ b/R/pkg/R/mllib_fpm.R
@@ -190,9 +190,10 @@ setMethod("write.ml", signature(object = "FPGrowthModel", path = "character"),
#' @examples
#' \dontrun{
#' df <- createDataFrame(list(list(list(list(1L, 2L), list(3L))),
-#' list(list(list(1L), list(3L, 2L), list(1L, 2L))),
-#' list(list(list(1L, 2L), list(5L))),
-#' list(list(list(6L)))), schema = c("sequence"))
+#' list(list(list(1L), list(3L, 2L), list(1L, 2L))),
+#' list(list(list(1L, 2L), list(5L))),
+#' list(list(list(6L)))),
+#' schema = c("sequence"))
#' frequency <- spark.findFrequentSequentialPatterns(df, minSupport = 0.5, maxPatternLength = 5L,
#' maxLocalProjDBSize = 32000000L)
#' showDF(frequency)
http://git-wip-us.apache.org/repos/asf/spark/blob/678e1aca/R/pkg/tests/fulltests/test_mllib_fpm.R
----------------------------------------------------------------------
diff --git a/R/pkg/tests/fulltests/test_mllib_fpm.R b/R/pkg/tests/fulltests/test_mllib_fpm.R
index daf9ff9..bc1e175 100644
--- a/R/pkg/tests/fulltests/test_mllib_fpm.R
+++ b/R/pkg/tests/fulltests/test_mllib_fpm.R
@@ -84,19 +84,20 @@ test_that("spark.fpGrowth", {
})
test_that("spark.prefixSpan", {
- df <- createDataFrame(list(list(list(list(1L, 2L), list(3L))),
- list(list(list(1L), list(3L, 2L), list(1L, 2L))),
- list(list(list(1L, 2L), list(5L))),
- list(list(list(6L)))), schema = c("sequence"))
- result1 <- spark.findFrequentSequentialPatterns(df, minSupport = 0.5, maxPatternLength = 5L,
- maxLocalProjDBSize = 32000000L)
-
- expected_result <- createDataFrame(list(list(list(list(1L)), 3L),
- list(list(list(3L)), 2L),
- list(list(list(2L)), 3L),
- list(list(list(1L, 2L)), 3L),
- list(list(list(1L), list(3L)), 2L)),
- schema = c("sequence", "freq"))
- })
+ df <- createDataFrame(list(list(list(list(1L, 2L), list(3L))),
+ list(list(list(1L), list(3L, 2L), list(1L, 2L))),
+ list(list(list(1L, 2L), list(5L))),
+ list(list(list(6L)))),
+ schema = c("sequence"))
+ result <- spark.findFrequentSequentialPatterns(df, minSupport = 0.5, maxPatternLength = 5L,
+ maxLocalProjDBSize = 32000000L)
+
+ expected_result <- createDataFrame(list(list(list(list(1L)), 3L), list(list(list(3L)), 2L),
+ list(list(list(2L)), 3L), list(list(list(1L, 2L)), 3L),
+ list(list(list(1L), list(3L)), 2L)),
+ schema = c("sequence", "freq"))
+
+ expect_equivalent(expected_result, result)
+})
sparkR.session.stop()
http://git-wip-us.apache.org/repos/asf/spark/blob/678e1aca/R/pkg/vignettes/sparkr-vignettes.Rmd
----------------------------------------------------------------------
diff --git a/R/pkg/vignettes/sparkr-vignettes.Rmd b/R/pkg/vignettes/sparkr-vignettes.Rmd
index f80b45b..1c6a03c 100644
--- a/R/pkg/vignettes/sparkr-vignettes.Rmd
+++ b/R/pkg/vignettes/sparkr-vignettes.Rmd
@@ -1019,9 +1019,10 @@ head(predict(fpm, df))
```{r}
df <- createDataFrame(list(list(list(list(1L, 2L), list(3L))),
- list(list(list(1L), list(3L, 2L), list(1L, 2L))),
- list(list(list(1L, 2L), list(5L))),
- list(list(list(6L)))), schema = c("sequence"))
+ list(list(list(1L), list(3L, 2L), list(1L, 2L))),
+ list(list(list(1L, 2L), list(5L))),
+ list(list(list(6L)))),
+ schema = c("sequence"))
head(spark.findFrequentSequentialPatterns(df, minSupport = 0.5, maxPatternLength = 5L))
```
http://git-wip-us.apache.org/repos/asf/spark/blob/678e1aca/examples/src/main/r/ml/prefixSpan.R
----------------------------------------------------------------------
diff --git a/examples/src/main/r/ml/prefixSpan.R b/examples/src/main/r/ml/prefixSpan.R
index 9b70573..02908ae 100644
--- a/examples/src/main/r/ml/prefixSpan.R
+++ b/examples/src/main/r/ml/prefixSpan.R
@@ -28,9 +28,10 @@ sparkR.session(appName = "SparkR-ML-prefixSpan-example")
# Load training data
df <- createDataFrame(list(list(list(list(1L, 2L), list(3L))),
- list(list(list(1L), list(3L, 2L), list(1L, 2L))),
- list(list(list(1L, 2L), list(5L))),
- list(list(list(6L)))), schema = c("sequence"))
+ list(list(list(1L), list(3L, 2L), list(1L, 2L))),
+ list(list(list(1L, 2L), list(5L))),
+ list(list(list(6L)))),
+ schema = c("sequence"))
# Finding frequent sequential patterns
frequency <- spark.findFrequentSequentialPatterns(df, minSupport = 0.5, maxPatternLength = 5L,
@@ -39,4 +40,4 @@ showDF(frequency)
# $example off$
-sparkR.session.stop()
\ No newline at end of file
+sparkR.session.stop()
http://git-wip-us.apache.org/repos/asf/spark/blob/678e1aca/examples/src/main/scala/org/apache/spark/examples/ml/FPGrowthExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/spark/examples/ml/FPGrowthExample.scala b/examples/src/main/scala/org/apache/spark/examples/ml/FPGrowthExample.scala
index 59110d7..bece0d9 100644
--- a/examples/src/main/scala/org/apache/spark/examples/ml/FPGrowthExample.scala
+++ b/examples/src/main/scala/org/apache/spark/examples/ml/FPGrowthExample.scala
@@ -17,8 +17,6 @@
package org.apache.spark.examples.ml
-// scalastyle:off println
-
// $example on$
import org.apache.spark.ml.fpm.FPGrowth
// $example off$
@@ -64,4 +62,3 @@ object FPGrowthExample {
spark.stop()
}
}
-// scalastyle:on println
http://git-wip-us.apache.org/repos/asf/spark/blob/678e1aca/examples/src/main/scala/org/apache/spark/examples/ml/PrefixSpanExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/spark/examples/ml/PrefixSpanExample.scala b/examples/src/main/scala/org/apache/spark/examples/ml/PrefixSpanExample.scala
index 0a2d310..b4e0811 100644
--- a/examples/src/main/scala/org/apache/spark/examples/ml/PrefixSpanExample.scala
+++ b/examples/src/main/scala/org/apache/spark/examples/ml/PrefixSpanExample.scala
@@ -17,8 +17,6 @@
package org.apache.spark.examples.ml
-// scalastyle:off println
-
// $example on$
import org.apache.spark.ml.fpm.PrefixSpan
// $example off$
@@ -59,4 +57,3 @@ object PrefixSpanExample {
spark.stop()
}
}
-// scalastyle:on println
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org