diff --git a/src/core/include/units/dimension.h b/src/core/include/units/dimension.h index 6aa81a26..458f45dc 100644 --- a/src/core/include/units/dimension.h +++ b/src/core/include/units/dimension.h @@ -211,12 +211,6 @@ template return is_same_v; } -// template -// [[nodiscard]] consteval bool equivalent(D1, D2) -// { -// return is_same_v, detail::dim_type>; -// } - template [[nodiscard]] consteval bool convertible(D1, D2) { diff --git a/src/core/include/units/reference.h b/src/core/include/units/reference.h index 1b89a09c..992a4df7 100644 --- a/src/core/include/units/reference.h +++ b/src/core/include/units/reference.h @@ -136,12 +136,6 @@ template void /*Use `q * (1 * r)` rather than `q * r`.*/ operator*(Quantity auto, Reference auto) = delete; -// template -// [[nodiscard]] consteval bool equivalent(R1, R2) -// { -// return equivalent(R1::dimension, R2::dimension) && R1::unit == R2::unit; -// } - template [[nodiscard]] consteval bool convertible(R1, R2) { diff --git a/test/unit_test/static/dimension_test.cpp b/test/unit_test/static/dimension_test.cpp index 526c0136..c933488d 100644 --- a/test/unit_test/static/dimension_test.cpp +++ b/test/unit_test/static/dimension_test.cpp @@ -120,7 +120,6 @@ static_assert(speed_dim == speed_dim); static_assert(length_dim / length_dim == one_dim); static_assert(1 / time_dim != frequency_dim); -// static_assert(equivalent(1 / time_dim, frequency_dim)); static_assert(convertible(1 / time_dim, frequency_dim)); static_assert(1 / frequency_dim == time_dim); static_assert(frequency_dim * time_dim == one_dim); @@ -128,7 +127,6 @@ static_assert(std::is_same_v, frequency_dim_>); static_assert(length_dim * length_dim != area_dim); -// static_assert(equivalent(length_dim * length_dim, area_dim)); static_assert(convertible(length_dim * length_dim, area_dim)); static_assert(length_dim * length_dim != volume_dim); static_assert(area_dim / length_dim == length_dim); @@ -136,20 +134,14 @@ static_assert(std::is_same_v, area_dim_>); static_assert(length_dim * length_dim * length_dim != volume_dim); -// static_assert(equivalent(length_dim * length_dim * length_dim, volume_dim)); static_assert(area_dim * length_dim != volume_dim); -// static_assert(equivalent(area_dim * length_dim, volume_dim)); static_assert(volume_dim / length_dim != area_dim); -// static_assert(equivalent(volume_dim / length_dim, area_dim)); static_assert(volume_dim / length_dim / length_dim == length_dim); static_assert(area_dim * area_dim / length_dim != volume_dim); -// static_assert(equivalent(area_dim * area_dim / length_dim, volume_dim)); static_assert(area_dim * (area_dim / length_dim) != volume_dim); -// static_assert(equivalent(area_dim * (area_dim / length_dim), volume_dim)); static_assert(volume_dim / (length_dim * length_dim) == length_dim); static_assert(length_dim / time_dim != speed_dim); -// static_assert(equivalent(length_dim / time_dim, speed_dim)); static_assert(length_dim * time_dim != speed_dim); static_assert(length_dim / time_dim / time_dim != speed_dim); static_assert(length_dim / speed_dim == time_dim); @@ -160,34 +152,25 @@ static_assert(std::is_same_v); static_assert(length_dim / time_dim / time_dim != acceleration_dim); -// static_assert(equivalent(length_dim / time_dim / time_dim, acceleration_dim)); static_assert(length_dim / (time_dim * time_dim) != acceleration_dim); -// static_assert(equivalent(length_dim / (time_dim * time_dim), acceleration_dim)); static_assert(speed_dim / time_dim != acceleration_dim); -// static_assert(equivalent(speed_dim / time_dim, acceleration_dim)); static_assert(speed_dim / acceleration_dim == time_dim); static_assert(acceleration_dim * time_dim != speed_dim); -// static_assert(equivalent(acceleration_dim * time_dim, speed_dim)); static_assert(acceleration_dim * (time_dim * time_dim) == length_dim); static_assert(acceleration_dim / speed_dim != frequency_dim); -// static_assert(equivalent(acceleration_dim / speed_dim, frequency_dim)); // comparison of convertible named dimensions static_assert(velocity_dim != speed_dim); -// static_assert(equivalent(velocity_dim, speed_dim)); static_assert(convertible(speed_dim, velocity_dim)); static_assert(std::is_same_v, velocity_dim_>); static_assert(std::is_same_v, velocity_dim_>); // comparisons of equivalent but not convertible dimensions static_assert(energy_dim != torque_dim); -// static_assert(equivalent(energy_dim, torque_dim)); static_assert(!convertible(energy_dim, torque_dim)); static_assert(force_dim * length_dim != energy_dim); static_assert(force_dim * length_dim != torque_dim); -// static_assert(equivalent(force_dim * length_dim, energy_dim)); -// static_assert(equivalent(force_dim * length_dim, torque_dim)); static_assert(convertible(force_dim * length_dim, energy_dim)); static_assert(convertible(force_dim * length_dim, torque_dim)); template @@ -198,34 +181,27 @@ concept no_common_type = requires { static_assert(no_common_type); static_assert(frequency_dim != action_dim); -// static_assert(equivalent(frequency_dim, action_dim)); static_assert(!convertible(frequency_dim, action_dim)); static_assert(no_common_type); // Dimensionless -// static_assert(equivalent(power_dim / power_dim, efficiency_dim)); static_assert(convertible(power_dim / power_dim, efficiency_dim)); static_assert(power_dim / power_dim != efficiency_dim); static_assert(one_dim != efficiency_dim); -// static_assert(equivalent(efficiency_dim, strain_dim)); static_assert(!convertible(efficiency_dim, strain_dim)); static_assert(efficiency_dim != strain_dim); static_assert(stress_dim / stress_dim != strain_dim); static_assert(stress_dim / stress_dim != efficiency_dim); -// static_assert(equivalent(stress_dim / stress_dim, strain_dim)); -// static_assert(equivalent(stress_dim / stress_dim, efficiency_dim)); static_assert(convertible(stress_dim / stress_dim, strain_dim)); static_assert(convertible(stress_dim / stress_dim, efficiency_dim)); // comparison of not equivalent dimensions static_assert(length_dim != time_dim); -// static_assert(!equivalent(length_dim, time_dim)); static_assert(!convertible(length_dim, time_dim)); static_assert(acceleration_dim != speed_dim); -// static_assert(!equivalent(acceleration_dim, speed_dim)); static_assert(!convertible(acceleration_dim, speed_dim)); } // namespace