Skip to content

Commit

Permalink
Compiler error.
Browse files Browse the repository at this point in the history
  • Loading branch information
bbuchfink committed Aug 29, 2020
1 parent 2807e26 commit 9cbe69d
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/align/culling.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/align/legacy/banded_swipe_pipeline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
4 changes: 2 additions & 2 deletions src/align/legacy/query_mapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<uint64_t>::max()) ? std::numeric_limits<uint64_t>::max() : size_t(config.max_alignments*factor);
const size_t cap = (config.toppercent < 100 || config.max_alignments == std::numeric_limits<size_t>::max()) ? std::numeric_limits<size_t>::max() : size_t(config.max_alignments*factor);
size_t i = 0;
for (; i < targets.size(); ++i)
if (targets[i].filter_score < score || i >= cap)
Expand Down
4 changes: 2 additions & 2 deletions src/align/ranking.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ void rank_targets(vector<WorkTarget> &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<uint64_t>::max()) ? std::numeric_limits<uint64_t>::max() : size_t(config.max_alignments*factor);
const size_t cap = (config.toppercent < 100 || config.max_alignments == std::numeric_limits<size_t>::max()) ? std::numeric_limits<size_t>::max() : size_t(config.max_alignments*factor);
size_t i = 0;
for (; i < targets.size(); ++i)
if (targets[i].filter_score < score || i >= cap)
Expand Down
2 changes: 1 addition & 1 deletion src/cluster/multi_step_cluster.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ vector<int> MultiStep::cluster(DatabaseFile &db, const vector<bool> *filter) {
config.algo = 0;
config.index_mode = 0;
config.freq_sd = 0;
config.max_alignments = numeric_limits<uint64_t>::max();
config.max_alignments = numeric_limits<size_t>::max();

Workflow::Search::Options opt;
opt.db = &db;
Expand Down
2 changes: 1 addition & 1 deletion src/output/output_format.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<uint64_t>::max();
config.max_alignments = std::numeric_limits<size_t>::max();
message_stream << "unlimited" << endl;
}
else
Expand Down
2 changes: 1 addition & 1 deletion src/output/target_culling.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down

0 comments on commit 9cbe69d

Please sign in to comment.