Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #3702: do not round up integer thresholds for integer features in JSON dump (#3717)

Browse Source
This commit is contained in:
Philip Hyunsu Cho 2018-09-21 01:11:21 -07:00 committed by GitHub
parent aa53e9fc8d
commit 73140ce84c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tree/tree_model.cc
View File

@ -6,6 +6,7 @@
#include <xgboost/tree_model.h> #include <xgboost/tree_model.h>
#include <sstream> #include <sstream>
#include <limits> #include <limits>
#include <cmath>
#include <iomanip> #include <iomanip>
#include "./param.h" #include "./param.h"
@ -75,17 +76,21 @@ void DumpRegTree(std::stringstream& fo, // NOLINT(*)
break; break;
} }
case FeatureMap::kInteger: { case FeatureMap::kInteger: {
const bst_float floored = std::floor(cond);
const int integer_threshold
= (floored == cond) ? static_cast<int>(floored)
: static_cast<int>(floored) + 1;
if (format == "json") { if (format == "json") {
fo << "{ \"nodeid\": " << nid fo << "{ \"nodeid\": " << nid
<< ", \"depth\": " << depth << ", \"depth\": " << depth
<< ", \"split\": \"" << fmap.Name(split_index) << "\"" << ", \"split\": \"" << fmap.Name(split_index) << "\""
<< ", \"split_condition\": " << int(cond + 1.0) << ", \"split_condition\": " << integer_threshold
<< ", \"yes\": " << tree[nid].LeftChild() << ", \"yes\": " << tree[nid].LeftChild()
<< ", \"no\": " << tree[nid].RightChild() << ", \"no\": " << tree[nid].RightChild()
<< ", \"missing\": " << tree[nid].DefaultChild(); << ", \"missing\": " << tree[nid].DefaultChild();
} else { } else {
fo << nid << ":[" << fmap.Name(split_index) << "<" fo << nid << ":[" << fmap.Name(split_index) << "<"
<< int(cond + 1.0) << integer_threshold
<< "] yes=" << tree[nid].LeftChild() << "] yes=" << tree[nid].LeftChild()
<< ",no=" << tree[nid].RightChild() << ",no=" << tree[nid].RightChild()
<< ",missing=" << tree[nid].DefaultChild(); << ",missing=" << tree[nid].DefaultChild();