Fix clang-tidy.

dmlc · Aug 5, 2018 · 707eea2 · 707eea2
1 parent 58e9e15
commit 707eea2
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/src/common/hist_util.cc b/src/common/hist_util.cc
@@ -48,9 +48,9 @@ void HistCutMatrix::Init(DMatrix* p_fmat, uint32_t max_num_bins) {
         for (size_t i = 0; i < batch.Size(); ++i) { // NOLINT(*)
           size_t ridx = batch.base_rowid + i;
           SparsePage::Inst inst = batch[i];
-          for (bst_uint j = 0; j < inst.size(); ++j) {
-            if (inst[j].index >= begin && inst[j].index < end) {
-              sketchs[inst[j].index].Push(inst[j].fvalue, info.GetWeight(ridx));
+          for (auto& ins : inst) {
+            if (ins.index >= begin && ins.index < end) {
+              sketchs[ins.index].Push(ins.fvalue, info.GetWeight(ridx));
             }
           }
         }

diff --git a/src/data/simple_dmatrix.cc b/src/data/simple_dmatrix.cc
@@ -58,8 +58,8 @@ void SimpleDMatrix::MakeOneBatch(SparsePage* pcol, bool sorted) {
     for (long i = 0; i < batch_size; ++i) { // NOLINT(*)
       int tid = omp_get_thread_num();
       auto inst = batch[i];
-      for (bst_uint j = 0; j < inst.size(); ++j) {
-        builder.AddBudget(inst[j].index, tid);
+      for (auto& ins : inst) {
+        builder.AddBudget(ins.index, tid);
       }
     }
   }
@@ -72,11 +72,11 @@ void SimpleDMatrix::MakeOneBatch(SparsePage* pcol, bool sorted) {
     for (long i = 0; i < static_cast<long>(batch.Size()); ++i) { // NOLINT(*)
       int tid = omp_get_thread_num();
       auto inst = batch[i];
-      for (bst_uint j = 0; j < inst.size(); ++j) {
-        builder.Push(
-            inst[j].index,
-            Entry(static_cast<bst_uint>(batch.base_rowid + i), inst[j].fvalue),
-            tid);
+      for (auto& ins : inst) {
+        builder.Push(ins.index,
+                     Entry(static_cast<bst_uint>(batch.base_rowid + i),
+                           ins.fvalue),
+                     tid);
       }
     }
   }

diff --git a/src/gbm/gblinear.cc b/src/gbm/gblinear.cc
@@ -166,9 +166,9 @@ class GBLinear : public GradientBooster {
         for (int gid = 0; gid < ngroup; ++gid) {
           bst_float *p_contribs = &contribs[(row_idx * ngroup + gid) * ncolumns];
           // calculate linear terms' contributions
-          for (bst_uint c = 0; c < inst.size(); ++c) {
-            if (inst[c].index >= model_.param.num_feature) continue;
-            p_contribs[inst[c].index] = inst[c].fvalue * model_[inst[c].index][gid];
+          for (auto& ins : inst) {
+            if (ins.index >= model_.param.num_feature) continue;
+            p_contribs[ins.index] = ins.fvalue * model_[ins.index][gid];            
           }
           // add base margin to BIAS
           p_contribs[ncolumns - 1] = model_.bias()[gid] +

diff --git a/src/linear/updater_shotgun.cc b/src/linear/updater_shotgun.cc
@@ -92,10 +92,10 @@ class ShotgunUpdater : public LinearUpdater {
         auto col = batch[ii];
         for (int gid = 0; gid < ngroup; ++gid) {
           double sum_grad = 0.0, sum_hess = 0.0;
-          for (bst_uint j = 0; j < col.size(); ++j) {
-            GradientPair &p = gpair[col[j].index * ngroup + gid];
+          for (auto& c : col) {
+            GradientPair &p = gpair[c.index * ngroup + gid];
             if (p.GetHess() < 0.0f) continue;
-            const bst_float v = col[j].fvalue;
+            const bst_float v = c.fvalue;
             sum_grad += p.GetGrad() * v;
             sum_hess += p.GetHess() * v * v;
           }
@@ -107,10 +107,10 @@ class ShotgunUpdater : public LinearUpdater {
           if (dw == 0.f) continue;
           w += dw;
           // update grad values
-          for (bst_uint j = 0; j < col.size(); ++j) {
-            GradientPair &p = gpair[col[j].index * ngroup + gid];
+          for (auto& c : col) {
+            GradientPair &p = gpair[c.index * ngroup + gid];
             if (p.GetHess() < 0.0f) continue;
-            p += GradientPair(p.GetHess() * col[j].fvalue * dw, 0);
+            p += GradientPair(p.GetHess() * c.fvalue * dw, 0);            
           }
         }
       }

diff --git a/src/tree/updater_histmaker.cc b/src/tree/updater_histmaker.cc
@@ -793,8 +793,8 @@ class QuantileHistMaker: public HistMaker<TStats> {
           if (this->node2workindex_[nid] < 0) {
             this->position_[ridx] = ~nid;
           } else {
-            for (bst_uint j = 0; j < inst.size(); ++j) {
-              builder.AddBudget(inst[j].index, omp_get_thread_num());
+            for (auto& ins : inst) {
+              builder.AddBudget(ins.index, omp_get_thread_num());
             }
           }
         }
@@ -806,9 +806,9 @@ class QuantileHistMaker: public HistMaker<TStats> {
         const bst_uint ridx = static_cast<bst_uint>(batch.base_rowid + i);
         const int nid = this->position_[ridx];
         if (nid >= 0) {
-          for (bst_uint j = 0; j < inst.size(); ++j) {
-            builder.Push(inst[j].index,
-                         Entry(nid, inst[j].fvalue),
+          for (auto& ins : inst) {
+            builder.Push(ins.index,
+                         Entry(nid, ins.fvalue),
                          omp_get_thread_num());
           }
         }