From 6ae1d6885fcf70615985ef275c470295cdf2d626 Mon Sep 17 00:00:00 2001 From: adityaruplaha <30696515+adityaruplaha@users.noreply.github.com> Date: Wed, 1 Jul 2020 23:50:11 +0530 Subject: [PATCH] Use fmt instead of boost. --- src/common/param_package.cpp | 39 +++++++++++++++++++----------------- src/common/param_package.h | 1 + 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/common/param_package.cpp b/src/common/param_package.cpp index 15645999a..2fe85657b 100644 --- a/src/common/param_package.cpp +++ b/src/common/param_package.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include "common/logging/log.h" #include "common/param_package.h" #include "common/string_util.h" @@ -260,8 +260,7 @@ void ParamPackage::Set(const std::string& key, std::string value) { } void ParamPackage::Set(const std::string& key, std::vector value) { - data.insert_or_assign(key, - "[" + boost::algorithm::join(value, std::string{LIST_SEPARATOR}) + "]"); + data.insert_or_assign(key, fmt::format("[{}]", fmt::join(value, std::string{LIST_SEPARATOR}))); } void ParamPackage::Set(const std::string& key, int value) { @@ -269,11 +268,7 @@ void ParamPackage::Set(const std::string& key, int value) { } void ParamPackage::Set(const std::string& key, std::vector value) { - std::vector vec{}; - std::transform(value.begin(), value.end(), std::back_inserter(vec), - [](float a) -> std::string const { return std::to_string(a); }); - data.insert_or_assign(key, - "[" + boost::algorithm::join(vec, std::string{LIST_SEPARATOR}) + "]"); + data.insert_or_assign(key, fmt::format("[{}]", fmt::join(value, std::string{LIST_SEPARATOR}))); } void ParamPackage::Set(const std::string& key, float value) { @@ -281,11 +276,7 @@ void ParamPackage::Set(const std::string& key, float value) { } void ParamPackage::Set(const std::string& key, std::vector value) { - std::vector vec{}; - std::transform(value.begin(), value.end(), std::back_inserter(vec), - [](float a) -> std::string { return std::to_string(a); }); - data.insert_or_assign(key, - "[" + boost::algorithm::join(vec, std::string{LIST_SEPARATOR}) + "]"); + data.insert_or_assign(key, fmt::format("[{}]", fmt::join(value, std::string{LIST_SEPARATOR}))); } void ParamPackage::Set(const std::string& key, ParamPackage value) { @@ -293,15 +284,15 @@ void ParamPackage::Set(const std::string& key, ParamPackage value) { } void ParamPackage::Set(const std::string& key, std::vector value) { - std::vector vec{}; - std::transform(value.begin(), value.end(), std::back_inserter(vec), - [](ParamPackage& a) -> std::string { return a.Serialize(); }); - data.insert_or_assign(key, - "[" + boost::algorithm::join(vec, std::string{LIST_SEPARATOR}) + "]"); + data.insert_or_assign(key, fmt::format("[{}]", fmt::join(value, std::string{LIST_SEPARATOR}))); } // Other methods +std::ostream& operator<<(std::ostream& os, const ParamPackage& p) { + return os << p.Serialize(); +} + bool ParamPackage::Has(const std::string& key) const { return data.find(key) != data.end(); } @@ -362,3 +353,15 @@ std::string ParamPackage::ReplacePlaceholders(const std::string& str, } } // namespace Common + +template <> +struct fmt::formatter { + constexpr auto parse(fmt::format_parse_context& ctx) { + return ctx.begin(); + } + + template + auto format(const Common::ParamPackage& p, FormatContext& ctx) { + return format_to(ctx.out(), "{}", p.Serialize()); + } +}; diff --git a/src/common/param_package.h b/src/common/param_package.h index e6cec107e..a086ebeca 100644 --- a/src/common/param_package.h +++ b/src/common/param_package.h @@ -26,6 +26,7 @@ public: ParamPackage& operator=(ParamPackage&& other) = default; std::string Serialize() const; + friend std::ostream& operator<<(std::ostream& os, const ParamPackage& p); // Getters std::string Get(const std::string& key, const std::string& default_value) const;