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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 6 deletions
Show Stats 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> typename std::enable_if<std::is_same<IntT, size_t>::value>::type* = nullptr>
JsonInteger(IntT value) : Value(ValueKind::Integer), // NOLINT JsonInteger(IntT value) : Value(ValueKind::Integer), // NOLINT
integer_{static_cast<Int>(value)} {} 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[](std::string const & key) override;
Json& operator[](int ind) override; Json& operator[](int ind) override;
@ -533,8 +544,8 @@ using Null = JsonNull;
// Utils tailored for XGBoost. // Utils tailored for XGBoost.
template <typename Type> template <typename Parameter>
Object toJson(XGBoostParameter<Type> const& param) { Object toJson(Parameter const& param) {
Object obj; Object obj;
for (auto const& kv : param.__DICT__()) { for (auto const& kv : param.__DICT__()) {
obj[kv.first] = kv.second; obj[kv.first] = kv.second;
@ -542,8 +553,8 @@ Object toJson(XGBoostParameter<Type> const& param) {
return obj; return obj;
} }
template <typename Type> template <typename Parameter>
void fromJson(Json const& obj, XGBoostParameter<Type>* param) { void fromJson(Json const& obj, Parameter* param) {
auto const& j_param = get<Object const>(obj); auto const& j_param = get<Object const>(obj);
std::map<std::string, std::string> m; std::map<std::string, std::string> m;
for (auto const& kv : j_param) { for (auto const& kv : j_param) {

7
src/common/json.cc
View File

@ -243,7 +243,7 @@ Json& JsonNumber::operator[](int ind) {
bool JsonNumber::operator==(Value const& rhs) const { bool JsonNumber::operator==(Value const& rhs) const {
if (!IsA<JsonNumber>(&rhs)) { return false; } if (!IsA<JsonNumber>(&rhs)) { return false; }
return number_ == Cast<JsonNumber const>(&rhs)->getNumber(); return std::abs(number_ - Cast<JsonNumber const>(&rhs)->getNumber()) < kRtEps;
} }
Value & JsonNumber::operator=(Value const &rhs) { Value & JsonNumber::operator=(Value const &rhs) {
@ -504,7 +504,10 @@ Json JsonReader::ParseObject() {
SkipSpaces(); SkipSpaces();
char ch = PeekNextChar(); char ch = PeekNextChar();
if (ch == '}') return Json(std::move(data)); if (ch == '}') {
GetChar('}');
return Json(std::move(data));
}
while (true) { while (true) {
SkipSpaces(); SkipSpaces();

4
tests/cpp/common/test_json.cc
View File

@ -226,6 +226,10 @@ TEST(Json, EmptyObject) {
std::stringstream iss(str); std::stringstream iss(str);
auto json = Json::Load(StringView{str.c_str(), str.size()}); auto json = Json::Load(StringView{str.c_str(), str.size()});
ASSERT_TRUE(IsA<Object>(json["statistic"])); ASSERT_TRUE(IsA<Object>(json["statistic"]));
str = R"json({"Config": {},"Model": {}})json"; // NOLINT
json = Json::Load(StringView{str.c_str(), str.size()});
ASSERT_TRUE(IsA<Object>(json["Model"]));
} }
TEST(Json, EmptyArray) { TEST(Json, EmptyArray) {