diff --git a/README.md b/README.md index 64802328..ca04b98c 100644 --- a/README.md +++ b/README.md @@ -9,11 +9,12 @@ ```cpp #include +#include #include using namespace units; -constexpr Velocity auto avg_speed(Length auto d, Time auto t) +constexpr Velocity AUTO avg_speed(Length auto d, Time auto t) { return d / t; } @@ -21,12 +22,15 @@ constexpr Velocity auto avg_speed(Length auto d, Time auto t) int main() { using namespace si::literals; - Velocity auto v1 = avg_speed(220km, 2h); - Velocity auto v2 = avg_speed(140mi, 2h); + Velocity AUTO v1 = avg_speed(220km, 2h); + Velocity AUTO v2 = avg_speed(si::length(140), si::time(2)); + Velocity AUTO v3 = quantity_cast(v2); + Velocity AUTO v4 = quantity_cast(v3); - std::cout << v1 << '\n'; // 110 km/h - std::cout << quantity_cast(speed) << '\n'; // 30.5556 m/s - std::cout << v2 << '\n'; // 70 mi/h + std::cout << v1 << '\n'; // 110 km/h + std::cout << fmt::format("{}", v2) << '\n'; // 70 mi/h + std::cout << fmt::format("{:%Q in %q}", v3) << '\n'; // 31.2928 in m/s + std::cout << fmt::format("{:%Q}", v4) << '\n'; // 31 } ``` diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index d9f229c5..b06b41b2 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -26,5 +26,6 @@ function(add_example target) endfunction() add_example(avg_velocity) +add_example(hello_units) add_example(measurement) add_example(unknown_dimension) diff --git a/example/hello_units.cpp b/example/hello_units.cpp new file mode 100644 index 00000000..2d049134 --- /dev/null +++ b/example/hello_units.cpp @@ -0,0 +1,46 @@ +// 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. + +#include +#include +#include + +using namespace units; + +constexpr Velocity AUTO avg_speed(Length auto d, Time auto t) +{ + return d / t; +} + +int main() +{ + using namespace si::literals; + Velocity AUTO v1 = avg_speed(220km, 2h); + Velocity AUTO v2 = avg_speed(si::length(140), si::time(2)); + Velocity AUTO v3 = quantity_cast(v2); + Velocity AUTO v4 = quantity_cast(v3); + + std::cout << v1 << '\n'; // 110 km/h + std::cout << fmt::format("{}", v2) << '\n'; // 70 mi/h + std::cout << fmt::format("{:%Q in %q}", v3) << '\n'; // 31.2928 in m/s + std::cout << fmt::format("{:%Q}", v4) << '\n'; // 31 +}