diff --git a/src/falco.cpp b/src/falco.cpp index d9356eb..14fe9b3 100644 --- a/src/falco.cpp +++ b/src/falco.cpp @@ -374,7 +374,8 @@ main(int argc, char *argv[]) { app.add_option("-m,--mem", buffer_size, "Input memory buffer size (G/M/K units ok)") ->check(CLI::Range(min_buf_size, max_buf_size)) - ->option_text(std::format("[{}]", size_to_units(buffer_size_default))) + ->option_text(std::format("[{}]", + size_to_units(buffer_size_default, ""))) ->capture_default_str() ->transform(size_from_units); app.add_flag("-v,--verbose", verbose, "Print more info about the run") @@ -531,7 +532,7 @@ main(int argc, char *argv[]) { "threads requested: {}\n" "input memory buffer size: {}\n" "max analyzable read length: {}\n", - n_threads, size_to_units(buffer_size), + n_threads, size_to_units(buffer_size, "B"), size_to_units(max_read_length, "bp")); std::println("Analyses\n{}", mode.string_verbose()); std::println("Input files"); diff --git a/src/falco_file_format.hpp b/src/falco_file_format.hpp index 2bb5253..8d1f606 100644 --- a/src/falco_file_format.hpp +++ b/src/falco_file_format.hpp @@ -52,22 +52,22 @@ NLOHMANN_JSON_SERIALIZE_ENUM( }) // clang-format on -[[nodiscard]] constexpr inline auto +[[nodiscard]] inline constexpr auto is_mapped_reads(const file_format f) { return f == file_format::sam || f == file_format::bam; } -[[nodiscard]] constexpr inline auto +[[nodiscard]] inline constexpr auto is_bam(const file_format f) { return f == file_format::bam; } -[[nodiscard]] constexpr inline auto +[[nodiscard]] inline constexpr auto is_bgzf(const file_format f) { return f == file_format::bam || f == file_format::fastq_bgzf; } -[[nodiscard]] constexpr inline auto +[[nodiscard]] inline constexpr auto is_plain(const file_format f) { return f == file_format::sam || f == file_format::fastq; } diff --git a/src/kmer_counter.cpp b/src/kmer_counter.cpp index e457cd8..e950555 100644 --- a/src/kmer_counter.cpp +++ b/src/kmer_counter.cpp @@ -66,7 +66,7 @@ gamma_p_series(const double a, const double x) -> double { return sum * std::exp(-x + a * std::log(x) - std::lgamma(a)); } -[[nodiscard]] static constexpr inline auto +[[nodiscard]] static inline constexpr auto safe_floor(const auto x, const auto floor_val) { return std::abs(x) < floor_val ? floor_val : x; }