projects
/
agghoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update package to send on CRAN
[agghoo.git]
/
R
/
compareTo.R
diff --git
a/R/compareTo.R
b/R/compareTo.R
index
28cb711
..
fe5b24d
100644
(file)
--- a/
R/compareTo.R
+++ b/
R/compareTo.R
@@
-78,8
+78,6
@@
CVvoting_core <- function(data, target, task, gmodel, params, loss, CV) {
#' Run and eval the standard cross-validation procedure.
#' Parameters are rather explicit except "floss", which corresponds to the
#' "final" loss function, applied to compute the error on testing dataset.
#' Run and eval the standard cross-validation procedure.
#' Parameters are rather explicit except "floss", which corresponds to the
#' "final" loss function, applied to compute the error on testing dataset.
-#'
-#' @export
standardCV_run <- function(
dataTrain, dataTest, targetTrain, targetTest, floss, verbose, ...
) {
standardCV_run <- function(
dataTrain, dataTest, targetTrain, targetTest, floss, verbose, ...
) {
@@
-104,8
+102,6
@@
standardCV_run <- function(
#' Run and eval the voting cross-validation procedure.
#' Parameters are rather explicit except "floss", which corresponds to the
#' "final" loss function, applied to compute the error on testing dataset.
#' Run and eval the voting cross-validation procedure.
#' Parameters are rather explicit except "floss", which corresponds to the
#' "final" loss function, applied to compute the error on testing dataset.
-#'
-#' @export
CVvoting_run <- function(
dataTrain, dataTest, targetTrain, targetTest, floss, verbose, ...
) {
CVvoting_run <- function(
dataTrain, dataTest, targetTrain, targetTest, floss, verbose, ...
) {
@@
-130,8
+126,6
@@
CVvoting_run <- function(
#' Run and eval the agghoo procedure.
#' Parameters are rather explicit except "floss", which corresponds to the
#' "final" loss function, applied to compute the error on testing dataset.
#' Run and eval the agghoo procedure.
#' Parameters are rather explicit except "floss", which corresponds to the
#' "final" loss function, applied to compute the error on testing dataset.
-#'
-#' @export
agghoo_run <- function(
dataTrain, dataTest, targetTrain, targetTest, floss, verbose, ...
) {
agghoo_run <- function(
dataTrain, dataTest, targetTrain, targetTest, floss, verbose, ...
) {
@@
-209,7
+203,7
@@
compareTo <- function(
compareMulti <- function(
data, target, method_s, N=100, nc=NA, floss=NULL, verbose=TRUE, ...
) {
compareMulti <- function(
data, target, method_s, N=100, nc=NA, floss=NULL, verbose=TRUE, ...
) {
- require(parallel)
+
base::
require(parallel)
if (is.na(nc))
nc <- parallel::detectCores()
if (is.na(nc))
nc <- parallel::detectCores()