Skip to content

Commit

Permalink
Tweak default values of maxit and epsilon
Browse files Browse the repository at this point in the history
  • Loading branch information
wenjie2wang committed Jan 8, 2024
1 parent 7e2880a commit 6830aae
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions R/abclass.R
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ abclass <- function(x, y,
##' @param boost_umin A negative number for adjusting the boosting loss for the
##' internal majorization procedure.
##' @param maxit A positive integer specifying the maximum number of iteration.
##' The default value is \code{10^5}.
##' The default value is \code{10^4}.
##' @param epsilon A positive number specifying the relative tolerance that
##' determines convergence. The default value is \code{1e-6}.
##' determines convergence. The default value is \code{1e-7}.
##' @param standardize A logical value indicating if each column of the design
##' matrix should be standardized internally to have mean zero and standard
##' deviation equal to the sample size. The default value is \code{TRUE}.
Expand All @@ -154,8 +154,8 @@ abclass.control <- function(lambda = NULL,
lum_a = 1.0,
lum_c = 0.0,
boost_umin = - 5.0,
maxit = 1e5L,
epsilon = 1e-6,
maxit = 1e4L,
epsilon = 1e-7,
standardize = TRUE,
varying_active_set = TRUE,
verbose = 0L,
Expand Down
4 changes: 2 additions & 2 deletions R/abrank.R
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ abrank.control <- function(lambda = NULL,
lum_a = 1.0,
lum_c = 1.0,
boost_umin = - 5.0,
maxit = 1e5L,
epsilon = 1e-4,
maxit = 1e4L,
epsilon = 1e-7,
standardize = TRUE,
varying_active_set = TRUE,
verbose = 0L,
Expand Down
8 changes: 4 additions & 4 deletions inst/include/abclass/Control.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ namespace abclass
// elastic-net
double alpha_ { 1.0 };
// group {scad,mcp}
double kappa_ratio_ { 0.99 }; // parameter to set gamma
double gamma_ { - 1.0 }; // gamma for group non-convex penalty
double kappa_ratio_ { 0.9 }; // parameter to set gamma
double gamma_ { - 1.0 }; // gamma for group non-convex penalty

// tuning
// cross-validation
Expand All @@ -61,8 +61,8 @@ namespace abclass
unsigned int et_nstages_ { 0 };

// optimization
unsigned int max_iter_ { 100000 }; // maximum number of iterations
double epsilon_ { 1e-6 }; // tolerance to check convergence
unsigned int max_iter_ { 10000 }; // maximum number of iterations
double epsilon_ { 1e-7 }; // tolerance to check convergence
bool varying_active_set_ { true }; // if active set should be adaptive
bool standardize_ { true }; // is x_ standardized (column-wise)
unsigned int verbose_ { 0 };
Expand Down
8 changes: 4 additions & 4 deletions man/abclass.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/supclass.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6830aae

Please sign in to comment.