US system isolated from SI

test/unit_test/runtime/fmt_units_test.cpp

@@ -26,10 +26,14 @@
 #include "units/physical/si/velocity.h"
 #include "units/physical/si/volume.h"
 #include "units/physical/si/surface_tension.h"
+#include "units/physical/us/area.h"
+#include "units/physical/us/velocity.h"
+#include "units/physical/us/volume.h"
 #include "units/format.h"
 #include <catch2/catch.hpp>
 
 using namespace units::si;
+using namespace units::us;
 
 TEST_CASE("fmt::format on synthesized unit symbols", "[text][fmt]")
 {

test/unit_test/static/CMakeLists.txt

@@ -33,6 +33,7 @@ add_library(unit_tests_static
     si_cgs_test.cpp
     type_list_test.cpp
     unit_test.cpp
+    us_test.cpp
 )
 target_link_libraries(unit_tests_static
     PRIVATE

test/unit_test/static/si_test.cpp

@@ -59,13 +59,6 @@ static_assert(10km / 5km == 2);
 static_assert(100mm / 5cm == 2);
 static_assert(10km / 2 == 5km);
 
-static_assert(1yd == 0.9144m);
-static_assert(1yd == 3ft);
-static_assert(1ft == 12in);
-static_assert(1mi == 1760yd);
-
-static_assert(5in + 8cm == 207mm);
-
 static_assert(millimetre::symbol == "mm");
 static_assert(centimetre::symbol == "cm");
 static_assert(kilometre::symbol == "km");
@@ -200,8 +193,6 @@ static_assert(1km / 1s == 1000mps);
 static_assert(1.0km / 1h == 1kmph);
 static_assert(1000.0m / 3600.0s == 1kmph);
 
-static_assert(10.0mi / 2h == 5mph);
-
 static_assert(2kmph * 2h == 4km);
 // static_assert(2kmph * 15min == 500m); // should not compile
 static_assert(2kmph * 15.0min == 500m);
@@ -213,7 +204,6 @@ static_assert(quantity_cast<kilometre>(2000m) / 2kmph == 1h);
 
 static_assert(detail::unit_text<dim_velocity, metre_per_second>() == "m/s");
 static_assert(kilometre_per_hour::symbol == "km/h");
-static_assert(mile_per_hour::symbol == "mi/h");
 
 // acceleration
 

test/unit_test/static/us_test.cpp

@@ -0,0 +1,59 @@
+// 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 <units/physical/si/area.h>
+#include <units/physical/si/length.h>
+#include <units/physical/si/velocity.h>
+#include <units/physical/si/volume.h>
+#include <units/physical/us/area.h>
+#include <units/physical/us/length.h>
+#include <units/physical/us/velocity.h>
+#include <units/physical/us/volume.h>
+#include <utility>
+
+namespace {
+
+using namespace units;
+using namespace units::si;
+using namespace units::us;
+
+/* ************** BASE DIMENSIONS **************** */
+
+// length
+
+static_assert(1yd == 0.9144m);
+static_assert(1yd == 3ft);
+static_assert(1ft == 12in);
+static_assert(1mi == 1760yd);
+
+static_assert(5in + 8cm == 207mm);
+
+
+/* ************** DERIVED DIMENSIONS IN TERMS OF BASE UNITS **************** */
+
+// velocity
+
+static_assert(10.0mi / 2h == 5mph);
+
+static_assert(mile_per_hour::symbol == "mi/h");
+
+}  // namespace