[Analogue-commits] r205 - pkg/R

[noreply at r-forge.r-project.org]

Author: gsimpson
Date: 2011-01-29 00:18:11 +0100 (Sat, 29 Jan 2011)
New Revision: 205

Modified:
   pkg/R/cma.R
Log:
fix NOTE during package check

Modified: pkg/R/cma.R
===================================================================
--- pkg/R/cma.R	2011-01-28 18:36:16 UTC (rev 204)
+++ pkg/R/cma.R	2011-01-28 23:18:11 UTC (rev 205)
@@ -73,23 +73,23 @@
         K <- TRUE
     }
     if(K) {
-        FUN <- function(x, ks) {
+        sortByK <- function(x, ks) {
             x <- sort(x)
             x[ks]
         }
         close <- vector(mode = "list", length = n.samp)
         ks <- seq_len(k)
         for(i in seq_along(close)) {
-            close[[i]] <- FUN(object$Dij[, i], ks)
+            close[[i]] <- sortByK(object$Dij[, i], ks)
         }
         each.analogs <- sapply(close, length)
         names(each.analogs) <- names(close) <- nams
     } else {
-        FUN <- function(x, cutoff) {
+        sortByCutoff <- function(x, cutoff) {
             x <- sort(x)
             x <- x[x <= cutoff]
         }
-        close <- apply(object$Dij, 2, FUN, cutoff = cutoff)
+        close <- apply(object$Dij, 2, sortByCutoff, cutoff = cutoff)
         each.analogs <- sapply(close, length)
         k <- NULL
         names(each.analogs) <- names(close) <- nams
@@ -127,23 +127,23 @@
         K <- TRUE
     }
     if(K) {
-        FUN <- function(x, ks) {
+        sortByK <- function(x, ks) {
             x <- sort(x)
             x[ks]
         }
         close <- vector(mode = "list", length = n.samp)
         ks <- seq_len(k)
         for(i in seq_along(close)) {
-            close[[i]] <- FUN(object$Dij[, i], ks)
+            close[[i]] <- sortByK(object$Dij[, i], ks)
         }
         each.analogs <- sapply(close, length)
         names(each.analogs) <- names(close) <- nams
     } else {
-        FUN <- function(x, cutoff) {
+        sortByCutoff <- function(x, cutoff) {
             x <- sort(x)
             x <- x[x <= cutoff]
         }
-        close <- apply(object$Dij, 2, FUN, cutoff = cutoff)
+        close <- apply(object$Dij, 2, sortByCutoff, cutoff = cutoff)
         each.analogs <- sapply(close, length)
         k <- NULL
         names(each.analogs) <- names(close) <- nams