diff --git a/src/include/units/physical/dimensions.h b/src/include/units/physical/dimensions.h index 10a10a32..cf6692a0 100644 --- a/src/include/units/physical/dimensions.h +++ b/src/include/units/physical/dimensions.h @@ -63,6 +63,10 @@ struct dim_angle : base_dimension<"A", U> {}; // ------------------------ derived dimensions ----------------------------- + +template A, DimensionOf T> +struct dim_angular_velocity : derived_dimension, exp> {}; + template T> struct dim_frequency : derived_dimension> {}; @@ -206,6 +210,9 @@ concept LuminousIntensity = QuantityOf; template concept Angle = QuantityOf; +template +concept AngularVelocity = QuantityOf; + template concept Frequency = QuantityOf; diff --git a/src/include/units/physical/si.h b/src/include/units/physical/si.h index a10e104a..106860e7 100644 --- a/src/include/units/physical/si.h +++ b/src/include/units/physical/si.h @@ -25,6 +25,8 @@ #include "si/absorbed_dose.h" #include "si/acceleration.h" #include "si/area.h" +#include "si/angle.h" +#include "si/angular_velocity.h" #include "si/capacitance.h" #include "si/catalytic_activity.h" #include "si/charge_density.h" diff --git a/src/include/units/physical/si/angular_velocity.h b/src/include/units/physical/si/angular_velocity.h new file mode 100644 index 00000000..c26ab131 --- /dev/null +++ b/src/include/units/physical/si/angular_velocity.h @@ -0,0 +1,49 @@ +// 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 +#include +#include + +#include + +namespace units::physical::si { + +struct radian_per_second : named_unit {}; + +struct dim_angular_velocity : physical::dim_angular_velocity {}; + +template +using angular_velocity = quantity; + +inline namespace literals { + +// rad / s +constexpr auto operator"" q_rad_per_s(unsigned long long l) { return angular_velocity(l); } +constexpr auto operator"" q_rad_per_s(long double l) { return angular_velocity(l); } + + +} // namespace literals + +} // namespace units::physical::si diff --git a/test/unit_test/static/si_test.cpp b/test/unit_test/static/si_test.cpp index 65ce7e3b..21fc12e5 100644 --- a/test/unit_test/static/si_test.cpp +++ b/test/unit_test/static/si_test.cpp @@ -377,4 +377,7 @@ static_assert(1q_J_per_mol * 1q_mol_per_m3 * 1q_m3 == 1q_N * 1q_m); static_assert(detail::unit_text() == "J/mol"); +// angular velocity +static_assert(1q_rad / 1q_s == 1q_rad_per_s); +static_assert(detail::unit_text() == "ω"); } // namespace