zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: add partial sorting to SortableList

Browse Source
This commit is contained in:
Mark Olesen
2019-04-24 19:03:00 +02:00
committed by Andrew Heather
parent 3a1a353483
commit bf30779b64
3 changed files with 56 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/test/sort/Test-sortList.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2017 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011 OpenFOAM Foundation
@ -67,6 +67,10 @@ int main(int argc, char *argv[])
Info<< "reverse ..." << nl;
printInfo(list1r);
list1r.partialSort(list1r.size()/2);
Info<< "partial sorted ..." << nl;
printInfo(list1r);
SortableList<label> list2(orig);
Info<< "unsorted: " << orig << nl;
printInfo(list2);

48
src/OpenFOAM/containers/Lists/SortableList/SortableList.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2017 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -136,7 +136,7 @@ Foam::List<T>& Foam::SortableList<T>::shrink()
template<class T>
void Foam::SortableList<T>::sort()
{
Foam::sortedOrder(*this, indices_);
Foam::sortedOrder(*this, indices_, typename UList<T>::less(*this));
List<T> list(*this, indices_); // Copy with indices for mapping
List<T>::transfer(list);
@ -148,8 +148,48 @@ void Foam::SortableList<T>::reverseSort()
{
Foam::sortedOrder(*this, indices_, typename UList<T>::greater(*this));
List<T> lst(*this, indices_); // Copy with indices for mapping
List<T>::transfer(lst);
List<T> list(*this, indices_); // Copy with indices for mapping
List<T>::transfer(list);
}
template<class T>
void Foam::SortableList<T>::partialSort(label n, label start)
{
indices_.resize(this->size());
ListOps::identity(indices_);
// Forward partial sort of indices
std::partial_sort
(
indices_.begin() + start,
indices_.begin() + start + n,
indices_.end(),
typename UList<T>::less(*this)
);
List<T> list(*this, indices_); // Copy with indices for mapping
List<T>::transfer(list);
}
template<class T>
void Foam::SortableList<T>::partialReverseSort(label n, label start)
{
indices_.resize(this->size());
ListOps::identity(indices_);
// Reverse partial sort of indices
std::partial_sort
(
indices_.begin() + start,
indices_.begin() + start + n,
indices_.end(),
typename UList<T>::greater(*this)
);
List<T> list(*this, indices_); // Copy with indices for mapping
List<T>::transfer(list);
}

8
src/OpenFOAM/containers/Lists/SortableList/SortableList.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2017 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -130,6 +130,12 @@ public:
// Resizes the indices as required
void reverseSort();
//- Forward partial sort the list until the middle point
void partialSort(label n, label start=0);
//- Reverse partial sort the list until the middle point
void partialReverseSort(label n, label start=0);
//- Swap content with another SortableList in constant time
inline void swap(SortableList<T>& lst);