Skip to content

Use std::sort instead of QSortInt #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use std::sort instead of QSortInt #307

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce10645
fix: Use std::sort instead of QSortInt
fuji8 Jan 20, 2022
5ae14ea
fix: sort->stable_sort
fuji8 Jan 21, 2022
90ddfb8
fix: Do not use lambda expression
fuji8 Jan 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/hhalignment.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1673,11 +1673,20 @@ int Alignment::Filter2(char keep[], int coverage, int qid, float qsc,
}

// Sort sequences according to length; afterwards, nres[ksort[kk]] is sorted by size

struct sortDesc
{
int* _nres;
sortDesc(int* nres) : _nres(nres){}
bool operator()(int left, int right) {
return _nres[left] > _nres[right];
}
};
if (ksort == NULL) {
ksort = new int[N_in]; // never reuse alignment object for new alignment with more sequences
for (k = 0; k < N_in; ++k)
ksort[k] = k;
QSortInt(nres, ksort, kfirst + 1, N_in - 1, -1); //Sort sequences after kfirst (query) in descending order
std::stable_sort(ksort + kfirst + 1 , ksort+ N_in, sortDesc(nres)); //Sort sequences after kfirst (query) in descending order
}
for (kk = 0; kk < N_in; ++kk) {
inkk[kk] = in[ksort[kk]];
Expand Down