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: copy assignment, bool comparison for polynomialFunction

Browse Source
This commit is contained in:
Mark Olesen
2020-06-08 20:48:23 +02:00
parent 087e963af5
commit f5874937eb
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/OpenFOAM/primitives/functions/Polynomial/polynomialFunction.C
View File

@ -230,6 +230,17 @@ Foam::polynomialFunction::integralMinus1(const scalar intConstant) const
// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
bool Foam::polynomialFunction::operator==(const polynomialFunction& rhs) const
{
return
(
scalarList::operator==(static_cast<const scalarList&>(rhs))
&& logActive_ == rhs.logActive_
&& (!logActive_ || (logCoeff_ == rhs.logCoeff_))
);
}
Foam::polynomialFunction& Foam::polynomialFunction&
Foam::polynomialFunction::operator+=(const polynomialFunction& poly) Foam::polynomialFunction::operator+=(const polynomialFunction& poly)
{ {

11
src/OpenFOAM/primitives/functions/Polynomial/polynomialFunction.H
View File

@ -108,9 +108,6 @@ class polynomialFunction
//- Check size is non-zero or trigger FatalErrot //- Check size is non-zero or trigger FatalErrot
void checkSize() const; void checkSize() const;
//- No copy assignment
void operator=(const polynomialFunction&) = delete;
public: public:
@ -190,6 +187,14 @@ public:
// Member Operators // Member Operators
//- Equality of coefficients, and logCoeff (if active)
bool operator==(const polynomialFunction& rhs) const;
bool operator!=(const polynomialFunction& rhs) const
{
return !operator==(rhs);
}
polynomialFunction& operator+=(const polynomialFunction&); polynomialFunction& operator+=(const polynomialFunction&);
polynomialFunction& operator-=(const polynomialFunction&); polynomialFunction& operator-=(const polynomialFunction&);