From 9d448d722c99c9f67cbc612c96db3e6272d01722 Mon Sep 17 00:00:00 2001 From: Wouter Saelens Date: Thu, 27 Jun 2019 10:27:25 +0200 Subject: [PATCH 1/4] output the complete error message fixes #142 --- R/method_infer_trajectory.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/R/method_infer_trajectory.R b/R/method_infer_trajectory.R index a9daa481..3baee6c9 100644 --- a/R/method_infer_trajectory.R +++ b/R/method_infer_trajectory.R @@ -193,7 +193,8 @@ infer_trajectory <- dynutils::inherit_default_params( invisible() } else if (is.null(design$model[[1]])) { error <- design$summary[[1]]$error[[1]] - stop("Error during trajectory inference \n", crayon::bold(error), call. = FALSE) + cat(crayon::red(crayon::bold(error))) + stop("Error during trajectory inference, see output above \U2191\U2191\U2191" , call. = FALSE) } else { first(design$model) } From 913c21d29b28f1c1be4309ed4e8c263c97c2f508 Mon Sep 17 00:00:00 2001 From: Wouter Saelens Date: Thu, 27 Jun 2019 10:28:55 +0200 Subject: [PATCH 2/4] add news --- DESCRIPTION | 10 +++++----- inst/NEWS.md | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index ce3d57f5..87b6cd7c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: dynwrap Type: Package Title: Common trajectory model for representing trajectories from all sources -Version: 1.1.3 +Version: 1.1.3.9000 Authors@R: c( person( "Robrecht", @@ -66,7 +66,7 @@ Suggests: viridis VignetteBuilder: knitr Remotes: - dynverse/babelwhale@master, - dynverse/dynutils@master, - dynverse/dynparam@master, - dynverse/dyndimred@master + dynverse/babelwhale@devel, + dynverse/dynutils@devel, + dynverse/dynparam@devel, + dynverse/dyndimred@devel diff --git a/inst/NEWS.md b/inst/NEWS.md index bf31b51a..c070dff6 100644 --- a/inst/NEWS.md +++ b/inst/NEWS.md @@ -1,3 +1,7 @@ +# dynwrap 1.1.4 (unreleased) + +* BUG FIX: Fixed #142 where the error message was truncated + # dynwrap 1.1.3 (05-06-2019) * MINOR CHANGE `add_dimred()`: Add a separate argument for specifying the projected dimred rather than From 3ee2b81b168c5833c3237a4d60db9e192e936b3b Mon Sep 17 00:00:00 2001 From: Wouter Saelens Date: Thu, 27 Jun 2019 17:25:10 +0200 Subject: [PATCH 3/4] add news for 1.1.4 release --- README.md | 12 ++++++------ inst/NEWS | 8 ++++++-- inst/NEWS.md | 4 ++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 1b4efb1c..766937c9 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,10 @@ changes. +### Recent changes in dynwrap 1.1.4 (27-06-2019) + + - BUG FIX: Fixed \#142 where the error message was truncated + ### Recent changes in dynwrap 1.1.3 (05-06-2019) - MINOR CHANGE `add_dimred()`: Add a separate argument for specifying @@ -58,12 +62,8 @@ changes. be passed as additional columns in `dimred`. - BUG FIX: Fix for dynverse/dyno\#52, do specify whether or not to use - optional priors when passed - -### Recent changes in dynwrap 1.1.2 (08-05-2019) - - - FEATURE: Add leaves\_n as prior -information + optional priors when +passed. ## Dynverse dependencies diff --git a/inst/NEWS b/inst/NEWS index d74a8fb4..3a51f5fd 100644 --- a/inst/NEWS +++ b/inst/NEWS @@ -1,9 +1,13 @@ +dynwrap 1.1.4 (27-06-2019) + +* BUG FIX: Fixed #142 where the error message was truncated + dynwrap 1.1.3 (05-06-2019) * MINOR CHANGE `add_dimred()`: Add a separate argument for specifying the projected dimred rather than expecting the projected dimred to be passed as additional columns in `dimred`. -* BUG FIX: Fix for dynverse/dyno#52, do specify whether or not to use optional priors when passed +* BUG FIX: Fix for dynverse/dyno#52, do specify whether or not to use optional priors when passed. dynwrap 1.1.2 (08-05-2019) @@ -11,7 +15,7 @@ dynwrap 1.1.2 (08-05-2019) dynwrap 1.1.1 (08-05-2019) -* BUG FIX: Fixed bug for directed geodesic distances with disconnected graphs, dynverse/dynplot#37 +* BUG FIX: Fixed bug for directed geodesic distances with disconnected gra phs, dynverse/dynplot#37 dynwrap 1.1 (07-05-2019) diff --git a/inst/NEWS.md b/inst/NEWS.md index c070dff6..04108524 100644 --- a/inst/NEWS.md +++ b/inst/NEWS.md @@ -1,4 +1,4 @@ -# dynwrap 1.1.4 (unreleased) +# dynwrap 1.1.4 (27-06-2019) * BUG FIX: Fixed #142 where the error message was truncated @@ -15,7 +15,7 @@ # dynwrap 1.1.1 (08-05-2019) -* BUG FIX: Fixed bug for directed geodesic distances with disconnected graphs, dynverse/dynplot#37 +* BUG FIX: Fixed bug for directed geodesic distances with disconnected gra phs, dynverse/dynplot#37 # dynwrap 1.1 (07-05-2019) From d532d94da11b1ccfbdd472083d492646d1de8260 Mon Sep 17 00:00:00 2001 From: Wouter Saelens Date: Thu, 27 Jun 2019 17:25:56 +0200 Subject: [PATCH 4/4] prepare for 1.1.4 release --- DESCRIPTION | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 87b6cd7c..49c489c6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: dynwrap Type: Package Title: Common trajectory model for representing trajectories from all sources -Version: 1.1.3.9000 +Version: 1.1.4 Authors@R: c( person( "Robrecht", @@ -66,7 +66,7 @@ Suggests: viridis VignetteBuilder: knitr Remotes: - dynverse/babelwhale@devel, - dynverse/dynutils@devel, - dynverse/dynparam@devel, - dynverse/dyndimred@devel + dynverse/babelwhale@master, + dynverse/dynutils@master, + dynverse/dynparam@master, + dynverse/dyndimred@master