refactor: systems defined in terms of SI moved under si namespace

This commit is contained in:
Mateusz Pusz committed 2020-09-10 17:14:33 +02:00
1 parent 7d204a1177
commit 79558a6d72
124 files changed
+580 -587

No files matched your search

+9 -9
View File
@@ -20,18 +20,18 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
#include "units/physical/cgs/length.h"
#include "units/physical/cgs/mass.h"
#include "units/format.h"
#include "units/math.h"
#include "units/physical/si/area.h"
#include "units/physical/si/cgs/length.h"
#include "units/physical/si/cgs/mass.h"
#include "units/physical/si/frequency.h"
#include "units/physical/si/power.h"
#include "units/physical/si/pressure.h"
#include "units/physical/si/speed.h"
#include "units/physical/si/volume.h"
#include "units/physical/si/surface_tension.h"
#include "units/physical/si/resistance.h"
#include "units/format.h"
#include "units/math.h"
#include "units/physical/si/speed.h"
#include "units/physical/si/surface_tension.h"
#include "units/physical/si/volume.h"
#include <catch2/catch.hpp>
#include <iomanip>
#include <sstream>
@@ -518,7 +518,7 @@ TEST_CASE("operator<< on a quantity", "[text][ostream][fmt]")
SECTION("CGS base units")
{
const auto q = 2._q_s * cgs::length<cgs::centimetre>(2) * cgs::mass<cgs::gram>(2);
const auto q = 2._q_s * si::cgs::length<si::cgs::centimetre>(2) * si::cgs::mass<si::cgs::gram>(2);
os << q;
SECTION("iostream")
@@ -603,7 +603,7 @@ TEST_CASE("operator<< on a quantity", "[text][ostream][fmt]")
SECTION("CGS base units")
{
const auto q = 2._q_s * cgs::length<si::metre>(2) * cgs::mass<si::kilogram>(2);
const auto q = 2._q_s * si::cgs::length<si::metre>(2) * si::cgs::mass<si::kilogram>(2);
os << q;
SECTION("iostream")
+14 -14
View File
@@ -20,24 +20,24 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
#include "units/physical/si.h"
#include "units/physical/us/length.h"
#include "units/physical/imperial/length.h"
#include "units/physical/international/length.h"
#include "units/physical/international/area.h"
#include "units/physical/international/volume.h"
#include "units/physical/international/speed.h"
#include "units/physical/iau/length.h"
#include "units/physical/typographic/length.h"
#include "units/format.h"
#include "units/physical/si.h"
#include "units/physical/si/iau/length.h"
#include "units/physical/si/imperial/length.h"
#include "units/physical/si/international/area.h"
#include "units/physical/si/international/length.h"
#include "units/physical/si/international/speed.h"
#include "units/physical/si/international/volume.h"
#include "units/physical/si/typographic/length.h"
#include "units/physical/si/us/length.h"
#include <catch2/catch.hpp>
using namespace units::physical::si;
using namespace units::physical::international;
using namespace units::physical::us;
using namespace units::physical::iau;
using namespace units::physical::imperial;
using namespace units::physical::typographic;
using namespace units::physical::si::international;
using namespace units::physical::si::us;
using namespace units::physical::si::iau;
using namespace units::physical::si::imperial;
using namespace units::physical::si::typographic;
TEST_CASE("fmt::format on synthesized unit symbols", "[text][fmt]")
{
+10 -11
View File
@@ -20,21 +20,20 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
#include <units/physical/cgs/acceleration.h>
#include <units/physical/cgs/energy.h>
#include <units/physical/cgs/force.h>
#include <units/physical/cgs/length.h>
#include <units/physical/cgs/mass.h>
#include <units/physical/cgs/power.h>
#include <units/physical/cgs/pressure.h>
#include <units/physical/cgs/time.h>
#include <units/physical/cgs/speed.h>
#include <units/physical/si/cgs/acceleration.h>
#include <units/physical/si/cgs/energy.h>
#include <units/physical/si/cgs/force.h>
#include <units/physical/si/cgs/length.h>
#include <units/physical/si/cgs/mass.h>
#include <units/physical/si/cgs/power.h>
#include <units/physical/si/cgs/pressure.h>
#include <units/physical/si/cgs/speed.h>
#include <units/physical/si/cgs/time.h>
namespace {
using namespace units;
using namespace units::physical::cgs;
using namespace units::physical::si::cgs;
/* ************** BASE DIMENSIONS **************** */
+10 -11
View File
@@ -20,21 +20,20 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
#include <units/physical/fps/acceleration.h>
#include <units/physical/fps/energy.h>
#include <units/physical/fps/force.h>
#include <units/physical/fps/length.h>
#include <units/physical/fps/mass.h>
#include <units/physical/fps/power.h>
#include <units/physical/fps/pressure.h>
#include <units/physical/fps/time.h>
#include <units/physical/fps/speed.h>
#include <units/physical/si/fps/acceleration.h>
#include <units/physical/si/fps/energy.h>
#include <units/physical/si/fps/force.h>
#include <units/physical/si/fps/length.h>
#include <units/physical/si/fps/mass.h>
#include <units/physical/si/fps/power.h>
#include <units/physical/si/fps/pressure.h>
#include <units/physical/si/fps/speed.h>
#include <units/physical/si/fps/time.h>
namespace {
using namespace units;
using namespace units::physical::fps;
using namespace units::physical::si::fps;
/* ************** BASE DIMENSIONS **************** */
+3 -5
View File
@@ -20,19 +20,17 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
#include "units/math.h"
#include "test_tools.h"
#include "units/math.h"
#include "units/physical/international/area.h"
#include "units/physical/si/area.h"
#include "units/physical/si/international/area.h"
#include "units/physical/si/speed.h"
#include "units/physical/international/area.h"
#include "units/math.h"
namespace {
using namespace units;
using namespace units::physical::si::literals;
using namespace units::physical::international::literals;
using namespace units::physical::si::international::literals;
static_assert(compare<decltype(pow<0>(2_q_m)), std::int64_t>);
static_assert(compare<decltype(pow<1>(2_q_m)), decltype(2_q_m)>);
@@ -20,14 +20,14 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
#include "units/quantity_point.h"
#include "test_tools.h"
#include "units/math.h"
#include "units/physical/si/area.h"
#include "units/physical/si/frequency.h"
#include "units/physical/si/speed.h"
#include "units/physical/si/us/length.h"
#include "units/physical/si/volume.h"
#include "units/physical/us/length.h"
#include "units/quantity_point.h"
#include <chrono>
#include <utility>
@@ -200,7 +200,7 @@ static_assert(compare<common_quantity_point<quantity_point<dim_length, kilometre
// common_type
using namespace units::physical::us::literals;
using namespace units::physical::si::us::literals;
static_assert(std::equality_comparable<decltype(quantity_point(1_q_m))>);
static_assert(std::equality_comparable_with<decltype(quantity_point(1_q_m)), decltype(quantity_point(1_q_km))>);
+2 -2
View File
@@ -25,8 +25,8 @@
#include "units/physical/si/area.h"
#include "units/physical/si/frequency.h"
#include "units/physical/si/speed.h"
#include "units/physical/si/us/length.h"
#include "units/physical/si/volume.h"
#include "units/physical/us/length.h"
#include <chrono>
#include <utility>
@@ -261,7 +261,7 @@ static_assert(
// common_type
using namespace units::physical::us::literals;
using namespace units::physical::si::us::literals;
static_assert(std::equality_comparable<decltype(1_q_m)>);
static_assert(std::equality_comparable_with<decltype(1_q_m), decltype(1_q_cm)>);
+43 -44
View File
@@ -20,69 +20,68 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
#include <units/physical/cgs/acceleration.h>
#include <units/physical/cgs/area.h>
#include <units/physical/cgs/energy.h>
#include <units/physical/cgs/force.h>
#include <units/physical/cgs/length.h>
#include <units/physical/cgs/mass.h>
#include <units/physical/cgs/power.h>
#include <units/physical/cgs/pressure.h>
#include <units/physical/cgs/time.h>
#include <units/physical/cgs/speed.h>
#include <units/physical/si/acceleration.h>
#include <units/physical/si/area.h>
#include <units/physical/si/cgs/acceleration.h>
#include <units/physical/si/cgs/area.h>
#include <units/physical/si/cgs/energy.h>
#include <units/physical/si/cgs/force.h>
#include <units/physical/si/cgs/length.h>
#include <units/physical/si/cgs/mass.h>
#include <units/physical/si/cgs/power.h>
#include <units/physical/si/cgs/pressure.h>
#include <units/physical/si/cgs/speed.h>
#include <units/physical/si/cgs/time.h>
#include <units/physical/si/energy.h>
#include <units/physical/si/force.h>
#include <units/physical/si/length.h>
#include <units/physical/si/mass.h>
#include <units/physical/si/power.h>
#include <units/physical/si/pressure.h>
#include <units/physical/si/time.h>
#include <units/physical/si/speed.h>
#include <units/physical/si/time.h>
namespace {
using namespace units::physical;
static_assert(units::detail::quantity_ratio(si::length<si::metre>(1)) == units::ratio(1));
static_assert(units::detail::quantity_ratio(cgs::length<cgs::centimetre>(1)) == units::ratio(1, 100));
static_assert(units::detail::quantity_ratio(si::cgs::length<si::cgs::centimetre>(1)) == units::ratio(1, 100));
static_assert(units::detail::quantity_ratio(si::speed<si::metre_per_second>(1)) == units::ratio(1));
static_assert(units::detail::quantity_ratio(cgs::speed<cgs::centimetre_per_second>(1)) == units::ratio(1, 100));
static_assert(units::detail::quantity_ratio(si::cgs::speed<si::cgs::centimetre_per_second>(1)) == units::ratio(1, 100));
static_assert(units::detail::quantity_ratio(si::force<si::newton>(1)) == units::ratio(1000)); // defined in terms of kilogram that are 1000 * gram
static_assert(units::detail::quantity_ratio(cgs::force<cgs::dyne>(1)) == units::ratio(1, 100)); // defined in terms of gram so only centimetre ratio counts here
static_assert(units::detail::quantity_ratio(si::cgs::force<si::cgs::dyne>(1)) == units::ratio(1, 100)); // defined in terms of gram so only centimetre ratio counts here
static_assert(cgs::length<cgs::centimetre>(100) == si::length<si::metre>(1));
static_assert(cgs::mass<cgs::gram>(1'000) == si::mass<si::kilogram>(1));
static_assert(cgs::time<cgs::second>(1) == si::time<si::second>(1));
static_assert(cgs::speed<cgs::centimetre_per_second>(100) == si::speed<si::metre_per_second>(1));
static_assert(cgs::area<cgs::square_centimetre>(10000) == si::area<si::square_metre>(1));
static_assert(cgs::acceleration<cgs::gal>(100) == si::acceleration<si::metre_per_second_sq>(1));
static_assert(cgs::force<cgs::dyne>(100'000) == si::force<si::newton>(1));
static_assert(cgs::energy<cgs::erg>(10'000'000) == si::energy<si::joule>(1));
static_assert(cgs::power<cgs::erg_per_second>(10'000'000) == si::power<si::watt>(1));
static_assert(cgs::pressure<cgs::barye>(10) == si::pressure<si::pascal>(1));
static_assert(si::cgs::length<si::cgs::centimetre>(100) == si::length<si::metre>(1));
static_assert(si::cgs::mass<si::cgs::gram>(1'000) == si::mass<si::kilogram>(1));
static_assert(si::cgs::time<si::cgs::second>(1) == si::time<si::second>(1));
static_assert(si::cgs::speed<si::cgs::centimetre_per_second>(100) == si::speed<si::metre_per_second>(1));
static_assert(si::cgs::area<si::cgs::square_centimetre>(10000) == si::area<si::square_metre>(1));
static_assert(si::cgs::acceleration<si::cgs::gal>(100) == si::acceleration<si::metre_per_second_sq>(1));
static_assert(si::cgs::force<si::cgs::dyne>(100'000) == si::force<si::newton>(1));
static_assert(si::cgs::energy<si::cgs::erg>(10'000'000) == si::energy<si::joule>(1));
static_assert(si::cgs::power<si::cgs::erg_per_second>(10'000'000) == si::power<si::watt>(1));
static_assert(si::cgs::pressure<si::cgs::barye>(10) == si::pressure<si::pascal>(1));
namespace si_test {
using namespace units::physical::si::literals;
static_assert(cgs::length<cgs::centimetre>(100) == 1_q_m);
static_assert(cgs::mass<cgs::gram>(1'000) == 1_q_kg);
static_assert(cgs::time<cgs::second>(1) == 1_q_s);
static_assert(cgs::speed<cgs::centimetre_per_second>(100) == 1_q_m_per_s);
static_assert(cgs::acceleration<cgs::gal>(100) == 1_q_m_per_s2);
static_assert(cgs::force<cgs::dyne>(100'000) == 1_q_N);
static_assert(cgs::energy<cgs::erg>(10'000'000) == 1_q_J);
static_assert(cgs::power<cgs::erg_per_second>(10'000'000) == 1_q_W);
static_assert(cgs::pressure<cgs::barye>(10) == 1_q_Pa);
static_assert(si::cgs::length<si::cgs::centimetre>(100) == 1_q_m);
static_assert(si::cgs::mass<si::cgs::gram>(1'000) == 1_q_kg);
static_assert(si::cgs::time<si::cgs::second>(1) == 1_q_s);
static_assert(si::cgs::speed<si::cgs::centimetre_per_second>(100) == 1_q_m_per_s);
static_assert(si::cgs::acceleration<si::cgs::gal>(100) == 1_q_m_per_s2);
static_assert(si::cgs::force<si::cgs::dyne>(100'000) == 1_q_N);
static_assert(si::cgs::energy<si::cgs::erg>(10'000'000) == 1_q_J);
static_assert(si::cgs::power<si::cgs::erg_per_second>(10'000'000) == 1_q_W);
static_assert(si::cgs::pressure<si::cgs::barye>(10) == 1_q_Pa);
}
namespace cgs_test {
using namespace units::physical::cgs::literals;
using namespace units::physical::si::cgs::literals;
static_assert(100_q_cm == si::length<si::metre>(1));
static_assert(1'000_q_g == si::mass<si::kilogram>(1));
@@ -99,7 +98,7 @@ static_assert(10_q_Ba == si::pressure<si::pascal>(1));
namespace both_test {
using namespace units::physical::si::literals;
using namespace units::physical::cgs::literals;
using namespace units::physical::si::cgs::literals;
// static_assert(100_q_cm == 1_q_m); // ambiguous
// static_assert(1'000_q_g == 1_q_kg); // ambiguous
@@ -121,8 +120,8 @@ namespace cgs_test {
// static_assert(si::length<si::metre>(1) + 100_q_cm == si::length<si::metre>(2)); // should not compile (different dimensions)
static_assert(quantity_cast<si::length<si::metre>>(100_q_cm) + si::length<si::metre>(1) == si::length<si::metre>(2));
static_assert(si::length<si::metre>(1) + quantity_cast<si::length<si::metre>>(100_q_cm) == si::length<si::metre>(2));
static_assert(100_q_cm + quantity_cast<cgs::length<cgs::centimetre>>(si::length<si::metre>(1)) == 200_q_cm);
static_assert(quantity_cast<cgs::length<cgs::centimetre>>(si::length<si::metre>(1)) + 100_q_cm == 200_q_cm);
static_assert(100_q_cm + quantity_cast<si::cgs::length<si::cgs::centimetre>>(si::length<si::metre>(1)) == 200_q_cm);
static_assert(quantity_cast<si::cgs::length<si::cgs::centimetre>>(si::length<si::metre>(1)) + 100_q_cm == 200_q_cm);
// substraction
@@ -130,28 +129,28 @@ static_assert(quantity_cast<cgs::length<cgs::centimetre>>(si::length<si::metre>(
// static_assert(si::length<si::metre>(5) - 100_q_cm == si::length<si::metre>(4)); // should not compile (different dimensions)
static_assert(quantity_cast<si::length<si::metre>>(500_q_cm) - si::length<si::metre>(1) == si::length<si::metre>(4));
static_assert(si::length<si::metre>(5) - quantity_cast<si::length<si::metre>>(100_q_cm) == si::length<si::metre>(4));
static_assert(500_q_cm - quantity_cast<cgs::length<cgs::centimetre>>(si::length<si::metre>(1)) == 400_q_cm);
static_assert(quantity_cast<cgs::length<cgs::centimetre>>(si::length<si::metre>(5)) - 100_q_cm == 400_q_cm);
static_assert(500_q_cm - quantity_cast<si::cgs::length<si::cgs::centimetre>>(si::length<si::metre>(1)) == 400_q_cm);
static_assert(quantity_cast<si::cgs::length<si::cgs::centimetre>>(si::length<si::metre>(5)) - 100_q_cm == 400_q_cm);
// multiplication
// static_assert(200_q_cm * si::length<si::metre>(2) == si::area<si::square_metre>(4)); // should not compile (unknown dimension)
static_assert(quantity_cast<si::dim_length>(200._q_cm) * si::length<si::metre>(2) == si::area<si::square_metre>(4));
static_assert(200._q_cm * quantity_cast<cgs::dim_length>(si::length<si::metre>(2)) == 40'000_q_cm2);
static_assert(200._q_cm * quantity_cast<si::cgs::dim_length>(si::length<si::metre>(2)) == 40'000_q_cm2);
// TODO Add support for quantity_cast on an unknown_dimension?
// static_assert(quantity_cast<si::area<si::square_metre>>(200_q_cm * si::length<si::metre>(2)) == si::area<si::square_metre>(4));
// static_assert(quantity_cast<si::dim_area>(200_q_cm * si::length<si::metre>(2)) == si::area<si::square_metre>(4));
// static_assert(quantity_cast<cgs::area<cgs::square_centimeters>>(200_q_cm * si::length<si::metre>(2)) == 40'000_q_cm2);
// static_assert(quantity_cast<cgs::dim_area>(200_q_cm * si::length<si::metre>(2)) == 40'000_q_cm2);
// static_assert(quantity_cast<si::cgs::area<si::cgs::square_centimeters>>(200_q_cm * si::length<si::metre>(2)) == 40'000_q_cm2);
// static_assert(quantity_cast<si::cgs::dim_area>(200_q_cm * si::length<si::metre>(2)) == 40'000_q_cm2);
// division
// static_assert(si::area<si::square_metre>(4) / 200_q_cm == si::length<si::metre>(2)); // should not compile (unknown dimension)
static_assert(si::area<si::square_metre>(4) / quantity_cast<si::length<si::metre>>(200_q_cm) == si::length<si::metre>(2));
static_assert(quantity_cast<cgs::area<cgs::square_centimetre>>(si::area<si::square_metre>(4)) / 200._q_cm == 200_q_cm);
static_assert(quantity_cast<si::cgs::area<si::cgs::square_centimetre>>(si::area<si::square_metre>(4)) / 200._q_cm == 200_q_cm);
}
+49 -50
View File
@@ -20,70 +20,69 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
#include <units/physical/fps/acceleration.h>
#include <units/physical/fps/area.h>
#include <units/physical/fps/energy.h>
#include <units/physical/fps/force.h>
#include <units/physical/fps/length.h>
#include <units/physical/fps/mass.h>
#include <units/physical/fps/power.h>
#include <units/physical/fps/pressure.h>
#include <units/physical/fps/time.h>
#include <units/physical/fps/speed.h>
#include <units/physical/si/acceleration.h>
#include <units/physical/si/area.h>
#include <units/physical/si/energy.h>
#include <units/physical/si/force.h>
#include <units/physical/si/fps/acceleration.h>
#include <units/physical/si/fps/area.h>
#include <units/physical/si/fps/energy.h>
#include <units/physical/si/fps/force.h>
#include <units/physical/si/fps/length.h>
#include <units/physical/si/fps/mass.h>
#include <units/physical/si/fps/power.h>
#include <units/physical/si/fps/pressure.h>
#include <units/physical/si/fps/speed.h>
#include <units/physical/si/fps/time.h>
#include <units/physical/si/length.h>
#include <units/physical/si/mass.h>
#include <units/physical/si/power.h>
#include <units/physical/si/pressure.h>
#include <units/physical/si/time.h>
#include <units/physical/si/speed.h>
#include <units/physical/si/time.h>
namespace {
using namespace units::physical;
static_assert(fps::length<fps::foot>(1) == si::length<si::metre>(0.3048));
static_assert(fps::mass<fps::pound>(1) == si::mass<si::kilogram>(0.45359237));
static_assert(fps::time<fps::second>(1) == si::time<si::second>(1));
static_assert(fps::speed<fps::foot_per_second>(1) == si::speed<si::metre_per_second>(0.3048));
static_assert(fps::area<fps::square_foot>(1) == si::area<si::square_metre>(0.09290304));
static_assert(fps::acceleration<fps::foot_per_second_sq>(1) == si::acceleration<si::metre_per_second_sq>(0.3048));
static_assert(fps::force<fps::poundal>(1) > si::force<si::newton>(0.138254) &&
fps::force<fps::poundal>(1) < si::force<si::newton>(0.138256));
static_assert(fps::energy<fps::foot_poundal>(1) > si::energy<si::joule>(0.042140110093804) &&
fps::energy<fps::foot_poundal>(1) < si::energy<si::joule>(0.042140110093806));
static_assert(fps::power<fps::foot_poundal_per_second>(1) > si::power<si::watt>(0.042140110093804) &&
fps::power<fps::foot_poundal_per_second>(1) < si::power<si::watt>(0.042140110093806));
static_assert(fps::pressure<fps::poundal_per_foot_sq>(1) > si::pressure<si::pascal>(1.4881639435) &&
fps::pressure<fps::poundal_per_foot_sq>(1) < si::pressure<si::pascal>(1.4881639437));
static_assert(si::fps::length<si::fps::foot>(1) == si::length<si::metre>(0.3048));
static_assert(si::fps::mass<si::fps::pound>(1) == si::mass<si::kilogram>(0.45359237));
static_assert(si::fps::time<si::fps::second>(1) == si::time<si::second>(1));
static_assert(si::fps::speed<si::fps::foot_per_second>(1) == si::speed<si::metre_per_second>(0.3048));
static_assert(si::fps::area<si::fps::square_foot>(1) == si::area<si::square_metre>(0.09290304));
static_assert(si::fps::acceleration<si::fps::foot_per_second_sq>(1) == si::acceleration<si::metre_per_second_sq>(0.3048));
static_assert(si::fps::force<si::fps::poundal>(1) > si::force<si::newton>(0.138254) &&
si::fps::force<si::fps::poundal>(1) < si::force<si::newton>(0.138256));
static_assert(si::fps::energy<si::fps::foot_poundal>(1) > si::energy<si::joule>(0.042140110093804) &&
si::fps::energy<si::fps::foot_poundal>(1) < si::energy<si::joule>(0.042140110093806));
static_assert(si::fps::power<si::fps::foot_poundal_per_second>(1) > si::power<si::watt>(0.042140110093804) &&
si::fps::power<si::fps::foot_poundal_per_second>(1) < si::power<si::watt>(0.042140110093806));
static_assert(si::fps::pressure<si::fps::poundal_per_foot_sq>(1) > si::pressure<si::pascal>(1.4881639435) &&
si::fps::pressure<si::fps::poundal_per_foot_sq>(1) < si::pressure<si::pascal>(1.4881639437));
namespace si_literals {
using namespace units::physical::si::literals;
static_assert(fps::length<fps::foot>(1) == 0.3048_q_m);
static_assert(fps::mass<fps::pound>(1) == 0.45359237_q_kg);
static_assert(fps::time<fps::second>(1) == 1_q_s);
static_assert(fps::speed<fps::foot_per_second>(1) == 0.3048_q_m_per_s);
static_assert(fps::area<fps::square_foot>(1) == 0.09290304_q_m2);
static_assert(fps::acceleration<fps::foot_per_second_sq>(1) == 0.3048_q_m_per_s2);
static_assert(fps::force<fps::poundal>(1) > 0.138254_q_N &&
fps::force<fps::poundal>(1) < 0.138256_q_N);
static_assert(fps::energy<fps::foot_poundal>(1) > 0.042140110093804_q_J &&
fps::energy<fps::foot_poundal>(1) < 0.042140110093806_q_J);
static_assert(fps::power<fps::foot_poundal_per_second>(1) > 0.042140110093804_q_W &&
fps::power<fps::foot_poundal_per_second>(1) < 0.042140110093806_q_W);
static_assert(fps::pressure<fps::poundal_per_foot_sq>(1) > 1.4881639435_q_Pa &&
fps::pressure<fps::poundal_per_foot_sq>(1) < 1.4881639437_q_Pa);
static_assert(si::fps::length<si::fps::foot>(1) == 0.3048_q_m);
static_assert(si::fps::mass<si::fps::pound>(1) == 0.45359237_q_kg);
static_assert(si::fps::time<si::fps::second>(1) == 1_q_s);
static_assert(si::fps::speed<si::fps::foot_per_second>(1) == 0.3048_q_m_per_s);
static_assert(si::fps::area<si::fps::square_foot>(1) == 0.09290304_q_m2);
static_assert(si::fps::acceleration<si::fps::foot_per_second_sq>(1) == 0.3048_q_m_per_s2);
static_assert(si::fps::force<si::fps::poundal>(1) > 0.138254_q_N &&
si::fps::force<si::fps::poundal>(1) < 0.138256_q_N);
static_assert(si::fps::energy<si::fps::foot_poundal>(1) > 0.042140110093804_q_J &&
si::fps::energy<si::fps::foot_poundal>(1) < 0.042140110093806_q_J);
static_assert(si::fps::power<si::fps::foot_poundal_per_second>(1) > 0.042140110093804_q_W &&
si::fps::power<si::fps::foot_poundal_per_second>(1) < 0.042140110093806_q_W);
static_assert(si::fps::pressure<si::fps::poundal_per_foot_sq>(1) > 1.4881639435_q_Pa &&
si::fps::pressure<si::fps::poundal_per_foot_sq>(1) < 1.4881639437_q_Pa);
}
namespace fps_literals {
using namespace units::physical::fps::literals;
using namespace units::physical::si::fps::literals;
static_assert(1_q_ft == si::length<si::metre>(0.3048));
static_assert(1_q_lb == si::mass<si::kilogram>(0.45359237));
@@ -104,7 +103,7 @@ static_assert(1_q_pdl_per_ft2> si::pressure<si::pascal>(1.4881639435) &&
namespace fps_plus_si_literals {
using namespace units::physical::si::literals;
using namespace units::physical::fps::literals;
using namespace units::physical::si::fps::literals;
// static_assert(100_q_cm == 1_q_m); // ambiguous
// static_assert(1'000_q_g == 1_q_kg); // ambiguous
@@ -125,9 +124,9 @@ static_assert(1_q_pdl_per_ft2> 1.4881639435_q_Pa &&
}
namespace cgs_test {
namespace fps_test {
using namespace units::physical::fps::literals;
using namespace units::physical::si::fps::literals;
// addition
@@ -135,8 +134,8 @@ using namespace units::physical::fps::literals;
// static_assert(1_q_ft / 0.3048 + si::length<si::metre>(1) == si::length<si::metre>(1.3048)); // should not compile (different dimensions)
static_assert(quantity_cast<si::length<si::metre>>(1._q_ft / 0.3048) + si::length<si::metre>(1) == si::length<si::metre>(2)); // 1 m in ft + 1 m
static_assert(si::length<si::metre>(1) + quantity_cast<si::length<si::metre>>(1._q_ft / 0.3048) == si::length<si::metre>(2)); // 1 m + 1 m in ft
static_assert(1_q_ft + quantity_cast<fps::length<fps::foot>>(si::length<si::metre>(0.3048)) == 2_q_ft); // 1 ft + 1 ft in m
static_assert(quantity_cast<fps::length<fps::foot>>(si::length<si::metre>(0.3048)) + 1_q_ft == 2_q_ft); // 1 ft in m + 1 ft
static_assert(1_q_ft + quantity_cast<si::fps::length<si::fps::foot>>(si::length<si::metre>(0.3048)) == 2_q_ft); // 1 ft + 1 ft in m
static_assert(quantity_cast<si::fps::length<si::fps::foot>>(si::length<si::metre>(0.3048)) + 1_q_ft == 2_q_ft); // 1 ft in m + 1 ft
// substraction
@@ -145,21 +144,21 @@ static_assert(quantity_cast<fps::length<fps::foot>>(si::length<si::metre>(0.3048
static_assert(quantity_cast<si::length<si::metre>>(6._q_ft) - si::length<si::metre>(1) > si::length<si::metre>(0.8287) &&
quantity_cast<si::length<si::metre>>(6._q_ft) - si::length<si::metre>(1) < si::length<si::metre>(0.8289)); // 6 ft in m - 1 m = ... m
static_assert(si::length<si::metre>(5) - quantity_cast<si::length<si::metre>>(6_q_ft) == si::length<si::metre>(3.1712)); // 5 m - 6 ft in m = ...
static_assert(6._q_ft - quantity_cast<fps::length<fps::foot>>(si::length<si::metre>(0.3048)) == 5._q_ft); // 6 ft - 1 ft in m = 5 ft
static_assert(quantity_cast<fps::length<fps::foot>>(si::length<si::metre>(1.8288)) - 1._q_ft == 5._q_ft); // 6 ft in m - 1 ft = 5 ft
static_assert(6._q_ft - quantity_cast<si::fps::length<si::fps::foot>>(si::length<si::metre>(0.3048)) == 5._q_ft); // 6 ft - 1 ft in m = 5 ft
static_assert(quantity_cast<si::fps::length<si::fps::foot>>(si::length<si::metre>(1.8288)) - 1._q_ft == 5._q_ft); // 6 ft in m - 1 ft = 5 ft
// multiplication
// static_assert(2_q_ft * si::length<si::metre>(2) == si::area<si::square_metre>(1.2192)); // should not compile (unknown dimension)
// static_assert(quantity_cast<si::length<si::metre>>(2._q_ft) * si::length<si::metre>(2) == si::area<si::square_metre>(1.2192));
static_assert(quantity_cast<si::length<si::metre>>(2._q_ft) * si::length<si::metre>(0.6096) == si::area<si::square_metre>(0.371612160)); // 2 ft * 2 ft == 4 sq ft
static_assert(2._q_ft * quantity_cast<fps::length<fps::foot>>(si::length<si::metre>(0.6096)) == 4._q_ft2);
static_assert(2._q_ft * quantity_cast<si::fps::length<si::fps::foot>>(si::length<si::metre>(0.6096)) == 4._q_ft2);
// division
// static_assert(si::area<si::square_metre>(4) / 200_q_cm == si::length<si::metre>(2)); // should not compile (unknown dimension)
static_assert(si::area<si::square_metre>(1.48644864) / quantity_cast<si::length<si::metre>>(4_q_ft) == si::length<si::metre>(1.2192)); // 16 ft2 / 4 ft = 4 ft
static_assert(quantity_cast<fps::area<fps::square_foot>>(si::area<si::square_metre>(1.48644864)) / 4._q_ft == 4._q_ft); // 16 ft2 / 4 ft = 4 ft
static_assert(quantity_cast<si::fps::area<si::fps::square_foot>>(si::area<si::square_metre>(1.48644864)) / 4._q_ft == 4._q_ft); // 16 ft2 / 4 ft = 4 ft
}
+7 -7
View File
@@ -21,22 +21,22 @@
// SOFTWARE.
#include <units/physical/si/area.h>
#include <units/physical/si/international/area.h>
#include <units/physical/si/international/length.h>
#include <units/physical/si/international/speed.h>
#include <units/physical/si/international/volume.h>
#include <units/physical/si/length.h>
#include <units/physical/international/length.h>
#include <units/physical/si/speed.h>
#include <units/physical/si/us/length.h>
#include <units/physical/si/volume.h>
#include <units/physical/international/area.h>
#include <units/physical/us/length.h>
#include <units/physical/international/speed.h>
#include <units/physical/international/volume.h>
#include <utility>
namespace {
using namespace units;
using namespace units::physical::si;
using namespace units::physical::us;
using namespace units::physical::international;
using namespace units::physical::si::us;
using namespace units::physical::si::international;
/* ************** BASE DIMENSIONS **************** */