Skip to content

Commit

Permalink
Merge branch 'master' of github.com:rcannood/princurve
Browse files Browse the repository at this point in the history
  • Loading branch information
rcannood committed Oct 15, 2020
2 parents 5712994 + e1db4d4 commit a4b3f2e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/r_cmd_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ jobs:
config:
- {os: windows-latest, r: 'release'}
- {os: macos-latest, r: 'release'}
- {os: ubuntu-16.04, r: '3.2', rspm: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
- {os: ubuntu-16.04, r: '3.3', rspm: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
- {os: ubuntu-16.04, r: '3.4', rspm: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
- {os: ubuntu-16.04, r: '3.5', rspm: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
- {os: ubuntu-16.04, r: '3.6', rspm: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: princurve
Version: 2.1.5
Version: 2.1.5.9001
Title: Fit a Principal Curve in Arbitrary Dimension
Authors@R: c(
person("Trevor", "Hastie", email = "[email protected]", role = "aut"),
Expand Down
6 changes: 3 additions & 3 deletions tests/testthat/test-principal_curve.R
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ test_that("Testing principal_curve with a given start curve", {
})

test_that("Expect principal_curve to error elegantly", {
# expect_error(principal_curve(list(1)))
expect_error(principal_curve(list(1)), "must be a matrix")
expect_error(principal_curve(x, stretch = -1), "larger than or equal to 0")
# expect_error(principal_curve(x, stretch = "10"))
# expect_error(principal_curve(x, start = "10"), "should be a matrix or principal_curve")
expect_error(principal_curve(x, stretch = "10"))
expect_error(principal_curve(x, start = "10"), "should be a matrix or principal")
})

test_that("Testing principal_curve with lowess", {
Expand Down

0 comments on commit a4b3f2e

Please sign in to comment.