GerhardHoffmann/MOBILISIS-Calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GetTimeStep() and GetPriceForTimeStep(): use getPaymentOptions().

Browse Source
This commit is contained in:
Gerhard Hoffmann
2023-11-23 09:41:40 +01:00
parent 4b35b1ffb7
commit 0217bb8918
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/src/calculator_functions.cpp
View File

@@ -595,10 +595,10 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio
QList<int> Calculator::GetTimeSteps(Configuration const *cfg, int paymentOption) {
QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
QList<int> timeSteps;
int const pop_id = cfg->PaymentOption.find(paymentOption)->second.pop_id;
int const pop_id = cfg->getPaymentOptions().pop_id;
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
{
@@ -610,9 +610,9 @@ QList<int> Calculator::GetTimeSteps(Configuration const *cfg, int paymentOption)
return timeSteps;
}
uint32_t Calculator::GetPriceForTimeStep(Configuration const *cfg, uint8_t paymentOption, int timeStep) {
uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep) const {
int const pop_id = cfg->PaymentOption.find(paymentOption)->second.pop_id;
int const pop_id = cfg->getPaymentOptions().pop_id;
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
{