Merge pull request #24 from dynverse/devel

Small fixes for release 2.1.1
rcannood · Jul 23, 2018 · a483889 · a483889
2 parents 53ed1f4 + 8bf8ece
commit a483889
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 12 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -5,22 +5,19 @@ Authors@R: c(
   person("Trevor", "Hastie", email = "[email protected]", role = "aut"),
   person("Andreas", "Weingessel", email = "[email protected]", role = "aut"),
   person(
-    "Kurt", 
-    "Hornik", 
+    "Kurt", "Hornik", 
     email = "[email protected]", 
     role = "aut",
     comment = c(ORCID = "0000-0003-4198-9911")
   ),
   person(
-    "Henrik", 
-    "Bengtsson", 
+    "Henrik", "Bengtsson", 
     email = "[email protected]", 
     role = "ctb",
     comment = c(github = "HenrikBengtsson")
   ),
   person(
-    "Robrecht", 
-    "Cannoodt", 
+    "Robrecht", "Cannoodt", 
     email = "[email protected]", 
     role = c("aut", "cre"),
     comment = c(ORCID = "0000-0003-3641-729X", github = "rcannood")

diff --git a/README.Rmd b/README.Rmd
@@ -46,8 +46,16 @@ An overview of the principal curve algorithm is given in the [algorithm](vignett
 
 Using the experimental `approx_points` parameter, princurve 2.1.0 offers major performance improvements for large datasets.
 
-![](vignettes/benchmarks_files/figure-markdown_github/compare-1.png)
-
+```{r compare, fig.height=8, fig.width=8}
+data("benchmarks", package = "princurve")
+ggplot(benchmarks, aes(num_points, median / 1000)) +
+  geom_point() +
+  geom_line() +
+  facet_wrap(~expr, ncol = 1, scales = "free") +
+  theme_bw() +
+  labs(x = "Number of rows in dataset", y = "Time (s)") +
+  scale_colour_brewer(palette = "Set1")
+```
 
 Read more about this feature in the [benchmarks](vignettes/benchmarks.md) vignette.
 

diff --git a/README.md b/README.md
@@ -39,7 +39,18 @@ Benchmarks
 
 Using the experimental `approx_points` parameter, princurve 2.1.0 offers major performance improvements for large datasets.
 
-![](vignettes/benchmarks_files/figure-markdown_github/compare-1.png)
+``` r
+data("benchmarks", package = "princurve")
+ggplot(benchmarks, aes(num_points, median / 1000)) +
+  geom_point() +
+  geom_line() +
+  facet_wrap(~expr, ncol = 1, scales = "free") +
+  theme_bw() +
+  labs(x = "Number of rows in dataset", y = "Time (s)") +
+  scale_colour_brewer(palette = "Set1")
+```
+
+![](man/figures/README_compare-1.png)
 
 Read more about this feature in the [benchmarks](vignettes/benchmarks.md) vignette.
 
@@ -56,6 +67,8 @@ Latest changes in princurve 2.1.1 (2018-07-23)
 
 -   MINOR CHANGE `project_to_curve()`: Attempt to fix rchk warnings by not using `x(i, j) = v` notation but instead `x[j * x.nrow() + i] = v`.
 
+-   DOCUMENTATION: Fix in README documentation.
+
 Latest changes in princurve 2.1.0 (2018-07-14)
 ----------------------------------------------
 

diff --git a/inst/NEWS b/inst/NEWS
@@ -10,6 +10,8 @@ princurve 2.1.1 (2018-07-23)
 
   * MINOR CHANGE `project_to_curve()`: Attempt to fix rchk warnings by not using
     `x(i, j) = v` notation but instead `x[j * x.nrow() + i] = v`.
+
+  * DOCUMENTATION: Fix in README documentation.
 
 princurve 2.1.0 (2018-07-14)
 

diff --git a/inst/NEWS.md b/inst/NEWS.md
@@ -10,6 +10,8 @@
 
   * MINOR CHANGE `project_to_curve()`: Attempt to fix rchk warnings by not using
     `x(i, j) = v` notation but instead `x[j * x.nrow() + i] = v`.
+
+  * DOCUMENTATION: Fix in README documentation.
 
 # princurve 2.1.0 (2018-07-14)
 

diff --git a/man/figures/README_compare-1.png b/man/figures/README_compare-1.png
diff --git a/tests/testthat/test-timings.R b/tests/testthat/test-timings.R
@@ -1,8 +1,7 @@
 context("Ensuring that princurve is at least as fast as legacy princurve")
 
-skip_on_appveyor()
-skip_on_cran()
-skip_on_travis()
+# only run this test on the maintainer's development environment
+skip_if_not(Sys.info()[["user"]] %in% c("rcannood"))
 
 already_installed <- "princurvelegacy" %in% rownames(installed.packages())
 if (!already_installed) {