"R-package/vscode:/vscode.git/clone" did not exist on "53602afa473bedba205e5dfcec0a8e844b03398c"
Unverified Commit 716fe4d0 authored by Nikita Titov's avatar Nikita Titov Committed by GitHub
Browse files

fixed cpplint errors about spaces and indents (#2282)

parent ee28ea36
......@@ -769,7 +769,6 @@ int LGBM_DatasetCreateFromCSRFunc(void* get_row_funptr,
{
const int tid = omp_get_thread_num();
get_row_fun(i, threadBuffer);
ret->PushOneRow(tid, i, threadBuffer);
}
OMP_LOOP_EX_END();
......@@ -1313,8 +1312,7 @@ int LGBM_BoosterPredictForCSRSingleRow(BoosterHandle handle,
}
Booster* ref_booster = reinterpret_cast<Booster*>(handle);
auto get_row_fun = RowFunctionFromCSR(indptr, indptr_type, indices, data, data_type, nindptr, nelem);
ref_booster->PredictSingleRow(num_iteration, predict_type, get_row_fun,
config, out_result, out_len);
ref_booster->PredictSingleRow(num_iteration, predict_type, get_row_fun, config, out_result, out_len);
API_END();
}
......@@ -1415,8 +1413,7 @@ int LGBM_BoosterPredictForMatSingleRow(BoosterHandle handle,
}
Booster* ref_booster = reinterpret_cast<Booster*>(handle);
auto get_row_fun = RowPairFunctionFromDenseMatric(data, 1, ncol, data_type, is_row_major);
ref_booster->PredictSingleRow(num_iteration, predict_type, get_row_fun,
config, out_result, out_len);
ref_booster->PredictSingleRow(num_iteration, predict_type, get_row_fun, config, out_result, out_len);
API_END();
}
......@@ -1440,8 +1437,7 @@ int LGBM_BoosterPredictForMats(BoosterHandle handle,
}
Booster* ref_booster = reinterpret_cast<Booster*>(handle);
auto get_row_fun = RowPairFunctionFromDenseRows(data, ncol, data_type);
ref_booster->Predict(num_iteration, predict_type, nrow, get_row_fun,
config, out_result, out_len);
ref_booster->Predict(num_iteration, predict_type, nrow, get_row_fun, config, out_result, out_len);
API_END();
}
......
......@@ -568,15 +568,13 @@ Tree::Tree(const char* str, size_t* used_len) {
if (key_vals.count("internal_weight")) {
internal_weight_ = Common::StringToArrayFast<double>(key_vals["internal_weight"], num_leaves_ - 1);
}
else {
} else {
internal_weight_.resize(num_leaves_ - 1);
}
if (key_vals.count("leaf_weight")) {
leaf_weight_ = Common::StringToArrayFast<double>(key_vals["leaf_weight"], num_leaves_);
}
else {
} else {
leaf_weight_.resize(num_leaves_);
}
......
......@@ -20,7 +20,7 @@ namespace LightGBM {
template<typename PointWiseLossCalculator>
class MulticlassMetric: public Metric {
public:
explicit MulticlassMetric(const Config& config) :config_(config){
explicit MulticlassMetric(const Config& config) :config_(config) {
num_class_ = config.num_class;
}
......@@ -149,8 +149,11 @@ class MultiErrorMetric: public MulticlassMetric<MultiErrorMetric> {
}
inline static const std::string Name(const Config& config) {
if (config.multi_error_top_k == 1) return "multi_error";
else return "multi_error@" + std::to_string(config.multi_error_top_k);
if (config.multi_error_top_k == 1) {
return "multi_error";
} else {
return "multi_error@" + std::to_string(config.multi_error_top_k);
}
}
};
......
......@@ -239,23 +239,23 @@ class RegressionL1loss: public RegressionL2loss {
const double alpha = 0.5;
if (weights_ == nullptr) {
if (bagging_mapper == nullptr) {
#define data_reader(i) (residual_getter(label_,index_mapper[i]))
#define data_reader(i) (residual_getter(label_, index_mapper[i]))
PercentileFun(double, data_reader, num_data_in_leaf, alpha);
#undef data_reader
} else {
#define data_reader(i) (residual_getter(label_,bagging_mapper[index_mapper[i]]))
#define data_reader(i) (residual_getter(label_, bagging_mapper[index_mapper[i]]))
PercentileFun(double, data_reader, num_data_in_leaf, alpha);
#undef data_reader
}
} else {
if (bagging_mapper == nullptr) {
#define data_reader(i) (residual_getter(label_,index_mapper[i]))
#define data_reader(i) (residual_getter(label_, index_mapper[i]))
#define weight_reader(i) (weights_[index_mapper[i]])
WeightedPercentileFun(double, data_reader, weight_reader, num_data_in_leaf, alpha);
#undef data_reader
#undef weight_reader
} else {
#define data_reader(i) (residual_getter(label_,bagging_mapper[index_mapper[i]]))
#define data_reader(i) (residual_getter(label_, bagging_mapper[index_mapper[i]]))
#define weight_reader(i) (weights_[bagging_mapper[index_mapper[i]]])
WeightedPercentileFun(double, data_reader, weight_reader, num_data_in_leaf, alpha);
#undef data_reader
......@@ -526,23 +526,23 @@ class RegressionQuantileloss : public RegressionL2loss {
data_size_t num_data_in_leaf) const override {
if (weights_ == nullptr) {
if (bagging_mapper == nullptr) {
#define data_reader(i) (residual_getter(label_,index_mapper[i]))
#define data_reader(i) (residual_getter(label_, index_mapper[i]))
PercentileFun(double, data_reader, num_data_in_leaf, alpha_);
#undef data_reader
} else {
#define data_reader(i) (residual_getter(label_,bagging_mapper[index_mapper[i]]))
#define data_reader(i) (residual_getter(label_, bagging_mapper[index_mapper[i]]))
PercentileFun(double, data_reader, num_data_in_leaf, alpha_);
#undef data_reader
}
} else {
if (bagging_mapper == nullptr) {
#define data_reader(i) (residual_getter(label_,index_mapper[i]))
#define data_reader(i) (residual_getter(label_, index_mapper[i]))
#define weight_reader(i) (weights_[index_mapper[i]])
WeightedPercentileFun(double, data_reader, weight_reader, num_data_in_leaf, alpha_);
#undef data_reader
#undef weight_reader
} else {
#define data_reader(i) (residual_getter(label_,bagging_mapper[index_mapper[i]]))
#define data_reader(i) (residual_getter(label_, bagging_mapper[index_mapper[i]]))
#define weight_reader(i) (weights_[bagging_mapper[index_mapper[i]]])
WeightedPercentileFun(double, data_reader, weight_reader, num_data_in_leaf, alpha_);
#undef data_reader
......@@ -627,13 +627,13 @@ class RegressionMAPELOSS : public RegressionL1loss {
data_size_t num_data_in_leaf) const override {
const double alpha = 0.5;
if (bagging_mapper == nullptr) {
#define data_reader(i) (residual_getter(label_,index_mapper[i]))
#define data_reader(i) (residual_getter(label_, index_mapper[i]))
#define weight_reader(i) (label_weight_[index_mapper[i]])
WeightedPercentileFun(double, data_reader, weight_reader, num_data_in_leaf, alpha);
#undef data_reader
#undef weight_reader
} else {
#define data_reader(i) (residual_getter(label_,bagging_mapper[index_mapper[i]]))
#define data_reader(i) (residual_getter(label_, bagging_mapper[index_mapper[i]]))
#define weight_reader(i) (label_weight_[bagging_mapper[index_mapper[i]]])
WeightedPercentileFun(double, data_reader, weight_reader, num_data_in_leaf, alpha);
#undef data_reader
......
/*!
* Copyright (c) 2018 Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See LICENSE file in the project root for license information.
*/
/* lightgbmlib.i */
%module lightgbmlib
%ignore LGBM_BoosterSaveModelToString;
......@@ -23,7 +27,7 @@
%include "../include/LightGBM/export.h"
%include "../include/LightGBM/c_api.h"
%typemap(in, numinputs=0) JNIEnv *jenv %{
%typemap(in, numinputs = 0) JNIEnv *jenv %{
$1 = jenv;
%}
......@@ -117,8 +121,8 @@
return ret;
}
#include <vector>
#include <functional>
#include <vector>
struct CSRDirect {
jintArray indices;
......@@ -145,7 +149,7 @@
// this needs to be done ahead of time as row_func is invoked from multiple threads
// these threads would have to be registered with the JVM and also unregistered.
// It is not clear if that can be achieved with OpenMP
for (int i=0; i<num_rows; i++) {
for (int i = 0; i < num_rows; i++) {
// get the row
jobject objSparseVec = jenv->GetObjectArrayElement(arrayOfSparseVector, i);
......@@ -224,7 +228,7 @@
%array_functions(char *, stringArray)
/* Custom pointer manipulation template */
%define %pointer_manipulation(TYPE,NAME)
%define %pointer_manipulation(TYPE, NAME)
%{
static TYPE *new_##NAME() { %}
%{ TYPE* NAME = new TYPE; return NAME; %}
......@@ -240,7 +244,7 @@ void delete_##NAME(TYPE *self);
%enddef
%define %pointer_dereference(TYPE,NAME)
%define %pointer_dereference(TYPE, NAME)
%{
static TYPE NAME ##_value(TYPE *self) {
TYPE NAME = *self;
......@@ -252,7 +256,7 @@ TYPE NAME##_value(TYPE *self);
%enddef
%define %pointer_handle(TYPE,NAME)
%define %pointer_handle(TYPE, NAME)
%{
static TYPE* NAME ##_handle() { %}
%{ TYPE* NAME = new TYPE; *NAME = (TYPE)operator new(sizeof(int*)); return NAME; %}
......
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