From 4690747837f7266059dbd56690b52fe51aa5bd2e Mon Sep 17 00:00:00 2001 From: Luca Coraggio Date: Mon, 20 Jun 2022 16:10:02 +0000 Subject: version 2.0.2 --- DESCRIPTION | 8 ++++---- MD5 | 10 +++++----- NAMESPACE | 1 + NEWS | 5 +++++ R/rsc.R | 2 +- man/rmad.Rd | 11 ++++------- 6 files changed, 20 insertions(+), 17 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 93ff38a..ec034fb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -19,8 +19,8 @@ NeedsCompilation: yes Imports: stats, graphics, Matrix, methods, parallel, foreach, doParallel, utils License: GPL (>= 2) -Version: 2.0.1 -Date: 2021-10-21 -Packaged: 2021-10-21 09:41:44 UTC; luco +Version: 2.0.2 +Date: 2022-06-20 +Packaged: 2022-06-20 16:38:10 UTC; luco00 Repository: CRAN -Date/Publication: 2021-10-21 13:10:10 UTC +Date/Publication: 2022-06-20 17:10:02 UTC diff --git a/MD5 b/MD5 index 68dde2b..d254ad9 100644 --- a/MD5 +++ b/MD5 @@ -1,16 +1,16 @@ -1f92959e161df053272c7bd41ee0da95 *DESCRIPTION -9e6c9e63967c10a2dad469679534e3b2 *NAMESPACE -d12cdaf813b043b11ef786424ba55985 *NEWS +bf1532ec667e22d8d1bd27472c7782fd *DESCRIPTION +8c0030301d3f56e71ec4020f932a0cb2 *NAMESPACE +2a0b0fcea949b658304f3a1711849b4b *NEWS 852c9f1717e4dbd26ed8c549edc3c588 *R/check_inputs.R 228fb1b443a4c9eaf4fddcdf9c8a31a9 *R/cv_loss.R 8c8c70764c8a9ab72f23ba031e0f330d *R/plot_print_methods.R 0b8ff21b41422f17ef7822a33ac061da *R/rmad.R -3e98806cb071a0b84028b7e5bb022cc5 *R/rsc.R +d1f433016fbde7e9f32dc8c02ce47c53 *R/rsc.R 98992e4ed337da761f641cb2960f7579 *R/rsc_cv.R cafa1636fd3af0dd260cbfcb27df210e *R/zzz.R 02a06053793e54ce413a378a05ccc3ce *inst/CITATION 1e6af804927098cfa6c235278682578c *man/plot.cv_rsc.Rd -b7a3fee379fb124e3105841679dddd75 *man/rmad.Rd +25f03f13d9f6c1fc5599f7aa36072a31 *man/rmad.Rd 8cc5c9373c7aa8835e9818d0de274ece *man/rsc.Rd 63d3e58e9bdc0da9969feb6ce69d005f *man/rsc_cv.Rd 95e3011e37d9dde0d75f3a3819b2acd3 *src/Makevars diff --git a/NAMESPACE b/NAMESPACE index 3d5ba56..7649502 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -3,6 +3,7 @@ import("stats", "graphics", "Matrix") ## selective imports from pkgs importFrom("methods", "as") +importFrom("methods", "is") importFrom("foreach", "foreach", "%dopar%") importFrom("parallel","detectCores") importFrom("doParallel", "registerDoParallel", "stopImplicitCluster") diff --git a/NEWS b/NEWS index 2027b02..db02b58 100755 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +## 29/06/2022 at 18:28:00 (CEST) +* v2.0.2 + + fixed rmad.Rd documentation file + + fixed rsc.R class checking + ## 21/10/2021 at 11:37:00 (CEST) * v2.0.1: + fixed include C system headers before R.h diff --git a/R/rsc.R b/R/rsc.R index 8182d1c..f82df51 100644 --- a/R/rsc.R +++ b/R/rsc.R @@ -4,7 +4,7 @@ rsc <- function(cv, threshold = "minimum"){ ## cv = u ## a class cv_rsc or any other correlation matrix ## threshold = "minimum" ## "minimum", "minimum1se" or numeric in (0,1) - if(class(cv) == "rsc_cv"){ + if(is(cv, "rsc_cv")){ ## check threshold if(is.numeric(threshold)){ diff --git a/man/rmad.Rd b/man/rmad.Rd index 40ed6e0..2ecacb7 100755 --- a/man/rmad.Rd +++ b/man/rmad.Rd @@ -91,14 +91,11 @@ \value{ - \item{If \code{x} is a matrix or a data.frame}{ - Returns a correlation matrix of class \code{"dspMatrix"} (S4 class object) + If \code{x} is a matrix or a data.frame, returns a correlation matrix of class \code{"dspMatrix"} (S4 class object) as defined in the \code{\link{Matrix}} package. - } - \item{If \code{x} and \code{y} are numerical vectors}{ - Returns a numerical value, that is the RMAD correlation coefficient - between \code{x} and \code{y}. - } + + If \code{x} and \code{y} are numerical vectors, returns a numerical value, that is the RMAD correlation coefficient + between \code{x} and \code{y}. } -- cgit v1.2.3