mirror of
https://github.com/mpusz/mp-units.git
synced 2025-07-29 18:07:16 +02:00
fmt support started
This commit is contained in:
Mateusz Pusz
92
src/include/units/bits/format_utils.h
Normal file
92
src/include/units/bits/format_utils.h
Normal file
@ -0,0 +1,92 @@
|
||||
// The MIT License (MIT)
|
||||
//
|
||||
// Copyright (c) 2018 Mateusz Pusz
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights
|
||||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the Software is
|
||||
// furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in all
|
||||
// copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
// SOFTWARE.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <units/unit.h>
|
||||
#include <ostream>
|
||||
#include <string_view>
|
||||
|
||||
namespace units {
|
||||
|
||||
namespace detail {
|
||||
|
||||
template<typename Ratio, typename CharT, typename Traits>
|
||||
void print_ratio(std::basic_ostream<CharT, Traits>& os)
|
||||
{
|
||||
if constexpr(Ratio::num != 1 || Ratio::den != 1) {
|
||||
if constexpr(Ratio::den == 1) {
|
||||
os << "[" << Ratio::num << "]";
|
||||
}
|
||||
else {
|
||||
os << "[" << Ratio::num << "/" << Ratio::den << "]";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
template<typename Ratio, typename PrefixType, typename CharT, typename Traits>
|
||||
void print_prefix_or_ratio(std::basic_ostream<CharT, Traits>& os)
|
||||
{
|
||||
if constexpr(Ratio::num != 1 || Ratio::den != 1) {
|
||||
if(!std::same_as<PrefixType, no_prefix>) {
|
||||
using prefix = downcast_target<detail::prefix_base<PrefixType, Ratio>>;
|
||||
|
||||
if constexpr(!std::same_as<prefix, prefix_base<PrefixType, Ratio>>) {
|
||||
// print as a prefixed unit
|
||||
os << prefix::symbol;
|
||||
return;
|
||||
}
|
||||
}
|
||||
// print as a ratio of the coherent unit
|
||||
print_ratio<Ratio>(os);
|
||||
}
|
||||
}
|
||||
|
||||
template<typename CharT, typename Traits, typename... Es>
|
||||
void print_dimensions(std::basic_ostream<CharT, Traits>& os, dimension<Es...>)
|
||||
{
|
||||
bool first = true;
|
||||
auto ingr_printer = [&]<typename E>(E) {
|
||||
if constexpr(E::num < 0) {
|
||||
os << (first ? "1/" : "/");
|
||||
}
|
||||
else {
|
||||
os << (first ? "" : "⋅");
|
||||
}
|
||||
os << E::dimension::symbol;
|
||||
if constexpr(E::den != 1) {
|
||||
os << "^(" << abs(E::num) << "/" << E::den << ")";
|
||||
}
|
||||
else if constexpr(abs(E::num) != 1) {
|
||||
// if constexpr(is_unicode<CharT>)
|
||||
// os << superscript<abs(E::num)>;
|
||||
// else
|
||||
os << "^" << abs(E::num);
|
||||
}
|
||||
first = false;
|
||||
};
|
||||
(ingr_printer(Es{}), ...);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
} // namespace units
|
||||
@ -22,83 +22,17 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <units/unit.h>
|
||||
#include <ostream>
|
||||
#include <string_view>
|
||||
#include <units/quantity.h>
|
||||
#include <fmt/format.h>
|
||||
|
||||
namespace units {
|
||||
|
||||
namespace detail {
|
||||
|
||||
template<typename Ratio, typename CharT, typename Traits>
|
||||
void print_ratio(std::basic_ostream<CharT, Traits>& os)
|
||||
{
|
||||
if constexpr(Ratio::num != 1 || Ratio::den != 1) {
|
||||
if constexpr(Ratio::den == 1) {
|
||||
os << "[" << Ratio::num << "]";
|
||||
}
|
||||
else {
|
||||
os << "[" << Ratio::num << "/" << Ratio::den << "]";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
template<typename Ratio, typename PrefixType, typename CharT, typename Traits>
|
||||
void print_prefix_or_ratio(std::basic_ostream<CharT, Traits>& os)
|
||||
{
|
||||
if constexpr(Ratio::num != 1 || Ratio::den != 1) {
|
||||
if(!std::same_as<PrefixType, no_prefix>) {
|
||||
using prefix = downcast_target<detail::prefix_base<PrefixType, Ratio>>;
|
||||
|
||||
if constexpr(!std::same_as<prefix, prefix_base<PrefixType, Ratio>>) {
|
||||
// print as a prefixed unit
|
||||
os << prefix::symbol;
|
||||
return;
|
||||
}
|
||||
}
|
||||
// print as a ratio of the coherent unit
|
||||
print_ratio<Ratio>(os);
|
||||
}
|
||||
}
|
||||
|
||||
template<typename CharT, typename Traits, typename... Es>
|
||||
void print_dimensions(std::basic_ostream<CharT, Traits>& os, dimension<Es...>)
|
||||
{
|
||||
bool first = true;
|
||||
auto ingr_printer = [&]<typename E>(E) {
|
||||
if constexpr(E::num < 0) {
|
||||
os << (first ? "1/" : "/");
|
||||
}
|
||||
else {
|
||||
os << (first ? "" : "⋅");
|
||||
}
|
||||
os << E::dimension::symbol;
|
||||
if constexpr(E::den != 1) {
|
||||
os << "^(" << abs(E::num) << "/" << E::den << ")";
|
||||
}
|
||||
else if constexpr(abs(E::num) != 1) {
|
||||
// if constexpr(is_unicode<CharT>)
|
||||
// os << superscript<abs(E::num)>;
|
||||
// else
|
||||
os << "^" << abs(E::num);
|
||||
}
|
||||
first = false;
|
||||
};
|
||||
(ingr_printer(Es{}), ...);
|
||||
}
|
||||
template<typename U, typename Rep, typename CharT>
|
||||
struct fmt::formatter<units::quantity<U, Rep>, CharT> {
|
||||
template<typename ParseContext>
|
||||
constexpr auto parse(ParseContext& ctx) { return ctx.begin(); }
|
||||
|
||||
template<typename FormatContext>
|
||||
auto format(const units::quantity<U, Rep>& q, FormatContext& ctx)
|
||||
{
|
||||
return format_to(ctx.out(), "{:.1f}", q.count());
|
||||
}
|
||||
|
||||
} // namespace units
|
||||
|
||||
// template<Unit U, Scalar Rep, typename CharT>
|
||||
// struct fmt::formatter<units::quantity<U, Rep>, CharT> {
|
||||
// template<typename ParseContext>
|
||||
// constexpr auto parse(ParseContext& ctx) { return ctx.begin(); }
|
||||
|
||||
// template<typename FormatContext>
|
||||
// auto format(const units::quantity<U, Rep>& q, FormatContext& ctx)
|
||||
// {
|
||||
// return format_to(ctx.out(), "{:.1f}, {:.1f}", p.x, p.y);
|
||||
// }
|
||||
// }
|
||||
};
|
||||
|
||||
@ -23,8 +23,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <units/bits/concepts.h>
|
||||
#include <units/bits/format_utils.h>
|
||||
#include <units/unit.h>
|
||||
#include <units/format.h>
|
||||
#include <limits>
|
||||
#include <ostream>
|
||||
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
#include "units/dimensions/power.h"
|
||||
#include "units/dimensions/velocity.h"
|
||||
#include "units/dimensions/volume.h"
|
||||
#include "units/format.h"
|
||||
#include "units/math.h"
|
||||
#include <catch2/catch.hpp>
|
||||
#include <sstream>
|
||||
@ -159,23 +160,152 @@ TEST_CASE("operator<< on a quantity", "[text][ostream]")
|
||||
}
|
||||
}
|
||||
|
||||
// SCENARIO("default format '{}' produces the same output as operator<<", "[text][fmt]")
|
||||
// {
|
||||
// GIVEN("A quantity q") {
|
||||
// auto q = 2m;
|
||||
// REQUIRE(q.count() == 2);
|
||||
TEST_CASE("fmt with default format {} on a quantity", "[text][fmt]")
|
||||
{
|
||||
std::stringstream stream;
|
||||
|
||||
// WHEN("format(\"{}\", q) is called") {
|
||||
// std::string fmtstr = format("{}", q);
|
||||
SECTION("quantity with a predefined unit")
|
||||
{
|
||||
SECTION("integral representation")
|
||||
{
|
||||
constexpr auto q = 60W;
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
|
||||
// THEN("the same output as operator<< is returned") {
|
||||
// std::stringstream stream;
|
||||
// stream << q;
|
||||
// REQUIRE(fmtstr == stream.str());
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
SECTION("floating-point representation")
|
||||
{
|
||||
constexpr auto q = 72.5kJ;
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
|
||||
SECTION("unit with a prefix")
|
||||
{
|
||||
constexpr auto q = 125us;
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
}
|
||||
|
||||
SECTION("quantity with a predefined dimension but unknown unit")
|
||||
{
|
||||
SECTION("unit::ratio as an SI prefix for a dimension with a special symbol")
|
||||
{
|
||||
constexpr auto q = 4.N * 2cm;
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
|
||||
SECTION("unit::ratio for a dimension without a special symbol")
|
||||
{
|
||||
constexpr auto q = 2.cm * 2m * 2m;
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
|
||||
SECTION("unit::ratio::num != 1 && unit::ratio::den == 1")
|
||||
{
|
||||
constexpr auto q = 4 * 2min / (2s * 2s);
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
|
||||
SECTION("unit::ratio::num == 1 && unit::ratio::den != 1")
|
||||
{
|
||||
constexpr auto q = 20._J / 2min;
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
|
||||
SECTION("unit::ratio::num != 1 && unit::ratio::den != 1")
|
||||
{
|
||||
constexpr auto q = 60.kJ / 2min;
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
}
|
||||
|
||||
SECTION("quantity with an unkown dimension")
|
||||
{
|
||||
SECTION("unit::ratio::num == 1 && unit::ratio::den == 1")
|
||||
{
|
||||
constexpr auto q = 2s * 2m * 2kg;
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
|
||||
SECTION("unit::ratio as an SI prefix")
|
||||
{
|
||||
constexpr auto q = 4km * 2s;
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
|
||||
SECTION("unit::ratio::num != 1 && unit::ratio::den == 1")
|
||||
{
|
||||
constexpr auto q = 4kg * 2min / (2s * 2s);
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
|
||||
SECTION("unit::ratio::num == 1 && unit::ratio::den != 1")
|
||||
{
|
||||
constexpr auto q = 20.kg / 2min;
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
|
||||
SECTION("unit::ratio::num != 1 && unit::ratio::den != 1")
|
||||
{
|
||||
constexpr auto q = 60.min / 2km;
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
|
||||
SECTION("exp::num == 1 && exp::den == 1")
|
||||
{
|
||||
constexpr auto q = 4m * 2s;
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
|
||||
SECTION("exp::num == 2 && exp::den == 1 for positive exponent")
|
||||
{
|
||||
constexpr auto q = 4m * 2s * 2s;
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
|
||||
SECTION("exp::num == 2 && exp::den == 1 for negative exponent (first dimension)")
|
||||
{
|
||||
constexpr auto q = 8.s / 2m / 2m;
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
|
||||
SECTION("exp::num == 2 && exp::den == 1 for negative exponent (not first dimension)")
|
||||
{
|
||||
constexpr auto q = 8.m / 2kg / 2kg;
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
|
||||
SECTION("fractional positive exponent")
|
||||
{
|
||||
auto q = sqrt(9.m);
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
|
||||
SECTION("fractional negative exponent")
|
||||
{
|
||||
auto q = sqrt(9 / 1.m);
|
||||
stream << q;
|
||||
REQUIRE(fmt::format("{}", q) == stream.str());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Restate operator<< definitions in terms of std::format to make I/O manipulators apply to whole objects
|
||||
// rather than their parts
|
||||
|
||||
Reference in New Issue
Block a user