diff --git a/src/vt/vrt/collection/balance/model/composed_model.cc b/src/vt/vrt/collection/balance/model/composed_model.cc index f4967337df..f93a5a8c0f 100644 --- a/src/vt/vrt/collection/balance/model/composed_model.cc +++ b/src/vt/vrt/collection/balance/model/composed_model.cc @@ -60,7 +60,7 @@ ComposedModel::getModeledLoad(ElementIDStruct object, PhaseOffset when) const { } TimeType -ComposedModel::getModeledComm(ElementIDStruct object, PhaseOffset when) { +ComposedModel::getModeledComm(ElementIDStruct object, PhaseOffset when) const { return base_->getModeledComm(object, when); } diff --git a/src/vt/vrt/collection/balance/model/weighted_communication_volume.cc b/src/vt/vrt/collection/balance/model/weighted_communication_volume.cc index 62dbc38852..421f519428 100644 --- a/src/vt/vrt/collection/balance/model/weighted_communication_volume.cc +++ b/src/vt/vrt/collection/balance/model/weighted_communication_volume.cc @@ -48,7 +48,7 @@ namespace vt { namespace vrt { namespace collection { namespace balance { TimeType WeightedCommunicationVolume::getModeledLoad( ElementIDStruct object, PhaseOffset when -) { +) const { return alpha_ * ComposedModel::getModeledLoad(object, when) + beta_ * ComposedModel::getModeledComm(object, when) + gamma_; } diff --git a/src/vt/vrt/collection/balance/model/weighted_communication_volume.h b/src/vt/vrt/collection/balance/model/weighted_communication_volume.h index fe8754f03c..f66eda5c1d 100644 --- a/src/vt/vrt/collection/balance/model/weighted_communication_volume.h +++ b/src/vt/vrt/collection/balance/model/weighted_communication_volume.h @@ -67,7 +67,7 @@ class WeightedCommunicationVolume : public ComposedModel { beta_(beta), gamma_(gamma) { } - TimeType getModeledLoad(ElementIDStruct object, PhaseOffset when) override; + TimeType getModeledLoad(ElementIDStruct object, PhaseOffset when) const override; private: double alpha_; diff --git a/tests/unit/collection/test_model_weighted_communication_volume.nompi.cc b/tests/unit/collection/test_model_weighted_communication_volume.nompi.cc index 2a31081b98..6271721956 100644 --- a/tests/unit/collection/test_model_weighted_communication_volume.nompi.cc +++ b/tests/unit/collection/test_model_weighted_communication_volume.nompi.cc @@ -84,7 +84,7 @@ struct StubModel : LoadModel { void updateLoads(PhaseType) override { } - TimeType getModeledLoad(ElementIDStruct id, PhaseOffset phase) override { + TimeType getModeledLoad(ElementIDStruct id, PhaseOffset phase) const override { const auto work = proc_load_->at(0).at(id).whole_phase_load; if (phase.subphase == PhaseOffset::WHOLE_PHASE) { @@ -94,17 +94,17 @@ struct StubModel : LoadModel { } } - ObjectIterator begin() override { + ObjectIterator begin() const override { return {std::make_unique( proc_load_->at(0).begin(), proc_load_->at(0).end() )}; } - unsigned int getNumCompletedPhases() override { return num_phases; } + unsigned int getNumCompletedPhases() const override { return num_phases; } // Not used in this test - int getNumSubphases() override { return 0; } - unsigned int getNumPastPhasesNeeded(unsigned int look_back = 0) override { + int getNumSubphases() const override { return 0; } + unsigned int getNumPastPhasesNeeded(unsigned int look_back = 0) const override { return look_back; }