Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tianlh
LightGBM-DCU
Commits
32a7f10d
Unverified
Commit
32a7f10d
authored
Apr 04, 2022
by
Michael Mayer
Committed by
GitHub
Apr 03, 2022
Browse files
[R-package] rename internal callback functions (#5123)
parent
3d620bfc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
19 deletions
+19
-19
R-package/R/callback.R
R-package/R/callback.R
+9
-9
R-package/R/lgb.cv.R
R-package/R/lgb.cv.R
+5
-5
R-package/R/lgb.train.R
R-package/R/lgb.train.R
+5
-5
No files found.
R-package/R/callback.R
View file @
32a7f10d
...
@@ -71,7 +71,7 @@ merge.eval.string <- function(env) {
...
@@ -71,7 +71,7 @@ merge.eval.string <- function(env) {
}
}
cb
.
print
.
evaluation
<-
function
(
period
)
{
cb
_
print
_
evaluation
<-
function
(
period
)
{
# Create callback
# Create callback
callback
<-
function
(
env
)
{
callback
<-
function
(
env
)
{
...
@@ -103,13 +103,13 @@ cb.print.evaluation <- function(period) {
...
@@ -103,13 +103,13 @@ cb.print.evaluation <- function(period) {
# Store attributes
# Store attributes
attr
(
callback
,
"call"
)
<-
match.call
()
attr
(
callback
,
"call"
)
<-
match.call
()
attr
(
callback
,
"name"
)
<-
"cb
.
print
.
evaluation"
attr
(
callback
,
"name"
)
<-
"cb
_
print
_
evaluation"
return
(
callback
)
return
(
callback
)
}
}
cb
.
record
.
evaluation
<-
function
()
{
cb
_
record
_
evaluation
<-
function
()
{
# Create callback
# Create callback
callback
<-
function
(
env
)
{
callback
<-
function
(
env
)
{
...
@@ -178,13 +178,13 @@ cb.record.evaluation <- function() {
...
@@ -178,13 +178,13 @@ cb.record.evaluation <- function() {
# Store attributes
# Store attributes
attr
(
callback
,
"call"
)
<-
match.call
()
attr
(
callback
,
"call"
)
<-
match.call
()
attr
(
callback
,
"name"
)
<-
"cb
.
record
.
evaluation"
attr
(
callback
,
"name"
)
<-
"cb
_
record
_
evaluation"
return
(
callback
)
return
(
callback
)
}
}
cb
.
early
.
stop
<-
function
(
stopping_rounds
,
first_metric_only
,
verbose
)
{
cb
_
early
_
stop
<-
function
(
stopping_rounds
,
first_metric_only
,
verbose
)
{
factor_to_bigger_better
<-
NULL
factor_to_bigger_better
<-
NULL
best_iter
<-
NULL
best_iter
<-
NULL
...
@@ -316,7 +316,7 @@ cb.early.stop <- function(stopping_rounds, first_metric_only, verbose) {
...
@@ -316,7 +316,7 @@ cb.early.stop <- function(stopping_rounds, first_metric_only, verbose) {
}
}
attr
(
callback
,
"call"
)
<-
match.call
()
attr
(
callback
,
"call"
)
<-
match.call
()
attr
(
callback
,
"name"
)
<-
"cb
.
early
.
stop"
attr
(
callback
,
"name"
)
<-
"cb
_
early
_
stop"
return
(
callback
)
return
(
callback
)
...
@@ -335,13 +335,13 @@ add.cb <- function(cb_list, cb) {
...
@@ -335,13 +335,13 @@ add.cb <- function(cb_list, cb) {
# Set names of elements
# Set names of elements
names
(
cb_list
)
<-
callback.names
(
cb_list
=
cb_list
)
names
(
cb_list
)
<-
callback.names
(
cb_list
=
cb_list
)
if
(
"cb
.
early
.
stop"
%in%
names
(
cb_list
))
{
if
(
"cb
_
early
_
stop"
%in%
names
(
cb_list
))
{
# Concatenate existing elements
# Concatenate existing elements
cb_list
<-
c
(
cb_list
,
cb_list
[
"cb
.
early
.
stop"
])
cb_list
<-
c
(
cb_list
,
cb_list
[
"cb
_
early
_
stop"
])
# Remove only the first one
# Remove only the first one
cb_list
[
"cb
.
early
.
stop"
]
<-
NULL
cb_list
[
"cb
_
early
_
stop"
]
<-
NULL
}
}
...
...
R-package/R/lgb.cv.R
View file @
32a7f10d
...
@@ -246,12 +246,12 @@ lgb.cv <- function(params = list()
...
@@ -246,12 +246,12 @@ lgb.cv <- function(params = list()
# Add printing log callback
# Add printing log callback
if
(
verbose
>
0L
&&
eval_freq
>
0L
)
{
if
(
verbose
>
0L
&&
eval_freq
>
0L
)
{
callbacks
<-
add.cb
(
cb_list
=
callbacks
,
cb
=
cb
.
print
.
evaluation
(
period
=
eval_freq
))
callbacks
<-
add.cb
(
cb_list
=
callbacks
,
cb
=
cb
_
print
_
evaluation
(
period
=
eval_freq
))
}
}
# Add evaluation log callback
# Add evaluation log callback
if
(
record
)
{
if
(
record
)
{
callbacks
<-
add.cb
(
cb_list
=
callbacks
,
cb
=
cb
.
record
.
evaluation
())
callbacks
<-
add.cb
(
cb_list
=
callbacks
,
cb
=
cb
_
record
_
evaluation
())
}
}
# Did user pass parameters that indicate they want to use early stopping?
# Did user pass parameters that indicate they want to use early stopping?
...
@@ -272,10 +272,10 @@ lgb.cv <- function(params = list()
...
@@ -272,10 +272,10 @@ lgb.cv <- function(params = list()
warning
(
"Early stopping is not available in 'dart' mode."
)
warning
(
"Early stopping is not available in 'dart' mode."
)
using_early_stopping
<-
FALSE
using_early_stopping
<-
FALSE
# Remove the cb
.
early
.
stop() function if it was passed in to callbacks
# Remove the cb
_
early
_
stop() function if it was passed in to callbacks
callbacks
<-
Filter
(
callbacks
<-
Filter
(
f
=
function
(
cb_func
)
{
f
=
function
(
cb_func
)
{
!
identical
(
attr
(
cb_func
,
"name"
),
"cb
.
early
.
stop"
)
!
identical
(
attr
(
cb_func
,
"name"
),
"cb
_
early
_
stop"
)
}
}
,
x
=
callbacks
,
x
=
callbacks
)
)
...
@@ -285,7 +285,7 @@ lgb.cv <- function(params = list()
...
@@ -285,7 +285,7 @@ lgb.cv <- function(params = list()
if
(
using_early_stopping
)
{
if
(
using_early_stopping
)
{
callbacks
<-
add.cb
(
callbacks
<-
add.cb
(
cb_list
=
callbacks
cb_list
=
callbacks
,
cb
=
cb
.
early
.
stop
(
,
cb
=
cb
_
early
_
stop
(
stopping_rounds
=
early_stopping_rounds
stopping_rounds
=
early_stopping_rounds
,
first_metric_only
=
isTRUE
(
params
[[
"first_metric_only"
]])
,
first_metric_only
=
isTRUE
(
params
[[
"first_metric_only"
]])
,
verbose
=
verbose
,
verbose
=
verbose
...
...
R-package/R/lgb.train.R
View file @
32a7f10d
...
@@ -211,12 +211,12 @@ lgb.train <- function(params = list(),
...
@@ -211,12 +211,12 @@ lgb.train <- function(params = list(),
# Add printing log callback
# Add printing log callback
if
(
verbose
>
0L
&&
eval_freq
>
0L
)
{
if
(
verbose
>
0L
&&
eval_freq
>
0L
)
{
callbacks
<-
add.cb
(
cb_list
=
callbacks
,
cb
=
cb
.
print
.
evaluation
(
period
=
eval_freq
))
callbacks
<-
add.cb
(
cb_list
=
callbacks
,
cb
=
cb
_
print
_
evaluation
(
period
=
eval_freq
))
}
}
# Add evaluation log callback
# Add evaluation log callback
if
(
record
&&
length
(
valids
)
>
0L
)
{
if
(
record
&&
length
(
valids
)
>
0L
)
{
callbacks
<-
add.cb
(
cb_list
=
callbacks
,
cb
=
cb
.
record
.
evaluation
())
callbacks
<-
add.cb
(
cb_list
=
callbacks
,
cb
=
cb
_
record
_
evaluation
())
}
}
# Did user pass parameters that indicate they want to use early stopping?
# Did user pass parameters that indicate they want to use early stopping?
...
@@ -237,10 +237,10 @@ lgb.train <- function(params = list(),
...
@@ -237,10 +237,10 @@ lgb.train <- function(params = list(),
warning
(
"Early stopping is not available in 'dart' mode."
)
warning
(
"Early stopping is not available in 'dart' mode."
)
using_early_stopping
<-
FALSE
using_early_stopping
<-
FALSE
# Remove the cb
.
early
.
stop() function if it was passed in to callbacks
# Remove the cb
_
early
_
stop() function if it was passed in to callbacks
callbacks
<-
Filter
(
callbacks
<-
Filter
(
f
=
function
(
cb_func
)
{
f
=
function
(
cb_func
)
{
!
identical
(
attr
(
cb_func
,
"name"
),
"cb
.
early
.
stop"
)
!
identical
(
attr
(
cb_func
,
"name"
),
"cb
_
early
_
stop"
)
}
}
,
x
=
callbacks
,
x
=
callbacks
)
)
...
@@ -250,7 +250,7 @@ lgb.train <- function(params = list(),
...
@@ -250,7 +250,7 @@ lgb.train <- function(params = list(),
if
(
using_early_stopping
)
{
if
(
using_early_stopping
)
{
callbacks
<-
add.cb
(
callbacks
<-
add.cb
(
cb_list
=
callbacks
cb_list
=
callbacks
,
cb
=
cb
.
early
.
stop
(
,
cb
=
cb
_
early
_
stop
(
stopping_rounds
=
early_stopping_rounds
stopping_rounds
=
early_stopping_rounds
,
first_metric_only
=
isTRUE
(
params
[[
"first_metric_only"
]])
,
first_metric_only
=
isTRUE
(
params
[[
"first_metric_only"
]])
,
verbose
=
verbose
,
verbose
=
verbose
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment