From a1491a8c1b1e1ca4bde9e76c5b7ceb0d89ff8a3c Mon Sep 17 00:00:00 2001 From: "Kevin L. Manktelow" Date: Mon, 10 Feb 2025 16:09:09 -0700 Subject: [PATCH] ROL: add some override keywords to eliminate -Winconsistent-override warnings for issue #13798 Signed-off-by: Kevin L. Manktelow --- .../randvarfunctional/risk/ROL_MixedCVaR.hpp | 14 +++++------ .../risk/ROL_QuantileRadius.hpp | 14 +++++------ .../risk/spectral/ROL_SpectralRisk.hpp | 24 +++++++++---------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/rol/src/sol/function/randvarfunctional/risk/ROL_MixedCVaR.hpp b/packages/rol/src/sol/function/randvarfunctional/risk/ROL_MixedCVaR.hpp index 085848e61dfb..3efd3c55b556 100644 --- a/packages/rol/src/sol/function/randvarfunctional/risk/ROL_MixedCVaR.hpp +++ b/packages/rol/src/sol/function/randvarfunctional/risk/ROL_MixedCVaR.hpp @@ -118,7 +118,7 @@ class MixedCVaR : public RandVarFunctional { checkInputs(); } - void initialize(const Vector &x) { + void initialize(const Vector &x) override { RandVarFunctional::initialize(x); vec_.assign(size_,static_cast(0)); } @@ -136,7 +136,7 @@ class MixedCVaR : public RandVarFunctional { void updateValue(Objective &obj, const Vector &x, const std::vector &xstat, - Real &tol) { + Real &tol) override { Real pf(0), one(1); Real val = computeValue(obj,x,tol); for (int i = 0; i < size_; i++) { @@ -147,7 +147,7 @@ class MixedCVaR : public RandVarFunctional { Real getValue(const Vector &x, const std::vector &xstat, - SampleGenerator &sampler) { + SampleGenerator &sampler) override { Real cvar(0); sampler.sumAll(&val_,&cvar,1); for (int i = 0; i < size_; i++) { @@ -159,7 +159,7 @@ class MixedCVaR : public RandVarFunctional { void updateGradient(Objective &obj, const Vector &x, const std::vector &xstat, - Real &tol) { + Real &tol) override { Real pf(0), c(0), one(1); Real val = computeValue(obj,x,tol); for (int i = 0; i < size_; i++) { @@ -177,7 +177,7 @@ class MixedCVaR : public RandVarFunctional { std::vector &gstat, const Vector &x, const std::vector &xstat, - SampleGenerator &sampler) { + SampleGenerator &sampler) override { sampler.sumAll(&vec_[0],&gstat[0],size_); for (int i = 0; i < size_; i++) { gstat[i] += coeff_[i]; @@ -190,7 +190,7 @@ class MixedCVaR : public RandVarFunctional { const std::vector &vstat, const Vector &x, const std::vector &xstat, - Real &tol) { + Real &tol) override { Real pf1(0), pf2(0), c(0), one(1); Real val = computeValue(obj,x,tol); for (int i = 0; i < size_; i++) { @@ -216,7 +216,7 @@ class MixedCVaR : public RandVarFunctional { const std::vector &vstat, const Vector &x, const std::vector &xstat, - SampleGenerator &sampler) { + SampleGenerator &sampler) override { sampler.sumAll(&vec_[0],&hvstat[0],size_); sampler.sumAll(*hv_,hv); } diff --git a/packages/rol/src/sol/function/randvarfunctional/risk/ROL_QuantileRadius.hpp b/packages/rol/src/sol/function/randvarfunctional/risk/ROL_QuantileRadius.hpp index 5a98cc496f94..beefd482a17d 100644 --- a/packages/rol/src/sol/function/randvarfunctional/risk/ROL_QuantileRadius.hpp +++ b/packages/rol/src/sol/function/randvarfunctional/risk/ROL_QuantileRadius.hpp @@ -75,7 +75,7 @@ class QuantileRadius : public RandVarFunctional { checkInputs(); } - void initialize(const Vector &x) { + void initialize(const Vector &x) override { RandVarFunctional::initialize(x); vec_.assign(2,static_cast(0)); } @@ -91,7 +91,7 @@ class QuantileRadius : public RandVarFunctional { void updateValue(Objective &obj, const Vector &x, const std::vector &xstat, - Real &tol) { + Real &tol) override { const Real half(0.5), one(1); Real val = computeValue(obj,x,tol); Real pf1 = plusFunction_->evaluate(val-xstat[0],0); @@ -101,7 +101,7 @@ class QuantileRadius : public RandVarFunctional { Real getValue(const Vector &x, const std::vector &xstat, - SampleGenerator &sampler) { + SampleGenerator &sampler) override { const Real half(0.5); Real cvar(0); sampler.sumAll(&val_,&cvar,1); @@ -112,7 +112,7 @@ class QuantileRadius : public RandVarFunctional { void updateGradient(Objective &obj, const Vector &x, const std::vector &xstat, - Real &tol) { + Real &tol) override { const Real half(0.5), one(1); Real val = computeValue(obj,x,tol); Real pf1 = plusFunction_->evaluate(val-xstat[0],1); @@ -128,7 +128,7 @@ class QuantileRadius : public RandVarFunctional { std::vector &gstat, const Vector &x, const std::vector &xstat, - SampleGenerator &sampler) { + SampleGenerator &sampler) override { const Real half(0.5); sampler.sumAll(&vec_[0],&gstat[0],2); sampler.sumAll(*g_,g); @@ -141,7 +141,7 @@ class QuantileRadius : public RandVarFunctional { const std::vector &vstat, const Vector &x, const std::vector &xstat, - Real &tol) { + Real &tol) override { const Real half(0.5), one(1); Real val = computeValue(obj,x,tol); Real pf11 = plusFunction_->evaluate(val-xstat[0],1); @@ -163,7 +163,7 @@ class QuantileRadius : public RandVarFunctional { const std::vector &vstat, const Vector &x, const std::vector &xstat, - SampleGenerator &sampler) { + SampleGenerator &sampler) override { sampler.sumAll(&vec_[0],&hvstat[0],2); sampler.sumAll(*hv_,hv); } diff --git a/packages/rol/src/sol/function/randvarfunctional/risk/spectral/ROL_SpectralRisk.hpp b/packages/rol/src/sol/function/randvarfunctional/risk/spectral/ROL_SpectralRisk.hpp index 30291583699a..3efc14fed752 100644 --- a/packages/rol/src/sol/function/randvarfunctional/risk/spectral/ROL_SpectralRisk.hpp +++ b/packages/rol/src/sol/function/randvarfunctional/risk/spectral/ROL_SpectralRisk.hpp @@ -174,33 +174,33 @@ class SpectralRisk : public RandVarFunctional { } void setStorage(const Ptr> &value_storage, - const Ptr> &gradient_storage) { + const Ptr> &gradient_storage) override { RandVarFunctional::setStorage(value_storage,gradient_storage); mqq_->setStorage(value_storage,gradient_storage); } void setHessVecStorage(const Ptr> &gradvec_storage, - const Ptr> &hessvec_storage) { + const Ptr> &hessvec_storage) override { RandVarFunctional::setHessVecStorage(gradvec_storage,hessvec_storage); mqq_->setHessVecStorage(gradvec_storage,hessvec_storage); } - void setSample(const std::vector &point, const Real weight) { + void setSample(const std::vector &point, const Real weight) override { RandVarFunctional::setSample(point,weight); mqq_->setSample(point,weight); } - void resetStorage(bool flag = true) { + void resetStorage(bool flag = true) override { RandVarFunctional::resetStorage(flag); mqq_->resetStorage(flag); } - void resetStorage(UpdateType type) { + void resetStorage(UpdateType type) override { RandVarFunctional::resetStorage(type); mqq_->resetStorage(type); } - void initialize(const Vector &x) { + void initialize(const Vector &x) override { RandVarFunctional::initialize(x); mqq_->initialize(x); } @@ -212,14 +212,14 @@ class SpectralRisk : public RandVarFunctional { void updateValue(Objective &obj, const Vector &x, const std::vector &xstat, - Real &tol) { + Real &tol) override { mqq_->updateValue(obj,x,xstat,tol); } void updateGradient(Objective &obj, const Vector &x, const std::vector &xstat, - Real &tol) { + Real &tol) override { mqq_->updateGradient(obj,x,xstat,tol); } @@ -228,13 +228,13 @@ class SpectralRisk : public RandVarFunctional { const std::vector &vstat, const Vector &x, const std::vector &xstat, - Real &tol) { + Real &tol) override { mqq_->updateHessVec(obj,v,vstat,x,xstat,tol); } Real getValue(const Vector &x, const std::vector &xstat, - SampleGenerator &sampler) { + SampleGenerator &sampler) override { return mqq_->getValue(x,xstat,sampler); } @@ -242,7 +242,7 @@ class SpectralRisk : public RandVarFunctional { std::vector &gstat, const Vector &x, const std::vector &xstat, - SampleGenerator &sampler) { + SampleGenerator &sampler) override { mqq_->getGradient(g,gstat,x,xstat,sampler); } @@ -252,7 +252,7 @@ class SpectralRisk : public RandVarFunctional { const std::vector &vstat, const Vector &x, const std::vector &xstat, - SampleGenerator &sampler) { + SampleGenerator &sampler) override { mqq_->getHessVec(hv,hvstat,v,vstat,x,xstat,sampler); } };