From d5303af068023d893bd70a6a29496d69cda2925d Mon Sep 17 00:00:00 2001 From: Tianqi Chen Date: Mon, 9 Mar 2015 22:37:08 -0700 Subject: [PATCH] fix vs warnings --- src/tree/updater_skmaker-inl.hpp | 18 +++++++++--------- src/utils/io.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/tree/updater_skmaker-inl.hpp b/src/tree/updater_skmaker-inl.hpp index 3dee0607c..60b83c2a4 100644 --- a/src/tree/updater_skmaker-inl.hpp +++ b/src/tree/updater_skmaker-inl.hpp @@ -57,10 +57,10 @@ class SketchMaker: public BaseMaker { for (int nid = 0; nid < p_tree->param.num_nodes; ++nid) { this->SetStats(nid, node_stats[nid], p_tree); if (!(*p_tree)[nid].is_leaf()) { - p_tree->stat(nid).loss_chg = + p_tree->stat(nid).loss_chg = static_cast( node_stats[(*p_tree)[nid].cleft()].CalcGain(param) + node_stats[(*p_tree)[nid].cright()].CalcGain(param) - - node_stats[nid].CalcGain(param); + node_stats[nid].CalcGain(param)); } } // set left leaves @@ -207,9 +207,9 @@ class SketchMaker: public BaseMaker { } else { for (size_t i = 0; i < this->qexpand.size(); ++i) { const unsigned nid = this->qexpand[i]; - sbuilder[3 * nid + 0].sum_total = nstats[nid].pos_grad; - sbuilder[3 * nid + 1].sum_total = nstats[nid].neg_grad; - sbuilder[3 * nid + 2].sum_total = nstats[nid].sum_hess; + sbuilder[3 * nid + 0].sum_total = static_cast(nstats[nid].pos_grad); + sbuilder[3 * nid + 1].sum_total = static_cast(nstats[nid].neg_grad); + sbuilder[3 * nid + 2].sum_total = static_cast(nstats[nid].sum_hess); } } // if only one value, no need to do second pass @@ -307,7 +307,7 @@ class SketchMaker: public BaseMaker { } // set statistics on ptree inline void SetStats(int nid, const SKStats &node_sum, RegTree *p_tree) { - p_tree->stat(nid).base_weight = node_sum.CalcWeight(param); + p_tree->stat(nid).base_weight = static_cast(node_sum.CalcWeight(param)); p_tree->stat(nid).sum_hess = static_cast(node_sum.sum_hess); node_sum.SetLeafVec(param, p_tree->leafvec(nid)); } @@ -350,7 +350,7 @@ class SketchMaker: public BaseMaker { if (s.sum_hess >= param.min_child_weight && c.sum_hess >= param.min_child_weight) { double loss_chg = s.CalcGain(param) + c.CalcGain(param) - root_gain; - best->Update(loss_chg, fid, fsplits[i], false); + best->Update(static_cast(loss_chg), fid, fsplits[i], false); } // backward c.SetSubstract(feat_sum, s); @@ -358,7 +358,7 @@ class SketchMaker: public BaseMaker { if (s.sum_hess >= param.min_child_weight && c.sum_hess >= param.min_child_weight) { double loss_chg = s.CalcGain(param) + c.CalcGain(param) - root_gain; - best->Update(loss_chg, fid, fsplits[i], true); + best->Update(static_cast(loss_chg), fid, fsplits[i], true); } } {// all including @@ -368,7 +368,7 @@ class SketchMaker: public BaseMaker { c.sum_hess >= param.min_child_weight) { bst_float cpt = fsplits.back(); double loss_chg = s.CalcGain(param) + c.CalcGain(param) - root_gain; - best->Update(loss_chg, fid, cpt + fabsf(cpt) + 1.0f, false); + best->Update(static_cast(loss_chg), fid, cpt + fabsf(cpt) + 1.0f, false); } } } diff --git a/src/utils/io.h b/src/utils/io.h index 54f2c89af..2ed0b865f 100644 --- a/src/utils/io.h +++ b/src/utils/io.h @@ -41,7 +41,7 @@ class FileStream : public ISeekStream { return std::ftell(fp); } virtual bool AtEnd(void) const { - return std::feof(fp); + return std::feof(fp) != 0; } inline void Close(void) { if (fp != NULL){