From 85f11fa7ccee75df61de41d27ac45cda1b07c9fb Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 6 Aug 2009 17:43:39 +0100 Subject: [PATCH] added sortedToc() --- applications/test/HashTable/hashTableTest.C | 1 + .../containers/HashTables/HashTable/HashTable.C | 11 ++++++++++- .../containers/HashTables/HashTable/HashTable.H | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/applications/test/HashTable/hashTableTest.C b/applications/test/HashTable/hashTableTest.C index 25338a2bb7..7e03a36f7d 100644 --- a/applications/test/HashTable/hashTableTest.C +++ b/applications/test/HashTable/hashTableTest.C @@ -56,6 +56,7 @@ int main() table1.erase("abs"); Info<< "\ntable1 toc: " << table1.toc() << endl; + Info<< "\ntable1 sortedToc: " << table1.sortedToc() << endl; table1.printInfo(Info) << "table1 [" << table1.size() << "] " << endl; forAllIter(HASHTABLE_CLASS, table1, iter) diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C index c2034a69ea..10bcadc761 100644 --- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C +++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C @@ -231,7 +231,6 @@ Foam::HashTable::find } -// Return the table of contents template Foam::List Foam::HashTable::toc() const { @@ -247,6 +246,16 @@ Foam::List Foam::HashTable::toc() const } +template +Foam::List Foam::HashTable::sortedToc() const +{ + List sortedList = this->toc(); + sort(sortedList); + + return sortedList; +} + + template bool Foam::HashTable::set ( diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H index 3871db3a50..666b93ebec 100644 --- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H +++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H @@ -198,6 +198,9 @@ public: //- Return the table of contents List toc() const; + //- Return the table of contents as a sorted list + List sortedToc() const; + //- Print information Ostream& printInfo(Ostream&) const;