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

Convenient methods for JSON integer. (#5089)

Browse Source 
* Fix parsing empty object.
This commit is contained in:
Jiaming Yuan
2019-12-05 11:01:12 +08:00
committed by GitHub
parent dcde433402
commit f0ca53d9ec
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/xgboost/json.h
View File

@@ -202,6 +202,17 @@ class JsonInteger : public Value {
typename std::enable_if<std::is_same<IntT, size_t>::value>::type* = nullptr>
JsonInteger(IntT value) : Value(ValueKind::Integer), // NOLINT
integer_{static_cast<Int>(value)} {}
template <typename IntT,
typename std::enable_if<std::is_same<IntT, int32_t>::value>::type* = nullptr>
JsonInteger(IntT value) : Value(ValueKind::Integer), // NOLINT
integer_{static_cast<Int>(value)} {}
template <typename IntT,
typename std::enable_if<
std::is_same<IntT, uint32_t>::value &&
!std::is_same<std::size_t, uint32_t>::value>::type * = nullptr>
JsonInteger(IntT value) // NOLINT
: Value(ValueKind::Integer),
integer_{static_cast<Int>(value)} {}
Json& operator[](std::string const & key) override;
Json& operator[](int ind) override;
@@ -533,8 +544,8 @@ using Null = JsonNull;
// Utils tailored for XGBoost.
template <typename Type>
Object toJson(XGBoostParameter<Type> const& param) {
template <typename Parameter>
Object toJson(Parameter const& param) {
Object obj;
for (auto const& kv : param.__DICT__()) {
obj[kv.first] = kv.second;
@@ -542,8 +553,8 @@ Object toJson(XGBoostParameter<Type> const& param) {
return obj;
}
template <typename Type>
void fromJson(Json const& obj, XGBoostParameter<Type>* param) {
template <typename Parameter>
void fromJson(Json const& obj, Parameter* param) {
auto const& j_param = get<Object const>(obj);
std::map<std::string, std::string> m;
for (auto const& kv : j_param) {