Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
rcannood committed May 29, 2019
2 parents 2927ff2 + 87d1c5a commit 2a1823f
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
3 changes: 2 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ Authors@R: c(
role = c("aut", "cre"),
comment = c(ORCID = "0000-0003-3641-729X", github = "rcannood")
))
Description: Fitting a principal curve to a data matrix in arbitrary dimensions.
Description: Fitting a principal curve to a data matrix in arbitrary dimensions.
Hastie and Stuetzle (1989) <doi:10.2307/2289936>.
License: GPL-2
Encoding: UTF-8
Depends: R (>= 3.0)
Expand Down
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ plot(fit); whiskers(x, fit$s, col = "gray")
See `?principal_curve` for more information on how to use the `princurve` package.

## Latest changes
Check out `news(package = "princurve")` or [NEWS.md](inst/NEWS.md) for a full list of changes.
Check out `news(package = "princurve")` for a full list of changes.

<!-- This section gets automatically generated from inst/NEWS.md, and also generates inst/NEWS -->

Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,12 @@ See `?principal_curve` for more information on how to use the

## Latest changes

Check out `news(package = "princurve")` or [NEWS.md](inst/NEWS.md) for a
full list of
Check out `news(package = "princurve")` for a full list of
changes.

<!-- This section gets automatically generated from inst/NEWS.md, and also generates inst/NEWS -->

### Recent changes in princurve 2.1.4 (unreleased)
### Recent changes in princurve 2.1.4 (2019-05-29)

- Fix warning in `stats::approx()` due to changes made in R 3.6.

Expand All @@ -63,7 +62,7 @@ changes.
- Removed extra dependencies in princurve by removing vignettes; fixes
\#28.

- Fully deprecated `principal.curve()` function.
- Fully deprecated `principal.curve()` and `get.lam()`.

## References

Expand Down
4 changes: 2 additions & 2 deletions inst/NEWS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
princurve 2.1.4 (unreleased)
princurve 2.1.4 (2019-05-29)

* Fix warning in `stats::approx()` due to changes made in R 3.6.

Expand All @@ -8,7 +8,7 @@ princurve 2.1.3 (2018-09-10)

* Removed extra dependencies in princurve by removing vignettes; fixes #28.

* Fully deprecated `principal.curve()` function.
* Fully deprecated `principal.curve()` and `get.lam()`.

princurve 2.1.2 (2018-07-24)

Expand Down
4 changes: 2 additions & 2 deletions inst/NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# princurve 2.1.4 (unreleased)
# princurve 2.1.4 (2019-05-29)

* Fix warning in `stats::approx()` due to changes made in R 3.6.

Expand All @@ -8,7 +8,7 @@

* Removed extra dependencies in princurve by removing vignettes; fixes #28.

* Fully deprecated `principal.curve()` function.
* Fully deprecated `principal.curve()` and `get.lam()`.

# princurve 2.1.2 (2018-07-24)

Expand Down

0 comments on commit 2a1823f

Please sign in to comment.