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: wordRes::uniq() removes all duplicates

Browse Source 
- previously just removed duplicate literals, but now remove any
  duplicates.

- Replace previous wordHashSet implementation with a linear search
  instead. The lists are normally fairly small and mostly just have
  unique entries anyhow. This reduces the overall overhead.
This commit is contained in:
Mark Olesen
2019-02-14 11:03:04 +01:00
committed by Andrew Heather
parent 60c314150c
commit 95a33c2f68
3 changed files with 80 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
applications/test/wordRe/Test-wordRe.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2017-2018 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
@ -36,6 +36,7 @@ Description
#include "keyType.H"
#include "wordRes.H"
#include "predicates.H"
#include "Random.H"
using namespace Foam;
@ -139,6 +140,34 @@ int main(int argc, char *argv[])
Info<< "string match: " << string("x.*")("xyz") << nl;
Info<< "string match: " << string("x.*")(keyre) << nl;
// Test uniq
{
Random rnd;
const label last = wres1.size()-1;
for (label i = 0; i < 8; ++i)
{
// Make a copy
wordRe wre(wres1[rnd.position<label>(0,last)]);
// Append
wres1.append(wre);
}
// Add some entropy
Foam::shuffle(wres1);
Info<< nl
<< "Test uniq on " << wres1
<< " == " << wordRes::uniq(wres1) << nl;
// Inplace
wres1.uniq();
Info<< nl << "Inplace: " << wres1 << nl;
}
Info<< nl;
wordRe(s1, wordRe::DETECT).info(Info) << nl;
wordRe(s2).info(Info) << nl;
wordRe(s2, wordRe::DETECT).info(Info) << nl;