diff --git a/src/systems/CMakeLists.txt b/src/systems/CMakeLists.txt index 5ca25a9c..745c1788 100644 --- a/src/systems/CMakeLists.txt +++ b/src/systems/CMakeLists.txt @@ -31,6 +31,7 @@ add_mp_units_module( include/mp-units/systems/isq/atomic_and_nuclear_physics.h include/mp-units/systems/isq/base_quantities.h include/mp-units/systems/isq/electromagnetism.h + include/mp-units/systems/isq/information_science_and_technology.h include/mp-units/systems/isq/light_and_radiation.h include/mp-units/systems/isq/mechanics.h include/mp-units/systems/isq/si_quantities.h diff --git a/src/systems/include/mp-units/systems/iec/quantities.h b/src/systems/include/mp-units/systems/iec/quantities.h index 0d496e6b..da411ff5 100644 --- a/src/systems/include/mp-units/systems/iec/quantities.h +++ b/src/systems/include/mp-units/systems/iec/quantities.h @@ -22,57 +22,67 @@ #pragma once -#include -#include -#include - -#ifndef MP_UNITS_IN_MODULE_INTERFACE -#include -#include -#endif +#include MP_UNITS_EXPORT namespace mp_units::iec { -// dimensions of base quantities -// clang-format off -inline constexpr struct dim_traffic_intensity final : base_dimension<"A"> {} dim_traffic_intensity; -// clang-format on +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto dim_traffic_intensity = + isq::dim_traffic_intensity; -// quantities -QUANTITY_SPEC(traffic_intensity, dim_traffic_intensity); -QUANTITY_SPEC(traffic_offered_intensity, traffic_intensity); -QUANTITY_SPEC(traffic_carried_intensity, traffic_intensity); -inline constexpr auto traffic_load = traffic_carried_intensity; -QUANTITY_SPEC(mean_queue_length, dimensionless); -QUANTITY_SPEC(loss_probability, dimensionless); -QUANTITY_SPEC(waiting_probability, dimensionless); -QUANTITY_SPEC(call_intensity, inverse(isq::duration)); -inline constexpr auto calling_rate = call_intensity; -QUANTITY_SPEC(completed_call_intensity, call_intensity); -QUANTITY_SPEC(storage_capacity, dimensionless, is_kind); -inline constexpr auto storage_size = storage_capacity; -QUANTITY_SPEC(equivalent_binary_storage_capacity, storage_capacity); -QUANTITY_SPEC(transfer_rate, storage_capacity / isq::duration); -QUANTITY_SPEC(period_of_data_elements, isq::period, inverse(transfer_rate)); -QUANTITY_SPEC(binary_digit_rate, transfer_rate); -inline constexpr auto bit_rate = binary_digit_rate; -QUANTITY_SPEC(period_of_binary_digits, isq::period, inverse(binary_digit_rate)); -inline constexpr auto bit_period = period_of_binary_digits; -QUANTITY_SPEC(equivalent_binary_digit_rate, binary_digit_rate); -inline constexpr auto equivalent_bit_rate = bit_rate; -QUANTITY_SPEC(modulation_rate, inverse(isq::duration)); -inline constexpr auto line_digit_rate = modulation_rate; -QUANTITY_SPEC(quantizing_distortion_power, isq::power); -QUANTITY_SPEC(carrier_power, isq::power); -QUANTITY_SPEC(signal_energy_per_binary_digit, carrier_power* period_of_binary_digits); -QUANTITY_SPEC(error_probability, dimensionless); -QUANTITY_SPEC(Hamming_distance, dimensionless); -QUANTITY_SPEC(clock_frequency, isq::frequency); -inline constexpr auto clock_rate = clock_frequency; -QUANTITY_SPEC(decision_content, dimensionless); - -// TODO how to model information_content and the following quantities??? -// QUANTITY_SPEC(information_content, ...); +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto traffic_intensity = + isq::traffic_intensity; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto traffic_offered_intensity = + isq::traffic_offered_intensity; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto traffic_carried_intensity = + isq::traffic_carried_intensity; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto traffic_load = + isq::traffic_carried_intensity; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto mean_queue_length = + isq::mean_queue_length; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto loss_probability = + isq::loss_probability; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto waiting_probability = + isq::waiting_probability; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto call_intensity = isq::call_intensity; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto calling_rate = isq::call_intensity; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto completed_call_intensity = + isq::completed_call_intensity; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto storage_capacity = + isq::storage_capacity; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto storage_size = isq::storage_capacity; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto equivalent_binary_storage_capacity = + isq::equivalent_binary_storage_capacity; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto transfer_rate = isq::transfer_rate; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto period_of_data_elements = + isq::period_of_data_elements; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto binary_digit_rate = + isq::binary_digit_rate; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto bit_rate = isq::binary_digit_rate; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto period_of_binary_digits = + isq::period_of_binary_digits; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto bit_period = + isq::period_of_binary_digits; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto equivalent_binary_digit_rate = + isq::equivalent_binary_digit_rate; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto equivalent_bit_rate = isq::bit_rate; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto modulation_rate = + isq::modulation_rate; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto line_digit_rate = + isq::modulation_rate; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto quantizing_distortion_power = + isq::quantizing_distortion_power; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto carrier_power = isq::carrier_power; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto signal_energy_per_binary_digit = + isq::signal_energy_per_binary_digit; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto error_probability = + isq::error_probability; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto Hamming_distance = + isq::Hamming_distance; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto clock_frequency = + isq::clock_frequency; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto clock_rate = isq::clock_frequency; +[[deprecated("Quantity type moved to the `isq` namespace")]] inline constexpr auto decision_content = + isq::decision_content; } // namespace mp_units::iec diff --git a/src/systems/include/mp-units/systems/iec/units.h b/src/systems/include/mp-units/systems/iec/units.h index 597537b7..7fafaf77 100644 --- a/src/systems/include/mp-units/systems/iec/units.h +++ b/src/systems/include/mp-units/systems/iec/units.h @@ -25,6 +25,7 @@ #include #include #include +#include #include #ifndef MP_UNITS_IN_MODULE_INTERFACE @@ -39,11 +40,11 @@ namespace mp_units::iec { inline constexpr struct volt_ampere_reactive_power final : named_unit<"var", si::volt * si::ampere, kind_of> {} volt_ampere_reactive_power; // Information science and technology -inline constexpr struct erlang final : named_unit<"E", kind_of> {} erlang; -inline constexpr struct bit final : named_unit<"bit", one, kind_of> {} bit; +inline constexpr struct erlang final : named_unit<"E", kind_of> {} erlang; +inline constexpr struct bit final : named_unit<"bit", one, kind_of> {} bit; inline constexpr struct octet final : named_unit<"o", mag<8> * bit> {} octet; inline constexpr struct byte final : named_unit<"B", mag<8> * bit> {} byte; -inline constexpr struct baud final : named_unit<"Bd", one / si::second, kind_of> {} baud; +inline constexpr struct baud final : named_unit<"Bd", one / si::second, kind_of> {} baud; // clang-format on } // namespace mp_units::iec diff --git a/src/systems/include/mp-units/systems/isq.h b/src/systems/include/mp-units/systems/isq.h index f1452263..d3563781 100644 --- a/src/systems/include/mp-units/systems/isq.h +++ b/src/systems/include/mp-units/systems/isq.h @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include diff --git a/src/systems/include/mp-units/systems/isq/information_science_and_technology.h b/src/systems/include/mp-units/systems/isq/information_science_and_technology.h new file mode 100644 index 00000000..c17da2be --- /dev/null +++ b/src/systems/include/mp-units/systems/isq/information_science_and_technology.h @@ -0,0 +1,78 @@ +// 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 + +#ifndef MP_UNITS_IN_MODULE_INTERFACE +#include +#include +#endif + +MP_UNITS_EXPORT +namespace mp_units::isq { + +// dimensions of base quantities +// clang-format off +inline constexpr struct dim_traffic_intensity final : base_dimension<"A"> {} dim_traffic_intensity; +// clang-format on + +// quantities +QUANTITY_SPEC(traffic_intensity, dim_traffic_intensity); +QUANTITY_SPEC(traffic_offered_intensity, traffic_intensity); +QUANTITY_SPEC(traffic_carried_intensity, traffic_intensity); +inline constexpr auto traffic_load = traffic_carried_intensity; +QUANTITY_SPEC(mean_queue_length, dimensionless); +QUANTITY_SPEC(loss_probability, dimensionless); +QUANTITY_SPEC(waiting_probability, dimensionless); +QUANTITY_SPEC(call_intensity, inverse(isq::duration)); +inline constexpr auto calling_rate = call_intensity; +QUANTITY_SPEC(completed_call_intensity, call_intensity); +QUANTITY_SPEC(storage_capacity, dimensionless, is_kind); +inline constexpr auto storage_size = storage_capacity; +QUANTITY_SPEC(equivalent_binary_storage_capacity, storage_capacity); +QUANTITY_SPEC(transfer_rate, storage_capacity / isq::duration); +QUANTITY_SPEC(period_of_data_elements, isq::period, inverse(transfer_rate)); +QUANTITY_SPEC(binary_digit_rate, transfer_rate); +inline constexpr auto bit_rate = binary_digit_rate; +QUANTITY_SPEC(period_of_binary_digits, isq::period, inverse(binary_digit_rate)); +inline constexpr auto bit_period = period_of_binary_digits; +QUANTITY_SPEC(equivalent_binary_digit_rate, binary_digit_rate); +inline constexpr auto equivalent_bit_rate = bit_rate; +QUANTITY_SPEC(modulation_rate, inverse(isq::duration)); +inline constexpr auto line_digit_rate = modulation_rate; +QUANTITY_SPEC(quantizing_distortion_power, isq::power); +QUANTITY_SPEC(carrier_power, isq::power); +QUANTITY_SPEC(signal_energy_per_binary_digit, carrier_power* period_of_binary_digits); +QUANTITY_SPEC(error_probability, dimensionless); +QUANTITY_SPEC(Hamming_distance, dimensionless); +QUANTITY_SPEC(clock_frequency, isq::frequency); +inline constexpr auto clock_rate = clock_frequency; +QUANTITY_SPEC(decision_content, dimensionless); + +// TODO how to model information_content and the following quantities??? +// QUANTITY_SPEC(information_content, ...); + +} // namespace mp_units::isq diff --git a/test/static/iec_test.cpp b/test/static/iec_test.cpp index 6d5825c5..8e331160 100644 --- a/test/static/iec_test.cpp +++ b/test/static/iec_test.cpp @@ -21,7 +21,7 @@ // SOFTWARE. #include -#include +#include #include /* ************** DERIVED DIMENSIONS THAT INCLUDE UNITS WITH SPECIAL NAMES **************** */ @@ -29,73 +29,33 @@ namespace { using namespace mp_units; -using namespace mp_units::iec; using namespace mp_units::iec::unit_symbols; using namespace mp_units::si::unit_symbols; using enum mp_units::quantity_character; -[[nodiscard]] consteval bool verify(QuantitySpec auto q, quantity_character ch, Unit auto... units) -{ - return q.character == ch && (... && requires { q[units]; }); -} - -// quantities -static_assert(verify(traffic_intensity, scalar, E)); -static_assert(verify(traffic_offered_intensity, scalar, E)); -static_assert(verify(traffic_carried_intensity, scalar, E)); -static_assert(verify(traffic_load, scalar, E)); -static_assert(verify(mean_queue_length, scalar, one)); -static_assert(verify(loss_probability, scalar, one)); -static_assert(verify(waiting_probability, scalar, one)); -static_assert(verify(call_intensity, scalar, one / s)); -static_assert(verify(calling_rate, scalar, one / s)); -static_assert(verify(completed_call_intensity, scalar, one / s)); -static_assert(verify(storage_capacity, scalar, one, bit, o, B)); -static_assert(verify(storage_size, scalar, one, bit, o, B)); -static_assert(verify(equivalent_binary_storage_capacity, scalar, one, bit)); -static_assert(verify(transfer_rate, scalar, one / s, o / s, B / s)); -static_assert(verify(period_of_data_elements, scalar, s)); -static_assert(verify(binary_digit_rate, scalar, one / s, bit / s)); -static_assert(verify(bit_rate, scalar, one / s, bit / s)); -static_assert(verify(period_of_binary_digits, scalar, s)); -static_assert(verify(bit_period, scalar, s)); -static_assert(verify(equivalent_binary_digit_rate, scalar, one / s, bit / s)); -static_assert(verify(equivalent_bit_rate, scalar, one / s, bit / s)); -static_assert(verify(modulation_rate, scalar, one / s, Bd)); -static_assert(verify(line_digit_rate, scalar, one / s, Bd)); -static_assert(verify(quantizing_distortion_power, scalar, W)); -static_assert(verify(carrier_power, scalar, W)); -static_assert(verify(signal_energy_per_binary_digit, scalar, J)); -static_assert(verify(error_probability, scalar, one)); -static_assert(verify(Hamming_distance, scalar, one)); -static_assert(verify(clock_frequency, scalar, Hz)); -static_assert(verify(clock_rate, scalar, Hz)); -static_assert(verify(decision_content, scalar, one)); - - // unit conversions -static_assert(storage_capacity(1 * B) == storage_capacity(8 * bit)); -static_assert(storage_capacity(1024 * bit) == storage_capacity(1 * Kibit)); -static_assert(storage_capacity(1024 * B) == storage_capacity(1 * KiB)); -static_assert(storage_capacity(8 * 1024 * bit) == storage_capacity(1 * KiB)); -static_assert(storage_capacity(8 * Kibit) == storage_capacity(1 * KiB)); +static_assert(isq::storage_capacity(1 * B) == isq::storage_capacity(8 * bit)); +static_assert(isq::storage_capacity(1024 * bit) == isq::storage_capacity(1 * Kibit)); +static_assert(isq::storage_capacity(1024 * B) == isq::storage_capacity(1 * KiB)); +static_assert(isq::storage_capacity(8 * 1024 * bit) == isq::storage_capacity(1 * KiB)); +static_assert(isq::storage_capacity(8 * Kibit) == isq::storage_capacity(1 * KiB)); -static_assert(storage_capacity(1 * kbit) == storage_capacity(1000 * bit)); -static_assert(storage_capacity(2000 * Mibit) == storage_capacity(2097152 * kbit)); +static_assert(isq::storage_capacity(1 * kbit) == isq::storage_capacity(1000 * bit)); +static_assert(isq::storage_capacity(2000 * Mibit) == isq::storage_capacity(2097152 * kbit)); -static_assert(storage_capacity(1 * Kibit) == storage_capacity(1024 * bit)); -static_assert(storage_capacity(1 * Mibit) == storage_capacity(1024 * Kibit)); -static_assert(storage_capacity(1 * Gibit) == storage_capacity(1024 * Mibit)); -static_assert(storage_capacity(1 * Tibit) == storage_capacity(1024 * Gibit)); -static_assert(storage_capacity(1 * Pibit) == storage_capacity(1024 * Tibit)); -static_assert(storage_capacity(1 * Eibit) == storage_capacity(1024 * Pibit)); +static_assert(isq::storage_capacity(1 * Kibit) == isq::storage_capacity(1024 * bit)); +static_assert(isq::storage_capacity(1 * Mibit) == isq::storage_capacity(1024 * Kibit)); +static_assert(isq::storage_capacity(1 * Gibit) == isq::storage_capacity(1024 * Mibit)); +static_assert(isq::storage_capacity(1 * Tibit) == isq::storage_capacity(1024 * Gibit)); +static_assert(isq::storage_capacity(1 * Pibit) == isq::storage_capacity(1024 * Tibit)); +static_assert(isq::storage_capacity(1 * Eibit) == isq::storage_capacity(1024 * Pibit)); // transfer rate -static_assert(storage_capacity(16 * B) / isq::duration(2 * s) == transfer_rate(8 * B / s)); -static_assert(storage_capacity(120 * kB) / isq::duration(2 * min) == transfer_rate(1000 * B / s)); +static_assert(isq::storage_capacity(16 * B) / isq::duration(2 * s) == isq::transfer_rate(8 * B / s)); +static_assert(isq::storage_capacity(120 * kB) / isq::duration(2 * min) == isq::transfer_rate(1000 * B / s)); // modulation rate -static_assert(12 / isq::duration(2 * s) == modulation_rate(6 * Bd)); -static_assert(6000 / isq::duration(3 * s) == modulation_rate(2 * kBd)); +static_assert(12 / isq::duration(2 * s) == isq::modulation_rate(6 * Bd)); +static_assert(6000 / isq::duration(3 * s) == isq::modulation_rate(2 * kBd)); } // namespace diff --git a/test/static/isq_test.cpp b/test/static/isq_test.cpp index 6e90cd11..ba3495e8 100644 --- a/test/static/isq_test.cpp +++ b/test/static/isq_test.cpp @@ -21,6 +21,7 @@ // SOFTWARE. #include +#include #include #include @@ -28,6 +29,7 @@ namespace { using namespace mp_units; using namespace mp_units::si::unit_symbols; +using namespace mp_units::iec::unit_symbols; using enum mp_units::quantity_character; [[nodiscard]] consteval bool verify(QuantitySpec auto q, quantity_character ch, Unit auto... units) @@ -353,4 +355,37 @@ static_assert(verify(isq::absorbed_dose, scalar, Gy, J / kg, m2 / s2)); static_assert(verify(isq::quality_factor, scalar, one)); static_assert(verify(isq::dose_equivalent, scalar, Sv, J / kg, m2 / s2)); +// information science and technology +static_assert(verify(isq::traffic_intensity, scalar, E)); +static_assert(verify(isq::traffic_offered_intensity, scalar, E)); +static_assert(verify(isq::traffic_carried_intensity, scalar, E)); +static_assert(verify(isq::traffic_load, scalar, E)); +static_assert(verify(isq::mean_queue_length, scalar, one)); +static_assert(verify(isq::loss_probability, scalar, one)); +static_assert(verify(isq::waiting_probability, scalar, one)); +static_assert(verify(isq::call_intensity, scalar, one / s)); +static_assert(verify(isq::calling_rate, scalar, one / s)); +static_assert(verify(isq::completed_call_intensity, scalar, one / s)); +static_assert(verify(isq::storage_capacity, scalar, one, bit, o, B)); +static_assert(verify(isq::storage_size, scalar, one, bit, o, B)); +static_assert(verify(isq::equivalent_binary_storage_capacity, scalar, one, bit)); +static_assert(verify(isq::transfer_rate, scalar, one / s, o / s, B / s)); +static_assert(verify(isq::period_of_data_elements, scalar, s)); +static_assert(verify(isq::binary_digit_rate, scalar, one / s, bit / s)); +static_assert(verify(isq::bit_rate, scalar, one / s, bit / s)); +static_assert(verify(isq::period_of_binary_digits, scalar, s)); +static_assert(verify(isq::bit_period, scalar, s)); +static_assert(verify(isq::equivalent_binary_digit_rate, scalar, one / s, bit / s)); +static_assert(verify(isq::equivalent_bit_rate, scalar, one / s, bit / s)); +static_assert(verify(isq::modulation_rate, scalar, one / s, Bd)); +static_assert(verify(isq::line_digit_rate, scalar, one / s, Bd)); +static_assert(verify(isq::quantizing_distortion_power, scalar, W)); +static_assert(verify(isq::carrier_power, scalar, W)); +static_assert(verify(isq::signal_energy_per_binary_digit, scalar, J)); +static_assert(verify(isq::error_probability, scalar, one)); +static_assert(verify(isq::Hamming_distance, scalar, one)); +static_assert(verify(isq::clock_frequency, scalar, Hz)); +static_assert(verify(isq::clock_rate, scalar, Hz)); +static_assert(verify(isq::decision_content, scalar, one)); + } // namespace