research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace timesConstant with C++11 lambda

Browse source
This commit is contained in:
Ray Speth 2018-11-14 15:22:23 -05:00
parent 6f45b241b5
commit 6a859215f8
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/cantera/base/utilities.h
View file

@ -29,6 +29,8 @@ namespace Cantera
/*!
* The form of this operator is designed for use by std::transform.
* @see @ref scale().
*
* @deprecated To be removed after Cantera 2.5. Replaceable with C++11 lambda.
*/
template<class T> struct timesConstant : public std::unary_function<T, double> {
//! Constructor
@ -36,7 +38,10 @@ template<class T> struct timesConstant : public std::unary_function<T, double> {
* @param c Constant of templated type T that will be stored internally
* within the object and used in the multiplication operation
*/
timesConstant(T c) : m_c(c) {}
timesConstant(T c) : m_c(c) {
warn_deprecated("class timesConstant",
"To be removed after Cantera 2.5. Replaceable with C++11 lambda.");
}
//! Parenthesis operator returning a double
/*!
@ -130,7 +135,8 @@ template<class InputIter, class OutputIter, class S>
inline void scale(InputIter begin, InputIter end,
OutputIter out, S scale_factor)
{
std::transform(begin, end, out, timesConstant<S>(scale_factor));
std::transform(begin, end, out,
[scale_factor](double x) { return x * scale_factor; });
}
//! Multiply each entry in x by the corresponding entry in y.

2
src/thermo/Phase.cpp
View file

@ -283,7 +283,7 @@ void Phase::setMoleFractions(const doublereal* const x)
void Phase::setMoleFractions_NoNorm(const doublereal* const x)
{
m_mmw = dot(x, x + m_kk, m_molwts.begin());
transform(x, x + m_kk, m_ym.begin(), timesConstant<double>(1.0/m_mmw));
scale(x, x + m_kk, m_ym.begin(), 1.0/m_mmw);
transform(m_ym.begin(), m_ym.begin() + m_kk, m_molwts.begin(),
m_y.begin(), multiplies<double>());
compositionChanged();