95cd8ee75c
- additional dummy template parameter to assist with supporting
derived classes. Currently just used for string types, but can be
extended.
- provide hash specialization for various integer types.
Removes the need for any forwarding.
- change default hasher for HashSet/HashTable from 'string::hash'
to `Hash<Key>`. This avoids questionable hashing calls and/or
avoids compiler resolution problems.
For example,
HashSet<label>::hasher and labelHashSet::hasher now both properly
map to Hash<label> whereas previously HashSet<label> would have
persistently mapped to string::hash, which was incorrect.
- standardize internal hashing functors.
Functor name is 'hasher', as per STL set/map and the OpenFOAM
HashSet/HashTable definitions.
Older code had a local templated name, which added unnecessary
clutter and the template parameter was always defaulted.
For example,
Old: `FixedList<label, 3>::Hash<>()`
New: `FixedList<label, 3>::hasher()`
Unchanged: `labelHashSet::hasher()`
Existing `Hash<>` functor namings are still supported,
but deprecated.
- define hasher and Hash specialization for bitSet and PackedList
- add symmetric hasher for 'face'.
Starts with lowest vertex value and walks in the direction
of the next lowest value. This ensures that the hash code is
independent of face orientation and face rotation.
NB:
- some of keys for multiphase handling (eg, phasePairKey)
still use yet another function naming: `hash` and `symmHash`.
This will be targeted for alignment in the future.
102 lines
1.7 KiB
C++
102 lines
1.7 KiB
C++
/*--------------------------------*- C++ -*----------------------------------*\
|
|
| ========= | |
|
|
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
|
| \\ / O peration | Version: v2012 |
|
|
| \\ / A nd | Website: www.openfoam.com |
|
|
| \\/ M anipulation | |
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
|
|
stringList
|
|
(
|
|
"The quick brown fox jumps over the lazy dog"
|
|
"The best hash is the one you don't write yourself!"
|
|
)
|
|
|
|
|
|
labelList
|
|
(
|
|
0
|
|
1
|
|
100
|
|
1000
|
|
-1
|
|
-10
|
|
-100
|
|
100
|
|
)
|
|
|
|
labelListList
|
|
(
|
|
(0)
|
|
(0 0)
|
|
(0 0 0)
|
|
(0 1)
|
|
(100 1000)
|
|
(0 1 100 1000)
|
|
(100 1000)
|
|
)
|
|
|
|
faceList
|
|
(
|
|
(0 1 2 3 4 5)
|
|
(5 4 3 1 2 0)
|
|
(0 1 2 3 4 5)
|
|
(100 0 15)
|
|
(15 0 100)
|
|
)
|
|
|
|
// edges are hashed commutatively
|
|
edgeList
|
|
(
|
|
(0 1)
|
|
(1 0)
|
|
(45 100)
|
|
(100 45)
|
|
(128 1000)
|
|
(1000 128)
|
|
(100 45)
|
|
)
|
|
|
|
// triFaces are also hashed commutatively (via multiply/add)
|
|
triFaceList
|
|
(
|
|
(10 20 30)
|
|
(30 20 10)
|
|
(20 10 30)
|
|
)
|
|
|
|
|
|
labelPairList
|
|
(
|
|
(0 1)
|
|
(1 0)
|
|
(45 100)
|
|
(100 45)
|
|
(128 1000)
|
|
(1000 128)
|
|
(100 45)
|
|
)
|
|
|
|
|
|
labelPairPairList
|
|
(
|
|
((0 1) (1 0))
|
|
((45 100) (100 45))
|
|
((128 1000) (1000 128))
|
|
((45 100) (100 45))
|
|
)
|
|
|
|
|
|
wordPairList
|
|
(
|
|
("Yes" "No")
|
|
("True" "False")
|
|
("No" "Yes")
|
|
("False" "True")
|
|
)
|
|
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|