Commit 31b19afc authored by Guolin Ke's avatar Guolin Ke
Browse files

some bugs fixed

parent 4a6bdcbe
...@@ -43,16 +43,15 @@ public: ...@@ -43,16 +43,15 @@ public:
ObjectiveFunction::CreateObjectiveFunction(config_.objective_type, ObjectiveFunction::CreateObjectiveFunction(config_.objective_type,
config_.objective_config); config_.objective_config);
// create training metric // create training metric
if (config_.boosting_config->is_provide_training_metric) { for (auto metric_type : config_.metric_types) {
for (auto metric_type : config_.metric_types) { Metric* metric =
Metric* metric = Metric::CreateMetric(metric_type, config_.metric_config);
Metric::CreateMetric(metric_type, config_.metric_config); if (metric == nullptr) { continue; }
if (metric == nullptr) { continue; } metric->Init("training", train_data_->metadata(),
metric->Init("training", train_data_->metadata(), train_data_->num_data());
train_data_->num_data()); train_metric_.push_back(metric);
train_metric_.push_back(metric);
}
} }
// add metric for validation data // add metric for validation data
for (size_t i = 0; i < valid_datas_.size(); ++i) { for (size_t i = 0; i < valid_datas_.size(); ++i) {
valid_metrics_.emplace_back(); valid_metrics_.emplace_back();
......
...@@ -437,6 +437,15 @@ Dataset* DatasetLoader::CostructFromSampleData(std::vector<std::vector<double>>& ...@@ -437,6 +437,15 @@ Dataset* DatasetLoader::CostructFromSampleData(std::vector<std::vector<double>>&
delete bin_mappers[i]; delete bin_mappers[i];
} }
} }
// fill feature_names_ if not header
if (feature_names_.size() <= 0) {
for (int i = 0; i < dataset->num_total_features_; ++i) {
std::stringstream str_buf;
str_buf << "Column_" << i;
feature_names_.push_back(str_buf.str());
}
}
dataset->feature_names_ = feature_names_;
dataset->num_features_ = static_cast<int>(dataset->features_.size()); dataset->num_features_ = static_cast<int>(dataset->features_.size());
dataset->metadata_.Init(dataset->num_data_, dataset->num_class_, NO_SPECIFIC, NO_SPECIFIC); dataset->metadata_.Init(dataset->num_data_, dataset->num_class_, NO_SPECIFIC, NO_SPECIFIC);
return dataset; return dataset;
......
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