zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: PtrList, PtrDynList, HashPtrTable try_emplace() method

Browse Source 
- naming like std::map::try_emplace(), it behaves like emplace_set()
  if there is no element at the given location otherwise a no-op

ENH: reuse existing HashPtrTable 'slot' when setting pointers

- avoids extra HashTable operations
This commit is contained in:
Mark Olesen
2023-07-25 15:45:23 +02:00
parent 11a1f78338
commit 03ca52b036
11 changed files with 190 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
applications/test/Dictionary/Test-Dictionary.C
View File

@ -55,10 +55,7 @@ public:
i_(i)
{}
const word& keyword() const
{
return keyword_;
}
word& keyword() const noexcept { return keyword_; }
friend Ostream& operator<<(Ostream& os, const ent& e)
{
@ -74,28 +71,27 @@ class Scalar
public:
Scalar()
:
data_(0)
{}
static bool verbose;
Scalar(scalar val)
:
data_(val)
{}
constexpr Scalar() noexcept : data_(0) {}
Scalar(scalar val) noexcept : data_(val) {}
~Scalar()
{
Info<<"delete Scalar: " << data_ << endl;
if (verbose) Info<< "delete Scalar: " << data_ << endl;
}
friend Ostream& operator<<(Ostream& os, const Scalar& val)
scalar value() const noexcept { return data_; }
scalar& value() noexcept { return data_; }
friend Ostream& operator<<(Ostream& os, const Scalar& item)
{
os << val.data_;
os << item.value();
return os;
}
};
bool Scalar::verbose = true;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

41
applications/test/HashPtrTable/Test-HashPtrTable.C
View File

@ -44,38 +44,28 @@ class Scalar
public:
Scalar()
:
data_(0)
{}
static bool verbose;
Scalar(scalar val)
:
data_(val)
{}
constexpr Scalar() noexcept : data_(0) {}
Scalar(scalar val) noexcept : data_(val) {}
~Scalar()
{
Info<<"delete Scalar: " << data_ << endl;
if (verbose) Info<< "delete Scalar: " << data_ << endl;
}
const scalar& value() const
{
return data_;
}
const scalar& value() const noexcept { return data_; }
scalar& value() noexcept { return data_; }
scalar& value()
friend Ostream& operator<<(Ostream& os, const Scalar& item)
{
return data_;
}
friend Ostream& operator<<(Ostream& os, const Scalar& val)
{
os << val.data_;
os << item.value();
return os;
}
};
bool Scalar::verbose = true;
template<class T>
void printTable(const HashPtrTable<T>& table)
@ -129,6 +119,9 @@ int main()
myTable.set("natlog", new double(2.718282));
myTable.insert("sqrt2", autoPtr<double>::New(1.414214));
myTable.insert("euler", autoPtr<double>::New(0.577216));
myTable.set("def_0", nullptr);
myTable.emplace_set("def_1", 123);
myTable.emplace_set("def_2", 456);
HashTable<std::unique_ptr<double>> myTable1;
@ -146,6 +139,14 @@ int main()
Info<< "Initial table" << nl;
printTable(myTable);
myTable.try_emplace("def_0", 1000); // was nullptr, now value
myTable.try_emplace("def_1", 1001); // no-op
myTable.try_emplace("def_2", 1002); // no-op;
myTable.try_emplace("def_3", 1003); // was non-existent, now value
Info<< "after try_emplace" << nl;
printTable(myTable);
Info<< "print" << nl;
Info<< myTable2 << nl;

23
applications/test/ISLList/Test-ISLList.C
View File

@ -46,26 +46,27 @@ class Scalar
{
public:
// static bool verbose;
scalar data_;
Scalar()
:
data_(0)
{}
Scalar() : data_(0) {}
Scalar(scalar val) : data_(val) {}
Scalar(scalar s)
:
data_(s)
{}
// ~Scalar() {}
friend Ostream& operator<<(Ostream& os, const Scalar& s)
scalar value() const noexcept { return data_; }
scalar& value() noexcept { return data_; }
friend Ostream& operator<<(Ostream& os, const Scalar& item)
{
os << s.data_;
os << item.value();
return os;
}
};
// bool Scalar::verbose = true;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Main program:

28
applications/test/PtrList/Test-PtrList.C
View File

@ -49,15 +49,8 @@ public:
static bool verbose;
constexpr Scalar() noexcept
:
data_(0)
{}
Scalar(scalar val) noexcept
:
data_(val)
{}
constexpr Scalar() noexcept : data_(0) {}
Scalar(scalar val) noexcept : data_(val) {}
~Scalar()
{
@ -67,10 +60,7 @@ public:
scalar value() const noexcept { return data_; }
scalar& value() noexcept { return data_; }
autoPtr<Scalar> clone() const
{
return autoPtr<Scalar>::New(data_);
}
autoPtr<Scalar> clone() const { return autoPtr<Scalar>::New(data_); }
friend Ostream& operator<<(Ostream& os, const Scalar& item)
{
@ -361,15 +351,19 @@ int main(int argc, char *argv[])
list2.emplace(i, (10 + 1.3*i));
}
#if 0
list2.release(5);
list2.release(10);
forAll(list2, i)
{
list2.try_emplace(i, (50 + 1.3*i));
// Memory error (with fulldebug): const label len = (list2.size()+2);
const label len = list2.size();
Info<< "try_emplace " << len << " values" << nl;
for (label i = 0; i < len; ++i)
{
list2.try_emplace(i, (50 + 1.3*i));
}
}
#endif
PtrList<Scalar> listApp;
for (label i = 0; i < 5; ++i)

23
applications/test/PtrListDictionary/Test-PtrListDictionary.C
View File

@ -45,28 +45,29 @@ class Scalar
public:
Scalar()
:
data_(0)
{}
static bool verbose;
Scalar(scalar val)
:
data_(val)
{}
constexpr Scalar() noexcept : data_(0) {}
Scalar(scalar val) noexcept : data_(val) {}
~Scalar()
{
Info<<"delete Scalar: " << data_ << endl;
if (verbose) Info<< "delete Scalar: " << data_ << endl;
}
friend Ostream& operator<<(Ostream& os, const Scalar& val)
const scalar& value() const noexcept { return data_; }
scalar& value() noexcept { return data_; }
autoPtr<Scalar> clone() const { return autoPtr<Scalar>::New(data_); }
friend Ostream& operator<<(Ostream& os, const Scalar& item)
{
os << val.data_;
os << item.value();
return os;
}
};
bool Scalar::verbose = true;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //