coherent_derived_unit and custom prefixes support added

test/unit_test/runtime/CMakeLists.txt

@@ -22,6 +22,7 @@
 
 add_executable(unit_tests_runtime
     catch_main.cpp
+    digital_information_test.cpp
     math_test.cpp
     text_test.cpp
 )

test/unit_test/runtime/digital_information_test.cpp

@@ -0,0 +1,77 @@
+// 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/quantity.h>
+#include <catch2/catch.hpp>
+#include <sstream>
+
+namespace data {
+
+  struct base_dim_digital_information : units::base_dimension<"digital information", "b"> {};
+
+  struct digital_information : units::derived_dimension<digital_information, units::exp<base_dim_digital_information, 1>> {};
+
+  template<typename T>
+  concept DigitalInformation = units::QuantityOf<T, digital_information>;
+
+  using namespace units::hacks;
+
+  struct data_prefix;
+
+  struct bit : units::coherent_derived_unit<bit, decltype("b"_fs), digital_information, data_prefix> {};
+  struct kilobit : units::derived_unit<bit, decltype("Kib"_fs), digital_information, units::ratio<1'024>> {};
+  struct byte : units::derived_unit<byte, decltype("B"_fs), digital_information, units::ratio<8>> {};
+
+  inline namespace literals {
+
+    constexpr auto operator""_b(unsigned long long l) { return units::quantity<bit, std::int64_t>(l); }
+    constexpr auto operator""_Kib(unsigned long long l) { return units::quantity<kilobit, std::int64_t>(l); }
+    constexpr auto operator""_B(unsigned long long l) { return units::quantity<byte, std::int64_t>(l); }
+
+  }
+
+}
+
+template<> inline constexpr std::string_view units::prefix_symbol<data::data_prefix, units::ratio<    1'024>> = "Ki";
+template<> inline constexpr std::string_view units::prefix_symbol<data::data_prefix, units::ratio<1'048'576>> = "Mi";
+
+using namespace data;
+
+TEST_CASE("operator<< on a custom quantity", "[text][ostream]")
+{
+  std::stringstream stream;
+
+  SECTION("quantity with a predefined unit and prefix")
+  {
+    SECTION("named unit")
+    {
+      stream << 64_B;
+      REQUIRE(stream.str() == "64 B");
+    }
+
+    SECTION("other unit matching prefix")
+    {
+      stream << 8_Kib * 8_Kib / 2_b;
+      REQUIRE(stream.str() == "32 Mib");
+    }
+  }
+}

test/unit_test/runtime/text_test.cpp

@@ -39,25 +39,31 @@ TEST_CASE("operator<< on a quantity", "[text][ostream]")
   {
     SECTION("integral representation")
     {
-      stream << 16sq_m;
-      REQUIRE(stream.str() == "16 m^2");
+      stream << 60W;
+      REQUIRE(stream.str() == "60 W");
     }
 
     SECTION("floating-point representation")
     {
-      stream << 72.5kmph;
-      REQUIRE(stream.str() == "72.5 km/h");
+      stream << 72.5kJ;
+      REQUIRE(stream.str() == "72.5 kJ");
     }
   }
 
   SECTION("quantity with a predefined dimension but unknown unit")
   {
-    SECTION("unit::ratio as an SI prefix")
+    SECTION("unit::ratio as an SI prefix for a dimension with a special symbol")
     {
       stream << 4.N * 2cm;
       REQUIRE(stream.str() == "8 cJ");
     }
 
+    SECTION("unit::ratio for a dimension without a special symbol")
+    {
+      stream << 2.cm * 2m * 2m;
+      REQUIRE(stream.str() == "8 [1/100]m^3");
+    }
+
     SECTION("unit::ratio::num != 1 && unit::ratio::den == 1")
     {
       stream << 4 * 2min / (2s * 2s);

test/unit_test/static/custom_unit_test.cpp

@@ -37,7 +37,9 @@ namespace {
 
   using namespace units::hacks;
 
-  struct bit : units::derived_unit<bit, decltype("b"_fs), digital_information> {};
+  struct data_prefix {};
+
+  struct bit : units::coherent_derived_unit<bit, decltype("b"_fs), digital_information, data_prefix> {};
   struct byte : units::derived_unit<byte, decltype("B"_fs), digital_information, units::ratio<8>> {};
 
   inline namespace literals {
@@ -63,13 +65,11 @@ namespace {
 
   // power spectral density
   struct power_spectral_density : derived_dimension<power_spectral_density, units::exp<voltage, 2>, units::exp<frequency, -1>> {};
-  struct sq_volt_per_hertz : derived_unit<sq_volt_per_hertz, decltype("V^2/Hz"_fs), power_spectral_density> {};
+  struct sq_volt_per_hertz : coherent_derived_unit<sq_volt_per_hertz, decltype("V^2/Hz"_fs), power_spectral_density> {};
 
   // amplitude spectral density
   struct amplitude_spectral_density : derived_dimension<amplitude_spectral_density, units::exp<voltage, 1>, units::exp<frequency, -1, 2>> {};
-  // TODO: add support for derived_unit
-  //struct volt_per_sq_hertz : derived_unit<volt_per_sq_hertz, amplitude_spectral_density, volt, hertz> {};
-  struct volt_per_sqrt_hertz : derived_unit<volt_per_sqrt_hertz, decltype("V/Hz^(1/2)"_fs), amplitude_spectral_density> {};
+  struct volt_per_sqrt_hertz : coherent_derived_unit<volt_per_sqrt_hertz, decltype("V/Hz^(1/2)"_fs), amplitude_spectral_density> {};
 }
 
 namespace {