added HashTable::erase(const HashTable&) method

applications/test/HashTable/hashTableTest.C

@@ -100,12 +100,12 @@ int main()
         << "\ntable2" << table1 << nl
         << "\ntable3" << table3 << nl;
 
-    Info<< "\ndelete table2" << nl;
+    Info<< "\nerase table2 by iterator" << nl;
     forAllIter(HASHTABLE_CLASS<double>, table2, iter)
     {
-        Info<< "deleting " << iter.key() << " => " << iter() << " ... ";
+        Info<< "erasing " << iter.key() << " => " << iter() << " ... ";
         table2.erase(iter);
-        Info<< "deleted" << endl;
+        Info<< "erased" << endl;
     }
 
     Info<< "\ntable1" << table1 << nl
@@ -134,6 +134,24 @@ int main()
     table1.erase(table1.begin());
     Info<< "removed an element - test table1 != table3 : "
         << (table1 != table3) << nl;
+    
+    // insert a few things into table2
+    table2.set("ada", 14.0);
+    table2.set("aeq", 15.0);
+    table2.set("aaw", 16.0);
+    table2.set("abs", 17.0);
+    table2.set("adx", 20.0);
+    
+    Info<< "\ntable1" << table1 << nl
+        << "\ntable2" << table2 << nl;
+
+    label nErased = table1.erase(table2);
+    
+    Info<< "\nerase table2 keys from table1 (removed "
+        << nErased << " elements)" << nl
+        << "\ntable1" << table1 << nl
+        << "\ntable2" << table2 << nl;
+
 
     Info<< "\nclearStorage table3 ... ";
     table3.clearStorage();

applications/test/StaticHashTable/staticHashTableTest.C

@@ -100,13 +100,13 @@ int main()
         << "\ntable2" << table1 << nl
         << "\ntable3" << table3 << nl;
 
-     Info<< "\ndelete table2" << nl;
-     forAllIter(HASHTABLE_CLASS<double>, table2, iter)
-     {
-         Info<< "deleting " << iter.key() << " => " << iter() << " ... ";
-         table2.erase(iter);
-         Info<< "deleted" << endl;
-     }
+    Info<< "\nerase table2 by iterator" << nl;
+    forAllIter(HASHTABLE_CLASS<double>, table2, iter)
+    {
+        Info<< "erasing " << iter.key() << " => " << iter() << " ... ";
+        table2.erase(iter);
+        Info<< "erased" << endl;
+    }
 
     Info<< "\ntable1" << table1 << nl
         << "\ntable2" << table2 << nl
@@ -134,6 +134,24 @@ int main()
     table1.erase(table1.begin());
     Info<< "removed an element - test table1 != table3 : "
         << (table1 != table3) << nl;
+    
+    // insert a few things into table2
+    table2.set("ada", 14.0);
+    table2.set("aeq", 15.0);
+    table2.set("aaw", 16.0);
+    table2.set("abs", 17.0);
+    table2.set("adx", 20.0);
+    
+    Info<< "\ntable1" << table1 << nl
+        << "\ntable2" << table2 << nl;
+
+    label nErased = table1.erase(table2);
+    
+    Info<< "\nerase table2 keys from table1 (removed "
+        << nErased << " elements)" << nl
+        << "\ntable1" << table1 << nl
+        << "\ntable2" << table2 << nl;
+
 
     Info<< "\nclearStorage table3 ... ";
     table3.clearStorage();
@@ -144,5 +162,4 @@ int main()
     return 0;
 }
 
-
 // ************************************************************************* //

src/OpenFOAM/containers/HashTables/HashSet/HashSet.C

@@ -126,6 +126,7 @@ void Foam::HashSet<Key, Hash>::operator^=(const HashSet<Key, Hash>& rhs)
 }
 
 
+// same as HashTable::erase()
 template<class Key, class Hash>
 void Foam::HashSet<Key, Hash>::operator-=(const HashSet<Key, Hash>& rhs)
 {

src/OpenFOAM/containers/HashTables/HashTable/HashTable.C

@@ -388,11 +388,11 @@ bool Foam::HashTable<T, Key, Hash>::erase(const iterator& cit)
 template<class T, class Key, class Hash>
 bool Foam::HashTable<T, Key, Hash>::erase(const Key& key)
 {
-    iterator it = find(key);
+    iterator fnd = find(key);
 
-    if (it != end())
+    if (fnd != end())
     {
-        return erase(it);
+        return erase(fnd);
     }
     else
     {
@@ -401,6 +401,28 @@ bool Foam::HashTable<T, Key, Hash>::erase(const Key& key)
 }
 
 
+template<class T, class Key, class Hash>
+Foam::label Foam::HashTable<T, Key, Hash>::erase
+(
+    const HashTable<T, Key, Hash>& rhs
+)
+{
+    label count = 0;
+
+    // Remove rhs elements from this table
+    // NOTE: could optimize depending on which hash is smaller
+    for (iterator iter = this->begin(); iter != this->end(); ++iter)
+    {
+        if (rhs.found(iter.key()) && erase(iter))
+        {
+            count++;
+        }
+    }
+
+   return count;
+}
+
+
 template<class T, class Key, class Hash>
 void Foam::HashTable<T, Key, Hash>::resize(const label newSize)
 {

src/OpenFOAM/containers/HashTables/HashTable/HashTable.H

@@ -200,6 +200,10 @@ public:
             //- Erase an hashedEntry specified by given key if in table
             bool erase(const Key&);
 
+            //- Remove entries in the given HashTable from this HashTable
+            //  Return the number of elements removed
+            label erase(const HashTable<T, Key, Hash>&);
+
             //- Resize the hash table for efficiency
             void resize(const label newSize);
 

src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C

@@ -346,6 +346,28 @@ bool Foam::StaticHashTable<T, Key, Hash>::erase(const Key& key)
 }
 
 
+template<class T, class Key, class Hash>
+Foam::label Foam::StaticHashTable<T, Key, Hash>::erase
+(
+    const StaticHashTable<T, Key, Hash>& rhs
+)
+{
+    label count = 0;
+
+    // Remove rhs elements from this table
+    // NOTE: could optimize depending on which hash is smaller
+    for (iterator iter = this->begin(); iter != this->end(); ++iter)
+    {
+        if (rhs.found(iter.key()) && erase(iter))
+        {
+            count++;
+        }
+    }
+
+   return count;
+}
+
+
 template<class T, class Key, class Hash>
 void Foam::StaticHashTable<T, Key, Hash>::resize(const label newSize)
 {

src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H

@@ -196,6 +196,10 @@ public:
             //- Resize the hash table for efficiency
             void resize(const label newSize);
 
+            //- Remove entries in the given hash table from this hash table
+            //  Return the number of elements removed
+            label erase(const StaticHashTable<T, Key, Hash>&);
+
             //- Clear all entries from table
             void clear();