Skip to content

Commit 3a536b1

Browse files
committed
fixing use of inheritsParam + update Rbuildignore with qmd files
1 parent aa4bb70 commit 3a536b1

13 files changed

Lines changed: 47 additions & 79 deletions

File tree

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.travis.yml
22
AUTHORS
33
README.md
4+
README.qmd
45
README.rmd
56
README_cache
67
^.*\.Rproj$

R/aricode.R

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ ARI <- function(c1, c2) {
109109
#'
110110
#' A function to compute the rand index between two classifications
111111
#'
112-
#' @inheritDotParams ARI c1 c2
112+
#' @inheritParams ARI
113113
#' @return a scalar with the rand index.
114114
#' @seealso \code{\link{ARI}}, \code{\link{NID}}, \code{\link{NVI}}, \code{\link{NMI}}, \code{\link{clustComp}}
115115
#' @examples
@@ -134,7 +134,7 @@ RI <- function(c1, c2) {
134134
#'
135135
#' A function to compute a modified adjusted rand index between two classifications as proposed by Sundqvist et al. in prep, based on a multinomial model.
136136
#'
137-
#' @inheritDotParams ARI c1 c2
137+
#' @inheritParams ARI
138138
#' @return a scalar with the modified ARI.
139139
#' @seealso \code{\link{ARI}}, \code{\link{NID}}, \code{\link{NVI}}, \code{\link{NMI}}, \code{\link{clustComp}}
140140
#' @examples
@@ -178,7 +178,7 @@ MARI <- function(c1, c2) {
178178
#'
179179
#' A function to compute a modified adjusted rand index between two classifications as proposed by Sundqvist et al. in prep, based on a multinomial model. Raw means, that the index is not divided by the (maximum - expected) value.
180180
#'
181-
#' @inheritDotParams ARI c1 c2
181+
#' @inheritParams ARI
182182
#' @return a scalar with the modified ARI without the division by the (maximum - expected)
183183
#' @seealso \code{\link{ARI}}, \code{\link{NID}}, \code{\link{NVI}}, \code{\link{NMI}}, \code{\link{clustComp}}
184184
#' @examples
@@ -214,7 +214,7 @@ MARIraw <- function(c1, c2) {
214214
#'
215215
#' A function to compute the Chi-2 statistics
216216
#'
217-
#' @inheritDotParams ARI c1 c2
217+
#' @inheritParams ARI
218218
#' @return a scalar with the chi-square statistics.
219219
#' @seealso \code{\link{ARI}}, \code{\link{NID}}, \code{\link{NVI}}, \code{\link{NMI}}, \code{\link{clustComp}}
220220
#' @examples
@@ -238,7 +238,7 @@ Chi2 <- function(c1, c2) {
238238
#'
239239
#' A function to compute the Frobenius norm between two classification as defined in Lajugie et al. 2014 and Arlot et al 2019
240240
#'
241-
#' @inheritDotParams ARI c1 c2
241+
#' @inheritParams ARI
242242
#' @return a scalar with the chi-square statistics.
243243
#' @seealso \code{\link{ARI}}, \code{\link{NID}}, \code{\link{NVI}}, \code{\link{NMI}}, \code{\link{clustComp}}
244244
#' @references
@@ -262,7 +262,7 @@ Frobenius <- function(c1, c2) {
262262
#'
263263
#' A function to compute the empirical entropy for two vectors of classification and the joint entropy
264264
#'
265-
#' @inheritDotParams ARI c1 c2
265+
#' @inheritParams ARI
266266
#' @return a list with the two conditional entropies, the joint entropy and output of sortPairs.
267267
#' @examples
268268
#' data(iris)
@@ -286,7 +286,7 @@ entropy <- function(c1, c2) {
286286
#'
287287
#' A function various measures of similarity between two classifications
288288
#'
289-
#' @inheritDotParams ARI c1 c2
289+
#' @inheritParams ARI
290290
#' @return a list with all the measures available
291291
#' @seealso \code{\link{RI}}, \code{\link{NID}}, \code{\link{NVI}}, \code{\link{NMI}}, \code{\link{ARI}}
292292
#' @examples
@@ -328,7 +328,7 @@ clustComp <- function(c1, c2) {
328328
#'
329329
#' A function to compute the adjusted mutual information between two classifications
330330
#'
331-
#' @inheritDotParams ARI c1 c2
331+
#' @inheritParams ARI
332332
#' @return a scalar with the adjusted rand index.
333333
#' @seealso \code{\link{ARI}}, \code{\link{RI}}, \code{\link{NID}}, \code{\link{NVI}}, \code{\link{NMI}}, \code{\link{clustComp}}
334334
#' @examples
@@ -349,7 +349,7 @@ AMI <- function(c1, c2) {
349349
#'
350350
#' A function to compute the NMI between two classifications
351351
#'
352-
#' @inheritDotParams ARI c1 c2
352+
#' @inheritParams ARI
353353
#' @param variant a string in ("max", "min", "sqrt", "sum", "joint"): different variants of NMI. Default use "max".
354354
#' @return a scalar with the normalized mutual information .
355355
#' @seealso \code{\link{RI}}, \code{\link{NID}}, \code{\link{NVI}}, \code{\link{ARI}}, \code{\link{clustComp}}
@@ -379,7 +379,7 @@ NMI <- function(c1, c2, variant = c("max", "min", "sqrt", "sum", "joint")) {
379379
#'
380380
#' A function to compute the NID between two classifications
381381
#'
382-
#' @inheritDotParams ARI c1 c2
382+
#' @inheritParams ARI
383383
#' @return a scalar with the normalized information distance .
384384
#' @seealso \code{\link{RI}}, \code{\link{NMI}}, \code{\link{NVI}}, \code{\link{ARI}}, \code{\link{clustComp}}
385385
#' @examples
@@ -398,7 +398,7 @@ NID <- function(c1, c2) {
398398
#'
399399
#' A function to compute the NVI between two classifications
400400
#'
401-
#' @inheritDotParams ARI c1 c2
401+
#' @inheritParams ARI
402402
#' @return a scalar with the normalized variation of information.
403403
#' @seealso \code{\link{RI}}, \code{\link{NID}}, \code{\link{NMI}}, \code{\link{ARI}}, \code{\link{clustComp}}
404404
#' @examples

man/AMI.Rd

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/Chi2.Rd

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/Frobenius.Rd

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/MARI.Rd

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/MARIraw.Rd

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/NID.Rd

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/NMI.Rd

Lines changed: 5 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/NVI.Rd

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)