Skip to content

GitLab

Commit 03ba7304 authored by Szilard Pafka's avatar Szilard Pafka Committed by Guolin Ke
Browse files

fix bug (#630)

parent 6fa51478
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 22 deletions
R-package/R/lgb.prepare_rules.R
View file @ 03ba7304
...@@ -92,7 +92,7 @@ lgb.prepare_rules <- function(data, rules = NULL) { ...@@ -92,7 +92,7 @@ lgb.prepare_rules <- function(data, rules = NULL) {
# Map characters/factors # Map characters/factors
is_fix <- which(list_classes %in% c("character", "factor")) is_fix <- which(list_classes %in% c("character", "factor"))
ruleset <- list() rules <- list()
# Need to create rules? # Need to create rules?
if (length(is_fix) > 0) { if (length(is_fix) > 0) {
...@@ -113,13 +113,13 @@ lgb.prepare_rules <- function(data, rules = NULL) { ...@@ -113,13 +113,13 @@ lgb.prepare_rules <- function(data, rules = NULL) {
mini_numeric <- as.numeric(mini_unique) # No respect of ordinality mini_numeric <- as.numeric(mini_unique) # No respect of ordinality
} }
# Create ruleset # Create rules
indexed <- colnames(data)[i] # Index value indexed <- colnames(data)[i] # Index value
ruleset[[indexed]] <- mini_numeric # Numeric content rules[[indexed]] <- mini_numeric # Numeric content
names(ruleset[[indexed]]) <- mini_unique # Character equivalent names(rules[[indexed]]) <- mini_unique # Character equivalent
# Apply to real data column # Apply to real data column
set(data, j = i, value = unname(ruleset[[indexed]][mini_data])) set(data, j = i, value = unname(rules[[indexed]][mini_data]))
} }
...@@ -150,7 +150,7 @@ lgb.prepare_rules <- function(data, rules = NULL) { ...@@ -150,7 +150,7 @@ lgb.prepare_rules <- function(data, rules = NULL) {
# Map characters/factors # Map characters/factors
is_fix <- which(list_classes %in% c("character", "factor")) is_fix <- which(list_classes %in% c("character", "factor"))
ruleset <- list() rules <- list()
# Need to create rules? # Need to create rules?
if (length(is_fix) > 0) { if (length(is_fix) > 0) {
...@@ -171,13 +171,13 @@ lgb.prepare_rules <- function(data, rules = NULL) { ...@@ -171,13 +171,13 @@ lgb.prepare_rules <- function(data, rules = NULL) {
mini_numeric <- as.numeric(mini_unique) # No respect of ordinality mini_numeric <- as.numeric(mini_unique) # No respect of ordinality
} }
# Create ruleset # Create rules
indexed <- colnames(data)[i] # Index value indexed <- colnames(data)[i] # Index value
ruleset[[indexed]] <- mini_numeric # Numeric content rules[[indexed]] <- mini_numeric # Numeric content
names(ruleset[[indexed]]) <- mini_unique # Character equivalent names(rules[[indexed]]) <- mini_unique # Character equivalent
# Apply to real data column # Apply to real data column
data[[i]] <- unname(ruleset[[indexed]][mini_data]) data[[i]] <- unname(rules[[indexed]][mini_data])
} }
...@@ -194,6 +194,6 @@ lgb.prepare_rules <- function(data, rules = NULL) { ...@@ -194,6 +194,6 @@ lgb.prepare_rules <- function(data, rules = NULL) {
} }
return(list(data = data, rules = ruleset)) return(list(data = data, rules = rules))
} }
R-package/R/lgb.prepare_rules2.R
View file @ 03ba7304
...@@ -92,7 +92,7 @@ lgb.prepare_rules2 <- function(data, rules = NULL) { ...@@ -92,7 +92,7 @@ lgb.prepare_rules2 <- function(data, rules = NULL) {
# Map characters/factors # Map characters/factors
is_fix <- which(list_classes %in% c("character", "factor")) is_fix <- which(list_classes %in% c("character", "factor"))
ruleset <- list() rules <- list()
# Need to create rules? # Need to create rules?
if (length(is_fix) > 0) { if (length(is_fix) > 0) {
...@@ -112,13 +112,13 @@ lgb.prepare_rules2 <- function(data, rules = NULL) { ...@@ -112,13 +112,13 @@ lgb.prepare_rules2 <- function(data, rules = NULL) {
mini_numeric <- as.integer(mini_unique) # No respect of ordinality mini_numeric <- as.integer(mini_unique) # No respect of ordinality
} }
# Create ruleset # Create rules
indexed <- colnames(data)[i] # Index value indexed <- colnames(data)[i] # Index value
ruleset[[indexed]] <- mini_numeric # Numeric content rules[[indexed]] <- mini_numeric # Numeric content
names(ruleset[[indexed]]) <- mini_unique # Character equivalent names(rules[[indexed]]) <- mini_unique # Character equivalent
# Apply to real data column # Apply to real data column
set(data, j = i, value = unname(ruleset[[indexed]][mini_data])) set(data, j = i, value = unname(rules[[indexed]][mini_data]))
} }
...@@ -149,7 +149,7 @@ lgb.prepare_rules2 <- function(data, rules = NULL) { ...@@ -149,7 +149,7 @@ lgb.prepare_rules2 <- function(data, rules = NULL) {
# Map characters/factors # Map characters/factors
is_fix <- which(list_classes %in% c("character", "factor")) is_fix <- which(list_classes %in% c("character", "factor"))
ruleset <- list() rules <- list()
# Need to create rules? # Need to create rules?
if (length(is_fix) > 0) { if (length(is_fix) > 0) {
...@@ -169,13 +169,13 @@ lgb.prepare_rules2 <- function(data, rules = NULL) { ...@@ -169,13 +169,13 @@ lgb.prepare_rules2 <- function(data, rules = NULL) {
mini_numeric <- as.integer(mini_unique) # No respect of ordinality mini_numeric <- as.integer(mini_unique) # No respect of ordinality
} }
# Create ruleset # Create rules
indexed <- colnames(data)[i] # Index value indexed <- colnames(data)[i] # Index value
ruleset[[indexed]] <- mini_numeric # Numeric content rules[[indexed]] <- mini_numeric # Numeric content
names(ruleset[[indexed]]) <- mini_unique # Character equivalent names(rules[[indexed]]) <- mini_unique # Character equivalent
# Apply to real data column # Apply to real data column
data[[i]] <- unname(ruleset[[indexed]][mini_data]) data[[i]] <- unname(rules[[indexed]][mini_data])
} }
...@@ -192,6 +192,6 @@ lgb.prepare_rules2 <- function(data, rules = NULL) { ...@@ -192,6 +192,6 @@ lgb.prepare_rules2 <- function(data, rules = NULL) {
} }
return(list(data = data, rules = ruleset)) return(list(data = data, rules = rules))
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment