OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0026203: Foundation Classes - provide method ::Swap() for NCollection_IndexedMap and NCollection_IndexedDataMap to transpose map elements

Browse Source 
Add new tests in group "perf ncollection".
This commit is contained in:
dbp
2015-05-18 15:42:30 +03:00
committed by bugmaster
parent 14cda02f82
commit 9e50612044
6 changed files with 393 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/NCollection/NCollection_IndexedDataMap.hxx
View File

@@ -70,7 +70,7 @@ class NCollection_IndexedDataMap : public NCollection_BaseMap
TheKeyType& Key1 (void)
{ return myKey1; }
//! Key2
const Standard_Integer& Key2 (void)
Standard_Integer& Key2 (void)
{ return myKey2; }
//! Next2
IndexedDataMapNode*& Next2 (void)
@@ -345,6 +345,58 @@ class NCollection_IndexedDataMap : public NCollection_BaseMap
myData1[iK1] = p;
}
//! Swaps two elements with the given indices.
void Swap (const Standard_Integer theIndex1,
const Standard_Integer theIndex2)
{
Standard_OutOfRange_Raise_if (theIndex1 < 1 || theIndex1 > Extent()
|| theIndex2 < 1 || theIndex2 > Extent(), "NCollection_IndexedDataMap::Swap");
if (theIndex1 == theIndex2)
{
return;
}
const Standard_Integer aK1 = ::HashCode (theIndex1, NbBuckets());
const Standard_Integer aK2 = ::HashCode (theIndex2, NbBuckets());
IndexedDataMapNode* aP1 = (IndexedDataMapNode*) myData2[aK1];
IndexedDataMapNode* aP2 = (IndexedDataMapNode*) myData2[aK2];
if (aP1->Key2() == theIndex1)
{
myData2[aK1] = (IndexedDataMapNode *) aP1->Next2();
}
else
{
IndexedDataMapNode* aQ = aP1;
for (aP1 = aQ->Next2(); aP1->Key2() != theIndex1; aQ = aP1, aP1 = aQ->Next2()) { }
aQ->Next2() = aP1->Next2();
}
if (aP2->Key2() == theIndex2)
{
myData2[aK2] = (IndexedDataMapNode *) aP2->Next2();
}
else
{
IndexedDataMapNode* aQ = aP2;
for (aP2 = aQ->Next2(); aP2->Key2() != theIndex2; aQ = aP2, aP2 = aQ->Next2()) { }
aQ->Next2() = aP2->Next2();
}
std::swap (aP1->Key2(),
aP2->Key2());
aP1->Next2() = (IndexedDataMapNode*) myData2[aK2];
myData2[aK2] = aP1;
aP2->Next2() = (IndexedDataMapNode*) myData2[aK1];
myData2[aK1] = aP2;
}
//! RemoveLast
void RemoveLast (void)
{