From b483a653f99682773bb068764bec4a8ac87b2eb5 Mon Sep 17 00:00:00 2001 From: aho Date: Thu, 29 Oct 2020 16:13:18 +0100 Subject: [PATCH 1/3] Add tests/ into .Rbuildignore --- .Rbuildignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.Rbuildignore b/.Rbuildignore index aa8227b1..19a1af65 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -9,3 +9,4 @@ README\.md$ \..*\.RData$ vignettes .gitlab-ci.yml +^tests$ -- GitLab From ebaf360417ebcbcfe4dadc60cbcd3e335fe01f14 Mon Sep 17 00:00:00 2001 From: aho Date: Fri, 30 Oct 2020 09:30:50 +0100 Subject: [PATCH 2/3] Correct URLs and add paper in DESCRIPTION --- DESCRIPTION | 7 ++++--- R/ConfigFileOpen.R | 2 +- man/Composite.Rd | 1 + man/ConfigFileOpen.Rd | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 3fce5504..99565b9b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -35,7 +35,8 @@ Description: Set of tools to verify forecasts through the computation of typical equations from a model, not a pure observational dataset). Intended for seasonal to decadal climate forecasts although can be useful to verify other kinds of forecasts. The package can be helpful in climate sciences for other purposes - than forecasting. + than forecasting. To find more details, see the review paper Manubens, N.et al. (2018) + . Depends: maps, methods, @@ -55,8 +56,8 @@ Suggests: easyVerification, testthat License: LGPL-3 -URL: https://earth.bsc.es/gitlab/es/s2dverification/wikis/home -BugReports: https://earth.bsc.es/gitlab/es/s2dverification/issues +URL: https://earth.bsc.es/gitlab/es/s2dverification/-/wikis/home +BugReports: https://earth.bsc.es/gitlab/es/s2dverification/-/issues LazyData: true SystemRequirements: cdo Encoding: UTF-8 diff --git a/R/ConfigFileOpen.R b/R/ConfigFileOpen.R index 182b205e..d0a4ada0 100644 --- a/R/ConfigFileOpen.R +++ b/R/ConfigFileOpen.R @@ -147,7 +147,7 @@ #' ConfigEditEntry, ConfigFileOpen, ConfigShowSimilarEntries, ConfigShowTable #'@references #'[1] \url{https://stat.ethz.ch/R-manual/R-devel/library/base/html/regex.html}\cr -#'[2] \url{http://tldp.org/LDP/abs/html/globbingref.html} +#'[2] \url{https://tldp.org/LDP/abs/html/globbingref.html} #'@author History: #' 0.1 - 2015-05 (N. Manubens, \email{nicolau.manubens@@ic3.cat}) - First version #' 1.0 - 2015-11 (N. Manubens, \email{nicolau.manubens@@ic3.cat}) - Removed grid column and storage formats diff --git a/man/Composite.Rd b/man/Composite.Rd index b957d9fd..3d9a3fd8 100644 --- a/man/Composite.Rd +++ b/man/Composite.Rd @@ -84,6 +84,7 @@ data <- 1 : (4 * 5 * 6) dim(data) <- c(lon = 4, lat = 5, case = 6) occ <- c(1, 1, 2, 2, 3, 3) res <- Composite(data, occ, K = 4) + } \author{ History: diff --git a/man/ConfigFileOpen.Rd b/man/ConfigFileOpen.Rd index cff7427e..3630c155 100644 --- a/man/ConfigFileOpen.Rd +++ b/man/ConfigFileOpen.Rd @@ -193,7 +193,7 @@ History: } \references{ [1] \url{https://stat.ethz.ch/R-manual/R-devel/library/base/html/regex.html}\cr -[2] \url{http://tldp.org/LDP/abs/html/globbingref.html} +[2] \url{https://tldp.org/LDP/abs/html/globbingref.html} } \seealso{ ConfigApplyMatchingEntries, ConfigEditDefinition, -- GitLab From 28421a3e116ee815e0e58edf5473de018925fc17 Mon Sep 17 00:00:00 2001 From: aho Date: Fri, 30 Oct 2020 13:59:59 +0100 Subject: [PATCH 3/3] Revise URL --- R/s2dverification.R | 6 +++--- man/s2dverification.Rd | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/R/s2dverification.R b/R/s2dverification.R index d332f38d..f22f06eb 100644 --- a/R/s2dverification.R +++ b/R/s2dverification.R @@ -11,12 +11,12 @@ #' \tabular{ll}{ #'Package: \tab s2dverification\cr #'Type: \tab Package\cr -#'Version: \tab 2.8.4\cr -#'Date: \tab 2019-01-30\cr +#'Version: \tab 2.9.0\cr +#'Date: \tab 2020-10-30\cr #'License: \tab LGPLv3\cr #' } #'Check an overview of the package functionalities and its modules at -#'\url{https://earth.bsc.es/gitlab/es/s2dverification/wikis/home}. +#'\url{https://earth.bsc.es/gitlab/es/s2dverification/-/wikis/home}. #'For more information load the package and check the help for each function #'or the documentation attached to the package. #' diff --git a/man/s2dverification.Rd b/man/s2dverification.Rd index 698fa4ed..47acf220 100644 --- a/man/s2dverification.Rd +++ b/man/s2dverification.Rd @@ -18,12 +18,12 @@ purposes than forecasting. \tabular{ll}{ Package: \tab s2dverification\cr Type: \tab Package\cr -Version: \tab 2.8.4\cr -Date: \tab 2019-01-30\cr +Version: \tab 2.9.0\cr +Date: \tab 2020-10-30\cr License: \tab LGPLv3\cr } Check an overview of the package functionalities and its modules at -\url{https://earth.bsc.es/gitlab/es/s2dverification/wikis/home}. +\url{https://earth.bsc.es/gitlab/es/s2dverification/-/wikis/home}. For more information load the package and check the help for each function or the documentation attached to the package. } -- GitLab