ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 22:00:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix hashtable

Browse Source
This commit is contained in:
Joachim Schöberl 2017-04-11 10:04:33 +02:00
parent e6b853e995
commit 4382fc1168
2 changed files with 56 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/general/hashtabl.cpp
View File

@ -232,8 +232,8 @@ namespace netgen
mask = size-1; mask = size-1;
hash.SetSize(size); hash.SetSize(size);
for (int i = 1; i <= size; i++) for (size_t i = 0; i < size; i++)
hash.Elem(i).I1() = invalid; hash[i].I1() = invalid;
} }

151
libsrc/general/hashtabl.hpp
View File

@ -707,31 +707,65 @@ protected:
template <class T> template <class T>
class INDEX_2_CLOSED_HASHTABLE : public BASE_INDEX_2_CLOSED_HASHTABLE class INDEX_2_CLOSED_HASHTABLE : public BASE_INDEX_2_CLOSED_HASHTABLE
{ {
///
// MoveableArray<T> cont;
Array<T> cont; Array<T> cont;
public: public:
INDEX_2_CLOSED_HASHTABLE (size_t size)
: BASE_INDEX_2_CLOSED_HASHTABLE(size), cont(RoundUp2(size))
{ ; }
void Set (const INDEX_2 & ahash, const T & acont)
{
int pos;
PositionCreate0 (ahash, pos);
hash[pos] = ahash;
cont[pos] = acont;
}
const T & Get (const INDEX_2 & ahash) const
{
int pos = Position0 (ahash);
return cont[pos];
}
inline bool Used (const INDEX_2 & ahash) const
{
int pos = Position0 (ahash);
return (pos != -1);
}
inline void SetData0 (int pos, const INDEX_2 & ahash, const T & acont)
{
hash[pos] = ahash;
cont[pos] = acont;
}
/// ///
inline INDEX_2_CLOSED_HASHTABLE (int size); inline void GetData0 (int pos, INDEX_2 & ahash, T & acont) const
/// {
inline void Set (const INDEX_2 & ahash, const T & acont); ahash = hash[pos];
/// acont = cont[pos];
inline const T & Get (const INDEX_2 & ahash) const; }
///
inline bool Used (const INDEX_2 & ahash) const; inline void SetData0 (int pos, const T & acont)
/// {
inline void SetData0 (int pos, const INDEX_2 & ahash, const T & acont); cont[pos] = acont;
/// }
inline void GetData0 (int pos, INDEX_2 & ahash, T & acont) const;
/// inline void GetData0 (int pos, T & acont) const
inline void SetData0 (int pos, const T & acont); {
/// acont = cont[pos];
inline void GetData0 (int pos, T & acont) const; }
/// ///
const T & GetData0 (int pos) { return cont[pos]; } const T & GetData0 (int pos) { return cont[pos]; }
/// ///
inline void SetSize (int size); inline void SetSize (size_t size)
{
BaseSetSize(size);
cont.SetSize(RoundUp2(size));
}
/// ///
inline void PrintMemInfo (ostream & ost) const; inline void PrintMemInfo (ostream & ost) const;
/// ///
@ -756,7 +790,7 @@ inline ostream & operator<< (ostream & ost, const INDEX_2_CLOSED_HASHTABLE<T> &
{ {
INDEX_2 hash; INDEX_2 hash;
T data; T data;
ht.GetData (i, hash, data); ht.GetData0 (i, hash, data);
ost << "hash = " << hash << ", data = " << data << endl; ost << "hash = " << hash << ", data = " << data << endl;
} }
return ost; return ost;
@ -1190,83 +1224,6 @@ inline void INDEX_HASHTABLE<T> :: PrintMemInfo (ostream & ost) const
/* *********** Closed Hashing ************************* */ /* *********** Closed Hashing ************************* */
template<class T>
inline INDEX_2_CLOSED_HASHTABLE<T> ::
INDEX_2_CLOSED_HASHTABLE (int size)
: BASE_INDEX_2_CLOSED_HASHTABLE(size), cont(RoundUp2(size))
{
// cont.SetName ("i2-hashtable, contents");
}
template<class T>
inline void INDEX_2_CLOSED_HASHTABLE<T> ::
Set (const INDEX_2 & ahash, const T & acont)
{
int pos;
PositionCreate0 (ahash, pos);
hash[pos] = ahash;
cont[pos] = acont;
}
template<class T>
inline const T & INDEX_2_CLOSED_HASHTABLE<T> ::
Get (const INDEX_2 & ahash) const
{
int pos = Position0 (ahash);
return cont[pos];
}
template<class T>
inline bool INDEX_2_CLOSED_HASHTABLE<T> ::
Used (const INDEX_2 & ahash) const
{
int pos = Position0 (ahash);
return (pos != -1);
}
template<class T>
inline void INDEX_2_CLOSED_HASHTABLE<T> ::
SetData0 (int pos, const INDEX_2 & ahash, const T & acont)
{
hash[pos] = ahash;
cont[pos] = acont;
}
template<class T>
inline void INDEX_2_CLOSED_HASHTABLE<T> ::
GetData0 (int pos, INDEX_2 & ahash, T & acont) const
{
ahash = hash[pos];
acont = cont[pos];
}
template<class T>
inline void INDEX_2_CLOSED_HASHTABLE<T> ::
SetData0 (int pos, const T & acont)
{
cont[pos] = acont;
}
template<class T>
inline void INDEX_2_CLOSED_HASHTABLE<T> ::
GetData0 (int pos, T & acont) const
{
acont = cont[pos];
}
template<class T>
inline void INDEX_2_CLOSED_HASHTABLE<T> ::
SetSize (int size)
{
BaseSetSize(size);
cont.SetSize(size);
}
template<class T> template<class T>
inline void INDEX_2_CLOSED_HASHTABLE<T> :: inline void INDEX_2_CLOSED_HASHTABLE<T> ::
PrintMemInfo (ostream & ost) const PrintMemInfo (ostream & ost) const