Switched the order of the nice_unit_format() parameters, because format changes more...

diff --git a/src/stringfunc.cpp b/src/stringfunc.cpp
index 48823ec..995b71f 100644 (file)
--- a/src/stringfunc.cpp
+++ b/src/stringfunc.cpp
@@ -930,8 +930,8 @@ long double rounding_upwards(
 
 string nice_unit_format(
         const int64_t input,
-        const UnitBase base,
-        const UnitFormat format
+        const UnitFormat format,
+        const UnitBase base
 )
 {
    // select the system of units (decimal or binary)

diff --git a/src/stringfunc.hxx b/src/stringfunc.hxx
index 47fc607..ff8ebed 100644 (file)
--- a/src/stringfunc.hxx
+++ b/src/stringfunc.hxx
@@ -204,8 +204,8 @@ enum UnitFormat {
 
 std::string nice_unit_format(
         const int64_t input,
-        const UnitBase base = UnitBase1000,
-        const UnitFormat format = LongUnitFormat
+        const UnitFormat format = LongUnitFormat,
+        const UnitBase base = UnitBase1000
 );
 
 bool replace_all(std::string &base, const std::string *ist, const std::string *soll);

diff --git a/test/stringfunc.cpp b/test/stringfunc.cpp
index 2e85aab..b40f7e7 100644 (file)
--- a/test/stringfunc.cpp
+++ b/test/stringfunc.cpp
@@ -111,10 +111,10 @@ BOOST_AUTO_TEST_CASE(nice_unit_format1)
 {
     const int64_t two_bytes = 2;
 
-    string output = nice_unit_format(two_bytes);
+    string output = nice_unit_format(two_bytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.00 Bytes"), output);
 
-    output = nice_unit_format(two_bytes, UnitBase1024, ShortUnitFormat);
+    output = nice_unit_format(two_bytes, ShortUnitFormat, UnitBase1024);
     BOOST_CHECK_EQUAL(string("2.0 B"), output);
 }
 
@@ -122,18 +122,18 @@ BOOST_AUTO_TEST_CASE(nice_unit_format2)
 {
     const int64_t two_kilobytes = 2000;
 
-    string output = nice_unit_format(two_kilobytes);
+    string output = nice_unit_format(two_kilobytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.00 KBytes"), output);
 
-    output = nice_unit_format(two_kilobytes, UnitBase1024, ShortUnitFormat);
+    output = nice_unit_format(two_kilobytes, ShortUnitFormat, UnitBase1024);
     BOOST_CHECK_EQUAL(string("2.0 KB"), output);
 
     const int64_t two_and_half_kilobytes = 2500;
 
-    output = nice_unit_format(two_and_half_kilobytes);
+    output = nice_unit_format(two_and_half_kilobytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.50 KBytes"), output);
 
-    output = nice_unit_format(two_and_half_kilobytes, UnitBase1024, ShortUnitFormat);
+    output = nice_unit_format(two_and_half_kilobytes, ShortUnitFormat, UnitBase1024);
     BOOST_CHECK_EQUAL(string("2.4 KB"), output);
 }
 
@@ -141,18 +141,18 @@ BOOST_AUTO_TEST_CASE(nice_unit_format3)
 {
     const int64_t two_megabytes = 2000000;
 
-    string output = nice_unit_format(two_megabytes);
+    string output = nice_unit_format(two_megabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.00 MBytes"), output);
 
-    output = nice_unit_format(two_megabytes, UnitBase1024, ShortUnitFormat);
+    output = nice_unit_format(two_megabytes, ShortUnitFormat, UnitBase1024);
     BOOST_CHECK_EQUAL(string("1.9 MB"), output);
 
     const int64_t two_and_half_megabytes = 2500000;
 
-    output = nice_unit_format(two_and_half_megabytes);
+    output = nice_unit_format(two_and_half_megabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.50 MBytes"), output);
 
-    output = nice_unit_format(two_and_half_megabytes, UnitBase1024, ShortUnitFormat);
+    output = nice_unit_format(two_and_half_megabytes, ShortUnitFormat, UnitBase1024);
     BOOST_CHECK_EQUAL(string("2.4 MB"), output);
 
 }
@@ -161,18 +161,18 @@ BOOST_AUTO_TEST_CASE(nice_unit_format4)
 {
     const int64_t two_gigabytes = 2000000000LL;
 
-    string output = nice_unit_format(two_gigabytes);
+    string output = nice_unit_format(two_gigabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.00 GBytes"), output);
 
-    output = nice_unit_format(two_gigabytes, UnitBase1024, ShortUnitFormat);
+    output = nice_unit_format(two_gigabytes, ShortUnitFormat, UnitBase1024);
     BOOST_CHECK_EQUAL(string("1.9 GB"), output);
 
     const int64_t two_and_half_gigabytes = 2500000000LL;
 
-    output = nice_unit_format(two_and_half_gigabytes);
+    output = nice_unit_format(two_and_half_gigabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.50 GBytes"), output);
 
-    output = nice_unit_format(two_and_half_gigabytes, UnitBase1024, ShortUnitFormat);
+    output = nice_unit_format(two_and_half_gigabytes, ShortUnitFormat, UnitBase1024);
     BOOST_CHECK_EQUAL(string("2.3 GB"), output);
 }
 
@@ -180,18 +180,18 @@ BOOST_AUTO_TEST_CASE(nice_unit_format5)
 {
     const int64_t two_terabytes = 2000000000000LL;
 
-    string output = nice_unit_format(two_terabytes);
+    string output = nice_unit_format(two_terabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.00 TBytes"), output);
 
-    output = nice_unit_format(two_terabytes, UnitBase1024, ShortUnitFormat);
+    output = nice_unit_format(two_terabytes, ShortUnitFormat, UnitBase1024);
     BOOST_CHECK_EQUAL(string("1.8 TB"), output);
 
     const int64_t two_and_half_terabytes = 2500000000000LL;
 
-    output = nice_unit_format(two_and_half_terabytes);
+    output = nice_unit_format(two_and_half_terabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.50 TBytes"), output);
 
-    output = nice_unit_format(two_and_half_terabytes, UnitBase1024, ShortUnitFormat);
+    output = nice_unit_format(two_and_half_terabytes, ShortUnitFormat, UnitBase1024);
     BOOST_CHECK_EQUAL(string("2.3 TB"), output);
 }
 
@@ -199,18 +199,18 @@ BOOST_AUTO_TEST_CASE(nice_unit_format6)
 {
     const int64_t two_petabytes = 2000000000000000LL;
 
-    string output = nice_unit_format(two_petabytes);
+    string output = nice_unit_format(two_petabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.00 PBytes"), output);
 
-    output = nice_unit_format(two_petabytes, UnitBase1024, ShortUnitFormat);
+    output = nice_unit_format(two_petabytes, ShortUnitFormat, UnitBase1024);
     BOOST_CHECK_EQUAL(string("1.8 PB"), output);
 
     const int64_t two_and_half_petabytes = 2500000000000000LL;
 
-    output = nice_unit_format(two_and_half_petabytes);
+    output = nice_unit_format(two_and_half_petabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2.50 PBytes"), output);
 
-    output = nice_unit_format(two_and_half_petabytes, UnitBase1024, ShortUnitFormat);
+    output = nice_unit_format(two_and_half_petabytes, ShortUnitFormat, UnitBase1024);
     BOOST_CHECK_EQUAL(string("2.2 PB"), output);
 }
 
@@ -218,18 +218,18 @@ BOOST_AUTO_TEST_CASE(nice_unit_format7)
 {
     const int64_t two_exabytes = 2000000000000000000LL;
 
-    string output = nice_unit_format(two_exabytes);
+    string output = nice_unit_format(two_exabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2000.00 PBytes"), output);
 
-    output = nice_unit_format(two_exabytes, UnitBase1024, ShortUnitFormat);
+    output = nice_unit_format(two_exabytes, ShortUnitFormat, UnitBase1024);
     BOOST_CHECK_EQUAL(string("1776.4 PB"), output);
 
     const int64_t two_and_half_exabytes = 2500000000000000000LL;
 
-    output = nice_unit_format(two_and_half_exabytes);
+    output = nice_unit_format(two_and_half_exabytes, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("2500.00 PBytes"), output);
 
-    output = nice_unit_format(two_and_half_exabytes, UnitBase1024, ShortUnitFormat);
+    output = nice_unit_format(two_and_half_exabytes, ShortUnitFormat, UnitBase1024);
     BOOST_CHECK_EQUAL(string("2220.4 PB"), output);
 }
 
@@ -237,10 +237,10 @@ BOOST_AUTO_TEST_CASE(nice_unit_format8)
 {
     const int64_t max_representable_64bits_number = 9223372036854775807LL;
 
-    string output = nice_unit_format(max_representable_64bits_number);
+    string output = nice_unit_format(max_representable_64bits_number, LongUnitFormat, UnitBase1000);
     BOOST_CHECK_EQUAL(string("9223.40 PBytes"), output);
 
-    output = nice_unit_format(max_representable_64bits_number, UnitBase1024, ShortUnitFormat);
+    output = nice_unit_format(max_representable_64bits_number, ShortUnitFormat, UnitBase1024);
     BOOST_CHECK_EQUAL(string("8192.0 PB"), output);
 }