From cdeb625a15f7c15126fe15ff734c6d2d73770035 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 30 Jul 2024 15:39:35 +0200 Subject: [PATCH] Minor: Revode debug output. --- library/src/calculator_functions.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/library/src/calculator_functions.cpp b/library/src/calculator_functions.cpp index fc6dc44..9073ed9 100644 --- a/library/src/calculator_functions.cpp +++ b/library/src/calculator_functions.cpp @@ -251,10 +251,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg, // int const pop_pre_paid = 1; - //qCritical() << __func__ << __LINE__; - if (prepaid) { - //qCritical() << __func__ << __LINE__; // no limits on pre-pay-option, i.e. pre-pay-ranges are exactly // the complements of operational-ranges @@ -312,6 +309,8 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg, } } } + } else { + qCritical() << "(" << __func__ << ":" << __LINE__ << "no prepaid"; } #if DEBUG_GET_DURATION_FROM_COST==1 @@ -379,7 +378,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg, price = pra_price; } - //qCritical() << DBG_HEADER << " PRICE" << price << "COST" << cost; + // qCritical() << DBG_HEADER << " PRICE" << price << "COST" << cost; auto search = cfg->Duration.find(durationId); if (search != cfg->Duration.end()) { @@ -2292,12 +2291,12 @@ QList &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex, QDateTime start = s; start.setTime(QTime(s.time().hour(), s.time().minute(), 0)); - int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id; - if (DBG_LEVEL >= DBG_DEBUG) { - qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id:" << pop_id; + qCritical() << "(" << __func__ << ":" << __LINE__ << ") start:" << start.toString(Qt::ISODate); } + int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id; + int const pop_carry_over = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over; int const pop_time_step_config = cfg->getPaymentOptions(paymentOptionIndex).pop_time_step_config; int const pop_prepaid_option_id = cfg->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id; @@ -2305,10 +2304,11 @@ QList &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex, static PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg); if (DBG_LEVEL >= DBG_DEBUG) { - qCritical() << "(" << __func__ << ":" << __LINE__ << ") start parking time:" << start.toString(Qt::ISODate); - qCritical() << "(" << __func__ << ":" << __LINE__ << ") payment option id:" << pop_id; - qCritical() << "(" << __func__ << ":" << __LINE__ << ") time step configuration:" << pop_time_step_config; - qCritical() << "(" << __func__ << ":" << __LINE__ << ") prepaid option id:" << pop_prepaid_option_id; + qCritical() << "(" << __func__ << ":" << __LINE__ << ") start parking time:" << start.toString(Qt::ISODate); + qCritical() << "(" << __func__ << ":" << __LINE__ << ") payment option id:" << pop_id; + qCritical() << "(" << __func__ << ":" << __LINE__ << ") payment method id:" << static_cast(paymentMethodId); + qCritical() << "(" << __func__ << ":" << __LINE__ << ") time step config:" << pop_time_step_config; + qCritical() << "(" << __func__ << ":" << __LINE__ << ") prepaid option id:" << pop_prepaid_option_id; } if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) { @@ -2326,8 +2326,8 @@ QList &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex, // for instance: until 13.59: price 8, from 14:00: price 5, then for the next day: 8 // for the following days: 8 euros - qCritical() << "(" << __func__ << ":" << __LINE__ << ") degressive:"; - qCritical() << "(" << __func__ << ":" << __LINE__ << ") paymentOptionIndex:" << paymentOptionIndex; + //qCritical() << "(" << __func__ << ":" << __LINE__ << ") degressive:"; + //qCritical() << "(" << __func__ << ":" << __LINE__ << ") paymentOptionIndex:" << paymentOptionIndex; m_timeSteps[paymentOptionIndex].clear(); // lookup pop_next_id in worktimes;