From 9cbe69d0f707bff442038d530fafb45b856b13aa Mon Sep 17 00:00:00 2001 From: Benjamin Buchfink Date: Sat, 29 Aug 2020 11:03:13 +0200 Subject: [PATCH] Compiler error. --- src/align/culling.h | 2 +- src/align/legacy/banded_swipe_pipeline.cpp | 2 +- src/align/legacy/query_mapper.cpp | 4 ++-- src/align/ranking.cpp | 4 ++-- src/cluster/multi_step_cluster.cpp | 2 +- src/output/output_format.cpp | 2 +- src/output/target_culling.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/align/culling.h b/src/align/culling.h index 0dd1df63..daaaa023 100644 --- a/src/align/culling.h +++ b/src/align/culling.h @@ -45,7 +45,7 @@ void culling(std::vector<_t> &targets, int source_query_len, const char* query_t } } else { - i += std::min(std::max((size_t)config.max_alignments, min_keep), targets.size()); + i += std::min(std::max(config.max_alignments, min_keep), targets.size()); while (--i > targets.begin() && i->filter_score == 0); ++i; } diff --git a/src/align/legacy/banded_swipe_pipeline.cpp b/src/align/legacy/banded_swipe_pipeline.cpp index c38eeb66..70e10cef 100644 --- a/src/align/legacy/banded_swipe_pipeline.cpp +++ b/src/align/legacy/banded_swipe_pipeline.cpp @@ -127,7 +127,7 @@ void Pipeline::range_ranking() { const double rr = config.rank_ratio == -1 ? 0.4 : config.rank_ratio; std::stable_sort(targets.begin(), targets.end(), Target::compare); - IntervalPartition ip((int)std::min(config.max_alignments, (uint64_t)INT_MAX)); + IntervalPartition ip((int)std::min(config.max_alignments, (size_t)INT_MAX)); for (PtrVector< ::Target>::iterator i = targets.begin(); i < targets.end();) { Target* t = ((Target*)*i); if (t->is_outranked(ip, source_query_len, rr)) { diff --git a/src/align/legacy/query_mapper.cpp b/src/align/legacy/query_mapper.cpp index 330fc5b7..3d8d91c9 100644 --- a/src/align/legacy/query_mapper.cpp +++ b/src/align/legacy/query_mapper.cpp @@ -166,11 +166,11 @@ void QueryMapper::rank_targets(double ratio, double factor) score = int((double)targets[0].filter_score * (1.0 - config.toppercent / 100.0) * ratio); } else { - size_t min_idx = std::min(targets.size(), (size_t)config.max_alignments); + size_t min_idx = std::min(targets.size(), config.max_alignments); score = int((double)targets[min_idx - 1].filter_score * ratio); } - const size_t cap = (config.toppercent < 100 || config.max_alignments == std::numeric_limits::max()) ? std::numeric_limits::max() : size_t(config.max_alignments*factor); + const size_t cap = (config.toppercent < 100 || config.max_alignments == std::numeric_limits::max()) ? std::numeric_limits::max() : size_t(config.max_alignments*factor); size_t i = 0; for (; i < targets.size(); ++i) if (targets[i].filter_score < score || i >= cap) diff --git a/src/align/ranking.cpp b/src/align/ranking.cpp index 4a376658..3ebb55eb 100644 --- a/src/align/ranking.cpp +++ b/src/align/ranking.cpp @@ -42,12 +42,12 @@ void rank_targets(vector &targets, double ratio, double factor) score = int((double)targets[0].filter_score * (1.0 - config.toppercent / 100.0) * ratio); } else { - size_t min_idx = std::min(targets.size(), (size_t)config.max_alignments); + size_t min_idx = std::min(targets.size(), config.max_alignments); score = int((double)targets[min_idx - 1].filter_score * ratio); } score = std::max(score, 1); - const size_t cap = (config.toppercent < 100 || config.max_alignments == std::numeric_limits::max()) ? std::numeric_limits::max() : size_t(config.max_alignments*factor); + const size_t cap = (config.toppercent < 100 || config.max_alignments == std::numeric_limits::max()) ? std::numeric_limits::max() : size_t(config.max_alignments*factor); size_t i = 0; for (; i < targets.size(); ++i) if (targets[i].filter_score < score || i >= cap) diff --git a/src/cluster/multi_step_cluster.cpp b/src/cluster/multi_step_cluster.cpp index 95e6ad43..60d91cb4 100644 --- a/src/cluster/multi_step_cluster.cpp +++ b/src/cluster/multi_step_cluster.cpp @@ -47,7 +47,7 @@ vector MultiStep::cluster(DatabaseFile &db, const vector *filter) { config.algo = 0; config.index_mode = 0; config.freq_sd = 0; - config.max_alignments = numeric_limits::max(); + config.max_alignments = numeric_limits::max(); Workflow::Search::Options opt; opt.db = &db; diff --git a/src/output/output_format.cpp b/src/output/output_format.cpp index 71f00ce7..9ff18355 100644 --- a/src/output/output_format.cpp +++ b/src/output/output_format.cpp @@ -113,7 +113,7 @@ void init_output(bool have_taxon_id_lists, bool have_taxon_nodes, bool have_taxo if (config.toppercent == 100.0) { message_stream << "#Target sequences to report alignments for: "; if (config.max_alignments == 0) { - config.max_alignments = std::numeric_limits::max(); + config.max_alignments = std::numeric_limits::max(); message_stream << "unlimited" << endl; } else diff --git a/src/output/target_culling.h b/src/output/target_culling.h index 5edb09f0..72149f35 100644 --- a/src/output/target_culling.h +++ b/src/output/target_culling.h @@ -110,7 +110,7 @@ struct GlobalCulling : public TargetCulling struct RangeCulling : public TargetCulling { RangeCulling() : - p_((int)std::min(config.max_alignments, (uint64_t)INT_MAX)) + p_((int)std::min(config.max_alignments, (size_t)INT_MAX)) {} virtual int cull(const Target &t) const {