ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-02-04 00:50:37 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hashvalue_int3' into 'master'

Browse Source 
Add a HashValue<INT<3>> for ParallelHashTable

See merge request jschoeberl/netgen!278
This commit is contained in:
Joachim Schöberl 2019-10-21 13:46:12 +00:00
commit 9d0902fb57
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/core/hashtable.hpp
View File

@ -827,7 +827,13 @@ namespace ngcore
return ost; return ost;
} }
template <typename TI>
NETGEN_INLINE size_t HashValue (const INT<3,TI> ind)
{
INT<3,size_t> lind = ind;
return 113*lind[0]+59*lind[1]+lind[2];
}
template <typename TI> template <typename TI>
NETGEN_INLINE size_t HashValue (const INT<2,TI> ind) NETGEN_INLINE size_t HashValue (const INT<2,TI> ind)
{ {

1
libsrc/general/hashtabl.hpp
View File

@ -1390,7 +1390,6 @@ inline size_t HashValue (INDEX_2 i2, size_t size) { return (113*size_t(i2[0])+si
ClosedHashTable (ClosedHashTable && ht2) = default; ClosedHashTable (ClosedHashTable && ht2) = default;
// who needs that ?
ClosedHashTable (NgFlatArray<T_HASH> _hash, NgFlatArray<T> _cont) ClosedHashTable (NgFlatArray<T_HASH> _hash, NgFlatArray<T> _cont)
: size(_hash.Size()), used(0), hash(_hash.Size(), _hash.Addr(0)), cont(_cont.Size(), _cont.Addr(0)) : size(_hash.Size()), used(0), hash(_hash.Size(), _hash.Addr(0)), cont(_cont.Size(), _cont.Addr(0))
{ {