Use std::format instead of custom string formatting

Author: pifopi

Common/Cpp/Options/FloatingPointOption.cpp

@@ -121,12 +121,10 @@ JsonValue FloatingPointCell::to_json() const{
 std::string FloatingPointCell::check_validity(double x) const{
     const Data& data = *m_data;
     if (x < data.m_min_value){
-        std::ostringstream ss;
-        return "Value too small: min = " + tostr_default(data.m_min_value) + ", value = " + tostr_default(x);
+        return std::format("Value too small: min = {}, value = {}", data.m_min_value, x);
     }
     if (x > data.m_max_value){
-        std::ostringstream ss;
-        return "Value too large: max = " + tostr_default(data.m_max_value) + ", value = " + tostr_default(x);
+        return std::format("Value too large: max = {}, value = {}", data.m_max_value, x);
     }
     if (std::isnan(x)){
         return "Value is NaN.";

Common/Cpp/Options/TimeDurationOption.cpp

@@ -259,7 +259,7 @@ std::string TimeDurationCell<Type>::time_string(const std::string& text) const{
     if constexpr (self >= milliseconds){
         return duration_to_string(std::chrono::duration_cast<Milliseconds>(value));
     }else{
-        return tostr_u_commas(value.count()) + " " + m_data->m_units;
+        return std::format("{:L} {}", value.count(), m_data->m_units);
     }
 }
 

Common/Cpp/Options/TimeExpressionOption.cpp

@@ -25,7 +25,7 @@ std::string ticks_to_time(double ticks_per_second, int64_t ticks){
     const double DAY = HOUR * 24;
 
     std::string str;
-    str += tostr_u_commas(ticks);
+    str += std::format("{:L}", ticks);
     str += " tick";
     // Compute absolute value of the ticks:
     uint64_t abs_ticks = 0;
@@ -44,17 +44,13 @@ std::string ticks_to_time(double ticks_per_second, int64_t ticks){
         str += "-";
     }
     if (abs_ticks < MINUTE * 2){
-        str += tostr_fixed((double)abs_ticks / SECOND, 3);
-        str += " seconds";
+        str += std::format("{:.3f} seconds", (double)abs_ticks / SECOND);
     }else if (abs_ticks < HOUR * 2){
-        str += tostr_fixed((double)abs_ticks / MINUTE, 3);
-        str += " minutes";
+        str += std::format("{:.3f} minutes", (double)abs_ticks / MINUTE);
     }else if (abs_ticks < DAY * 2){
-        str += tostr_fixed((double)abs_ticks / HOUR, 3);
-        str += " hours";
+        str += std::format("{:.3f} hours", (double)abs_ticks / HOUR);
     }else{
-        str += tostr_fixed((double)abs_ticks / DAY, 3);
-        str += " days";
+        str += std::format("{:.3f} days", (double)abs_ticks / DAY);
     }
     str += ")";
     return str;

Common/Cpp/PrettyPrint.cpp

@@ -22,33 +22,6 @@ std::string tostr_padded(size_t digits, uint64_t x){
     }
     return std::string(digits - str.size(), '0') + str;
 }
-std::string tostr_u_commas(int64_t x){
-    //  Prints out x with comma separators.
-
-    std::string str = std::to_string(x);
-    std::string out;
-
-    const char* ptr = str.c_str();
-    // len: how many digits, don't count "-" in the negative numbers
-    size_t len = str.size() - (x < 0);
-
-    size_t commas = (len + 2) / 3 - 1;
-    size_t shift = len - commas * 3 + (x < 0);
-
-    while (true){
-        char ch = *ptr++;
-        if (ch == '\0')
-            break;
-        if (shift == 0){
-            out += ',';
-            shift = 3;
-        }
-        out += ch;
-        shift--;
-    }
-
-    return out;
-}
 
 
 inline std::string byte_prefix(size_t index){
@@ -164,22 +137,6 @@ std::string tostr_bytes(uint64_t bytes){
     return tostr_ui_bytes(bytes);
 }
 
-
-
-std::string tostr_default(double x){
-    std::ostringstream ss;
-    ss << x;
-    return ss.str();
-}
-std::string tostr_fixed(double x, int precision){
-    std::ostringstream out;
-    out << std::setprecision(precision);
-    out << std::fixed;
-    out << x;
-    return out.str();
-}
-
-
 std::string now_to_filestring(){
 #if _WIN32 && _MSC_VER
 #pragma warning(disable:4996)
@@ -244,30 +201,21 @@ std::string duration_to_string(std::chrono::milliseconds milliseconds){
 
     uint64_t ticks = milliseconds.count();
 
-    std::string str;
     if (ticks < MINUTE * 2){
-        str += tostr_fixed((double)ticks / SECOND, 3);
-        str += " seconds";
+        return std::format("{:.3f} seconds", (double)ticks / SECOND);
     }else if (ticks < HOUR * 2){
-        str += tostr_fixed((double)ticks / MINUTE, 3);
-        str += " minutes";
+        return std::format("{:.3f} minutes", (double)ticks / MINUTE);
     }else if (ticks < DAY * 2){
-        str += tostr_fixed((double)ticks / HOUR, 3);
-        str += " hours";
+        return std::format("{:.3f} hours", (double)ticks / HOUR);
     }else if (ticks < WEEK * 2){
-        str += tostr_fixed((double)ticks / DAY, 3);
-        str += " days";
+        return std::format("{:.3f} days", (double)ticks / DAY);
     }else if (ticks < YEARS * 2){
-        str += tostr_fixed((double)ticks / WEEK, 3);
-        str += " weeks";
+        return std::format("{:.3f} weeks", (double)ticks / WEEK);
     }else if (ticks < MILLION_YEARS){
-        str += tostr_fixed((double)ticks / YEARS, 3);
-        str += " years";
+        return std::format("{:.3f} years", (double)ticks / YEARS);
     }else{
-        str += tostr_fixed((double)ticks / MILLION_YEARS, 3);
-        str += " million years";
+        return std::format("{:.3f} million years", (double)ticks / MILLION_YEARS);
     }
-    return str;
 }
 
 

Common/Cpp/PrettyPrint.h

@@ -10,19 +10,13 @@
 #include <string>
 #include <set>
 #include <chrono>
+#include <format>
 
 namespace PokemonAutomation{
 
 std::string tostr_padded(size_t digits, uint64_t x);
-std::string tostr_u_commas(int64_t x);
 std::string tostr_bytes(uint64_t bytes);
 
-// Convert double to string using the default precision on ostream.
-std::string tostr_default(double x);
-// Convert double to string with fixed precision.
-// The precision specifies the number of digits after the decimal point.
-std::string tostr_fixed(double x, int precision);
-
 // Format current time to a string to be used as filenames.
 // e.g. "20220320-044444408355"
 std::string now_to_filestring();

SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp

@@ -370,7 +370,7 @@ std::vector<AudioDeviceInfo> AudioDeviceInfo::all_input_devices(){
 
     WallClock end = current_time();
     double seconds = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count() / 1000.;
-    global_logger_tagged().log("Done querying audio inputs... " + tostr_fixed(seconds, 3) + " seconds", COLOR_CYAN);
+    global_logger_tagged().log(std::format("Done querying audio inputs... {:.3f} seconds", seconds), COLOR_CYAN);
 
     bool show_all_devices = GlobalSettings::instance().AUDIO_PIPELINE->SHOW_ALL_DEVICES;
     if (show_all_devices){

SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioSink.cpp

@@ -73,7 +73,7 @@ class AudioOutputDevice : public AudioFloatToStream, private ObjectStreamListene
     void set_volume(double volume){
         auto scope_check = m_sanitizer.check_scope();
         double absolute = convertAudioVolumeFromSlider(volume);
-        m_logger.log("Volume set to: Slider = " + tostr_default(volume) + " -> Absolute = " + tostr_default(absolute));
+        m_logger.log(std::format("Volume set to: Slider = {} -> Absolute = {}", volume, absolute));
         m_sink.setVolume(absolute);
     }
 

SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioSource.cpp

@@ -76,7 +76,7 @@ class AudioInputDevice final : public QIODevice{
         m_source->start(this);
         WallClock end = current_time();
         double seconds = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count() / 1000.;
-        logger.log("Done starting audio... " + tostr_fixed(seconds, 3) + " seconds", COLOR_CYAN);
+        logger.log(std::format("Done starting audio... {:.3f} seconds", seconds), COLOR_CYAN);
     }
     ~AudioInputDevice(){
         if (m_source){

SerialPrograms/Source/CommonFramework/Environment/HardwareValidation_x86.tpp

@@ -60,7 +60,7 @@ bool check_hardware(){
         str += "You can continue, but the program may not work correctly.<br>";
         str += "(i.e. Increased error rate. Fail to reliably detect shinies, etc...)<br><br>";
         str += "(Reason: Base frequency measured at ";
-        str += QString::fromStdString(tostr_fixed(specs.base_frequency / 1000000000., 3));
+        str += QString::fromStdString(std::format("{:.3f}", specs.base_frequency / 1e9));
         str += " GHz which is very slow.)<br><br>";
         str += "Recommendation: Use a more powerful computer.";
         box.warning(nullptr, "Warning", str);
@@ -82,10 +82,10 @@ bool check_hardware(){
         str += "Threads: " + QString::number(specs.threads) + "<br>";
         str += "Sockets: " + QString::number(specs.sockets) + "<br>";
         str += "Numa Nodes: " + QString::number(specs.numa_nodes) + "<br>";
-        str += "Base Frequency: " + QString::fromStdString(tostr_fixed(specs.base_frequency / 1000000000., 3)) + " GHz<br>";
+        str += QString::fromStdString(std::format("Base Frequency: {:.3f} GHz<br>", specs.base_frequency / 1e9));
         str += "<br>";
         str += "(p-cores + 0.2 * v-cores) * base-frequency = ";
-        str += QString::fromStdString(tostr_fixed(efreq / 1000000000., 3));
+        str += QString::fromStdString(std::format("{:.3f}", efreq / 1e9));
         str += " GHz<br><br>";
         str += "Recommendation: Use a more powerful computer.";
         box.warning(nullptr, "Warning", str);

SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp

@@ -365,16 +365,15 @@ std::unique_ptr<AsyncTask> send_all_unsent_reports(Logger& logger, bool allow_pr
         QMessageBox::StandardButton button = box.information(
             nullptr,
             "Error Reporting",
-            QString::fromStdString(
-                (reports.size() == 1
-                    ? "There is " + tostr_u_commas(reports.size()) + " error report.<br><br>"
-                      "Would you like to help make this program better by sending it to the developers?<br><br>"
-                    : "There are " + tostr_u_commas(reports.size()) + " error reports.<br><br>"
-                      "Would you like to help make this program better by sending them to the developers?<br><br>"
-                ) +
-                make_text_url(ERROR_PATH_UNSENT, "View unsent error reports.")// + "<br><br>"
-//                "(You can change )"
-            ),
+            QString::fromStdString(std::format(
+                "There {} {:L} error report{}.<br><br>"
+                "Would you like to help make this program better by sending {} to the developers?<br><br>{}",
+                (reports.size() == 1 ? "is" : "are"),
+                reports.size(),
+                (reports.size() == 1 ? "" : "s"),
+                (reports.size() == 1 ? "it" : "them"),
+                make_text_url(ERROR_PATH_UNSENT, "View unsent error reports.")
+            )),
             QMessageBox::Yes | QMessageBox::No,
             QMessageBox::StandardButton::Yes
         );