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

ENH: better handling of resizing for PackedList bit-wise operators

Browse Source 
- previously using an '|=' or '^=' would increase the list size to
  match the RHS. Now it only increases to last bit set.

- limit bit-wise operations to addressable range for minor efficiency
  improvement

- trim results from '&' and '^' operations for more consistent
  behaviour
This commit is contained in:
Mark Olesen
2010-09-16 16:37:41 +02:00
parent bb32504c3b
commit ba896b6903
7 changed files with 277 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
applications/test/PackedList4/PackedListTest4.C
View File

@ -40,10 +40,10 @@ using namespace Foam;
int main(int argc, char *argv[])
{
PackedBoolList list1(20);
// set every other one on
// set every third one on
forAll(list1, i)
{
list1[i] = i % 2;
list1[i] = !(i % 3);
}
Info<< "\nalternating bit pattern\n";
@ -52,70 +52,84 @@ int main(int argc, char *argv[])
PackedBoolList list2 = ~list1;
Info<< "\ncomplementary bit pattern\n";
list2.printInfo(Info, true);
list2.printBits(Info);
// set every other on
forAll(list2, i)
{
list2[i] = !(i % 2);
}
Info<< "\nalternating bit pattern\n";
list2.printBits(Info);
list2.resize(24, true);
list2.resize(28, false);
list2.resize(34, true);
list2.resize(40, false);
for (label i=0; i < 4; ++i)
{
list2[i] = true;
}
Info<< "\nresized with 4 true + 4 false, bottom 4 bits true\n";
Info<< "\nresized with false, 6 true + 6 false, bottom 4 bits true\n";
list2.printInfo(Info, true);
labelList list2Labels = list2.used();
Info<< "\noperator|\n";
(list1 | list2).printInfo(Info, true);
list1.printBits(Info);
list2.printBits(Info);
Info<< "==\n";
(list1 | list2).printBits(Info);
Info<< "\noperator& : does trim\n";
(list1 & list2).printInfo(Info, true);
(list1 & list2).printBits(Info);
Info<< "\noperator^\n";
(list1 ^ list2).printInfo(Info, true);
(list1 ^ list2).printBits(Info);
Info<< "\noperator|=\n";
{
PackedBoolList list3 = list1;
(list3 |= list2).printInfo(Info, true);
(list3 |= list2).printBits(Info);
}
Info<< "\noperator|= with UList<label>\n";
{
PackedBoolList list3 = list1;
(list3 |= list2Labels).printInfo(Info, true);
(list3 |= list2Labels).printBits(Info);
}
Info<< "\noperator&=\n";
{
PackedBoolList list3 = list1;
(list3 &= list2).printInfo(Info, true);
(list3 &= list2).printBits(Info);
}
Info<< "\noperator+=\n";
{
PackedBoolList list3 = list1;
(list3 += list2).printInfo(Info, true);
(list3 += list2).printBits(Info);
}
Info<< "\noperator+= with UList<label>\n";
{
PackedBoolList list3 = list1;
(list3 += list2Labels).printInfo(Info, true);
(list3 += list2Labels).printBits(Info);
}
Info<< "\noperator-=\n";
{
PackedBoolList list3 = list1;
(list3 -= list2).printInfo(Info, true);
(list3 -= list2).printBits(Info);
}
Info<< "\noperator-= with UList<label>\n";
{
PackedBoolList list3 = list1;
(list3 -= list2Labels).printInfo(Info, true);
(list3 -= list2Labels).printBits(Info);
}
PackedBoolList list4