dos2unix. add TODO comment

but the multimap YearPeriod, which must be empty.

library/include/mobilisis/atb_project.h

@@ -0,0 +1,13 @@
+#ifndef ATB_PROJECT_H_INCLUDED
+#define ATB_PROJECT_H_INCLUDED
+
+#include <QString>
+
+class ATBProject {
+  public:
+    QString project;
+    QString version;
+    QString info;
+};
+
+#endif // ATB_PROJECT_H_INCLUDED

library/include/mobilisis/calculator_functions.h

@@ -1,6 +1,7 @@
 #pragma once
 #include <iostream>
 #include "configuration.h"
+#include "payment_method.h"
 #include <QDateTime>
 using namespace std;
 
@@ -26,8 +27,25 @@ public:
     /// <param name="end_datetime">Date/time of park end to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z) </param>
 	/// <param name="durationMin">Duration of parking in minutes</param>
 	/// <returns>Returns cost (data type: double)</returns>
-    double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, const QDateTime start_datetime, QDateTime & end_datetime, double durationMin, bool nextDay = false, bool prepaid = false);
+    double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, const QDateTime start_datetime, QDateTime & end_datetime, int durationMin, bool nextDay = false, bool prepaid = false);
 
     // Daily ticket
     QDateTime GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over);
+
+    //
+    // helper function to find time steps for a tariff with PaymentMethod::Steps
+    // (e.g. Schoenau/Koenigsee)
+    //
+    QList<int> GetTimeSteps(Configuration *cfg) const;
+
+private:
+    // Introduced for PaymentMethod::Steps (e.g. Schoenau)
+    // For tariff of following structure: only steps, no special days, nonstop.
+    uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, quint64 durationMinutes) const;
+    uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, QDateTime const &end) const;
+
+
+    //
+    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep) const;
+    uint32_t GetDurationForPrice(Configuration *cfg, int price) const;
 };

library/include/mobilisis/configuration.h

@@ -20,6 +20,7 @@
 #include "member_type.h"
 #include "period_year.h"
 #include "payment_rate.h"
+#include "atb_project.h"
 
 using namespace std;
 using namespace rapidjson;
@@ -27,7 +28,7 @@ using namespace rapidjson;
 class Configuration
 {
 public:
-
+    ATBProject project;
     ATBCurrency Currency;
 	ATBDuration duration;
 
@@ -48,6 +49,8 @@ public:
 	/// <returns>Returns operation status bool (OK | FAIL) </returns>
 	bool ParseJson(Configuration* cfg, const char* json);
 
+    ATBPaymentOption const & getPaymentOptions();
+
 private:
 	/// <summary>
 	/// Identify type of JSON member
@@ -55,4 +58,6 @@ private:
 	/// <param name="member_name"></param>
 	/// <returns></returns>
 	MemberType IdentifyJsonMember(const char* member_name);
+
+    ATBPaymentOption currentPaymentOptions;
 };

library/include/mobilisis/tariff_time_range.h

@@ -1,17 +1,28 @@
-// #pragma once
 #ifndef TARIFF_TIME_RANGE_H_INCLUDED
 #define TARIFF_TIME_RANGE_H_INCLUDED
 
-#include <ctime>
+#include <QTime>
 
 /// <summary>
 /// Time range definition
 /// </summary>
 class TariffTimeRange {
+    QTime m_time_from;
+    QTime m_time_until;
+
 public:
-	time_t time_from;
+
-    time_t time_to;
+    TariffTimeRange()
-    TariffTimeRange() : time_from(0), time_to(0) {}
+    : m_time_from(QTime())
+    , m_time_until(QTime()) {}
+
+    void setTimeRange(QTime const& from, QTime const &until) {
+        m_time_from = from;
+        m_time_until = until;
+    }
+
+    QTime const &getTimeFrom() const { return m_time_from; }
+    QTime const &getTimeUntil() const { return m_time_until; }
 };
 
 #endif // TARIFF_TIME_RANGE_H_INCLUDED

library/library.pro

@@ -65,7 +65,8 @@ HEADERS += \
     include/mobilisis/tariff_period_year.h \
     include/mobilisis/tariff_payment_rate.h \
     include/mobilisis/tariff_log.h \
-    include/mobilisis/calculate_price.h
+    include/mobilisis/calculate_price.h \
+    include/mobilisis/atb_project.h
 
 OTHER_FILES += src/main.cpp
 

library/src/calculate_price.cpp

@@ -100,8 +100,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         time_t end_parking_time,   // netto time in minutes
         struct price_t *price) {
     CalcState calcState;
-    double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
+    double minMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_time;
-    double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
+    double maxMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_max_time;
 
     if (minMin < 0 || maxMin < 0 || maxMin < minMin) {
         calcState.setDesc(QString("minMin=%1, maxMin=%2").arg(minMin).arg(maxMin));
@@ -134,11 +134,12 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
     QDateTime end(start);
     if (start.isValid()) {
         double cost = calculator.GetCostFromDuration(
-                    tariff, PaymentOption::Option1,
+                    tariff,
+                    tariff->getPaymentOptions().pop_payment_method_id,
                     start,
                     end,
                     duration, false, true);
-        double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
+        double minCost = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_price;
         if (cost < minCost) {
             calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost).arg(cost));
             return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
@@ -160,8 +161,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         struct price_t *price)
 {
     CalcState calcState;
-    double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
+    double minMin = tariff->getPaymentOptions().pop_min_time;
-    double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
+    double maxMin = tariff->getPaymentOptions().pop_max_time;
 
     // DEBUG
     qCritical() << "compute_price_for_parking_ticket() " << endl
@@ -192,12 +193,13 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
     if (start_parking_time.isValid()) {
         double cost = calculator.GetCostFromDuration(
-                        tariff, PaymentOption::Option1,
+                        tariff,
+                        tariff->getPaymentOptions().pop_payment_method_id,
                         start_parking_time,         // starting time
                         end_parking_time,           // return value: end time
                         netto_parking_time,         // minutes, netto
                         false, true);
-        double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
+        double minCost = tariff->getPaymentOptions().pop_min_price;
         if (cost < minCost) {
             calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost, cost));
             return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
@@ -233,7 +235,8 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         qCritical() << "      start (cs): " << cs;
         qCritical() << "           price: " << price;
 
-        duration = calculator.GetDurationFromCost(tariff, PaymentOption::Option1,
+        duration = calculator.GetDurationFromCost(tariff,
+                                                  tariff->getPaymentOptions().pop_payment_method_id,
                                                   cs.toLocal8Bit().constData(),
                                                   price, false, true).c_str();
         QDateTime d = QDateTime::fromString(duration, Qt::ISODate);
@@ -258,7 +261,8 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
     if (start_parking_time.isValid()) {
         QString cs = start_parking_time.toString(Qt::ISODate);
         QString endTime = calculator.GetDurationFromCost(
-                    tariff, PaymentOption::Option1,
+                    tariff,
+                    tariff->getPaymentOptions().pop_payment_method_id,
                     cs.toLocal8Bit().constData(),
                     price, false, true).c_str();
         ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
@@ -286,7 +290,7 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff
 
         ticketEndTime = calculator.GetDailyTicketDuration(tariff,
                                                             start_parking_time,
-                                                            PaymentOption::Option1,
+                                                            tariff->getPaymentOptions().pop_payment_method_id,
                                                             false);    // carry over
 
         // DEBUG

library/src/calculator_functions.cpp

@@ -1,11 +1,14 @@
 #include "calculator_functions.h"
-#include "payment_method.h"
+#include "payment_option.h"
 #include "utilities.h"
 #include "tariff_log.h"
+#include "tariff_time_range.h"
 
 #include <sstream>
+#include <algorithm>
 #include <QDateTime>
-#include <qdebug.h>
+#include <QScopedArrayPointer>
+#include <QDebug>
 
 double total_duration_min = 0.0f;
 double total_cost = 0.0f;
@@ -118,22 +121,35 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                             bool nextDay,
                                             bool prepaid)
 {
+
     // Get input date
     QDateTime inputDate = QDateTime::fromString(start_datetime,Qt::ISODate);
 
+    // use tariff with structure as for instance Schnau, Koenigsee:
+    // without given YearPeriod, SpecialDays and SpecialDaysWorktime
+    if (cfg->YearPeriod.size() == 0
+        && cfg->SpecialDays.size() == 0
+        && cfg->SpecialDaysWorktime.size() == 0)
+    {
+        inputDate = inputDate.addSecs(GetDurationForPrice(cfg, price) * 60);
+
+        return inputDate.toString(Qt::ISODate).toStdString();
+    }
+
+
     // Get day of week
     int weekdayId = 0;
     weekdayId = Utilities::ZellersAlgorithm(inputDate.date().day(),inputDate.date().month(),inputDate.date().year());
 
     //Get min and max time defined in JSON
     double minMin = 0;
-    minMin = cfg->PaymentOption.find(payment_option)->second.pop_min_time;
+    minMin = cfg->getPaymentOptions().pop_min_time;
 
     double maxMin = 0;
-    maxMin = cfg->PaymentOption.find(payment_option)->second.pop_max_time;
+    maxMin = cfg->getPaymentOptions().pop_max_time;
 
     double min_price = 0;
-    min_price = cfg->PaymentOption.find(payment_option)->second.pop_min_price;
+    min_price = cfg->getPaymentOptions().pop_min_price;
 
     if(price < min_price)
     {
@@ -339,78 +355,105 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 ///////////////////////////////////////
 
 /// <inheritdoc/>
-double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_option, const QDateTime start_datetime, QDateTime & end_datetime,  double durationMin, bool nextDay, bool prepaid)
+///
+
+uint32_t Calculator::GetCostFromDuration(Configuration *cfg,
+                                         QDateTime const &start,
+                                         quint64 timeStepInMinutes) const {
+    // for instance, a tariff as used in Schoenau, Koenigssee: only steps, no
+    // special days, nonstop.
+    if (cfg->YearPeriod.size() == 0
+     && cfg->SpecialDays.size() == 0
+     && cfg->SpecialDaysWorktime.size() == 0) {
+        QDateTime const end = start.addSecs(timeStepInMinutes*60);
+        return GetCostFromDuration(cfg, start, end);
+    }
+    return 0;
+}
+
+uint32_t Calculator::GetCostFromDuration(Configuration * cfg,
+                                         QDateTime const &start,
+                                         QDateTime const &end) const {
+    if (cfg->YearPeriod.size() == 0
+     && cfg->SpecialDays.size() == 0
+     && cfg->SpecialDaysWorktime.size() == 0) {
+        int const timeStepInMinutes = start.secsTo(end) / 60;
+        return GetPriceForTimeStep(cfg, timeStepInMinutes);
+    }
+    return 0;
+}
+
+
+
+
+///////////////////////////////////////
+
+/// <inheritdoc/>
+double Calculator::GetCostFromDuration(Configuration* cfg,
+                                       uint8_t payment_option,
+                                       const QDateTime start_datetime,
+                                       QDateTime &end_datetime,
+                                       int durationMinutes,
+                                       bool nextDay,
+                                       bool prepaid)
 {
+    if (cfg->YearPeriod.size() == 0
+        && cfg->SpecialDays.size() == 0
+        && cfg->SpecialDaysWorktime.size() == 0)
+    {
+        end_datetime = start_datetime.addSecs(durationMinutes*60);
+        return GetCostFromDuration(cfg, start_datetime, end_datetime);
+    }
+
+    //Get min and max time defined in JSON
+    static int const minMin = std::max((int)cfg->PaymentOption.find(payment_option)->second.pop_min_time, 0);
+    static int const maxMin = std::max((int)cfg->PaymentOption.find(payment_option)->second.pop_max_time, 0);
+
+    static const bool checkMinMaxMinutes = [](int minMin, int maxMin){ return (minMin < maxMin) ? true : false; }(minMin, maxMin);
+
+    if (!checkMinMaxMinutes) {
+        qCritical() << QString("ERROR: CONDITION minMin < maxMin (%1 < %2) IS NOT VALID").arg(minMin).arg(maxMin);
+        return 0.0;
+    }
+
     // Get input date
     QDateTime inputDate = start_datetime;
 
     // Get day of week
-    int weekdayId = 0;
+    int const weekdayId = inputDate.date().dayOfWeek();
-    weekdayId = Utilities::ZellersAlgorithm(inputDate.date().day(),inputDate.date().month(),inputDate.date().year());
 
-    //Get min and max time defined in JSON
+    // weekdayId = Utilities::ZellersAlgorithm(inputDate.date().day(),inputDate.date().month(),inputDate.date().year());
-    double minMin = 0;
-    minMin = cfg->PaymentOption.find(payment_option)->second.pop_min_time;
-
-    double maxMin = 0;
-    maxMin = cfg->PaymentOption.find(payment_option)->second.pop_max_time;
-
-    if (minMin < 0) minMin = 0;
-    if (maxMin < 0) maxMin = 0;
-    if (minMin >= maxMin)
-    {
-        LOG_ERROR("Error: min_min cannot be greater or equal to max_min");
-        return 0.0f;
-    }
-    if (maxMin <= minMin)
-    {
-        LOG_ERROR("Error: max_min cannot be lower or equal than min_min");
-        return 0.0f;
-    }
 
     // Check overtime
-    if (!overtime)
+    if (!overtime) {
-    {
+        if (durationMinutes > maxMin) {
-        if (durationMin > maxMin)
+            qWarning() << QString("Total duration >= max_min (%1 >= %2)").arg(durationMinutes).arg(maxMin);
-        {
-            LOG_WARNING("Total duration is greater or equal to max_min");
             return maxMin;
         }
 
-        if (durationMin < minMin)
+        if (durationMinutes < minMin) {
-        {
+            qWarning() << QString("Total duration <= minMin (%1 <= %2)").arg(durationMinutes).arg(minMin);
-            LOG_WARNING("Total duration is lower or equal to min_min");
             return 0.0f;
         }
     }
 
-    // Get payment method
+    double day_price = 0.0;
-    uint8_t p_method = PaymentMethod::Undefined;
-    p_method = payment_option;
-    LOG_DEBUG("Payment method id: ", (unsigned)p_method);
-
-    // Check special day
-    double day_price = 0.0f;
     int current_special_day_id = -1;
-    bool is_special_day = Utilities::CheckSpecialDay(cfg, inputDate.toString(Qt::ISODate).toStdString().c_str(), &current_special_day_id, &day_price);
-    LOG_DEBUG("Special day: ", is_special_day);
-
-    total_duration_min = durationMin;
-    LOG_DEBUG("Total min:", total_duration_min);
-
     double price_per_unit = 0.0f;
-    QTime worktime_from;
-    QTime worktime_to;
 
-    if(is_special_day)
+    int const timeRanges = std::max((int)cfg->WeekDaysWorktime.count(weekdayId), 1);
-    {
+    QScopedArrayPointer<TariffTimeRange> worktime(new TariffTimeRange[timeRanges]);
+    int index = 0;
+
+    if(Utilities::CheckSpecialDay(cfg,
+                                  inputDate.toString(Qt::ISODate).toStdString().c_str(),
+                                  &current_special_day_id,
+                                  &day_price)) {
         // Set special day price
         price_per_unit = Utilities::CalculatePricePerUnit(day_price);
-        worktime_from = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_from.c_str());
+        worktime[index].setTimeRange(QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_from.c_str()),
-        worktime_to = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_to.c_str());
+                                     QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_to.c_str()));
-    }
+    } else {
-    else
-    {
         // Set new price for the normal day
 
         int pop_id = cfg->PaymentOption.find(payment_option)->second.pop_id;
@@ -421,123 +464,180 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio
         price_per_unit = Utilities::CalculatePricePerUnit(day_price,durationUnit);
 
         // If no working day found, skip it (recursively call method again)
-        size_t found = 0;
+        if (cfg->WeekDaysWorktime.count(weekdayId) <= 0) {
-        found = cfg->WeekDaysWorktime.count(weekdayId);
-
             // When no workday found, go to next available day
-        if(found <=0)
+            qDebug() << "No workday found, trying to find next available day";
-        {
-            LOG_DEBUG("- No workday found, trying to find next available day");
             inputDate = inputDate.addDays(1);
-            return floor(GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, durationMin, true, prepaid));
+            return floor(GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, durationMinutes, true, prepaid));
+        }
+
+        for (auto[itr, rangeEnd] = cfg->WeekDaysWorktime.equal_range(weekdayId); itr != rangeEnd; ++itr) {
+            qCritical() << itr->first << itr->second.pwd_time_from.c_str() << itr->second.pwd_time_to.c_str();
+            worktime[index].setTimeRange(QTime::fromString(itr->second.pwd_time_from.c_str()),
+                                         QTime::fromString(itr->second.pwd_time_to.c_str()));
+            index += 1;
         }
-        worktime_from = QTime::fromString(cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_from.c_str());
-        worktime_to = QTime::fromString(cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_to.c_str());
     }
 
     if (price_per_unit < 0) price_per_unit = 1.0f;
-    LOG_DEBUG("Calculated price per minute: ", price_per_unit);
+    qDebug() << "Calculated price per minute=" << price_per_unit;
 
-    if (price_per_unit == 0)
+    double costFromDuration = 0.0;
-    {
+    for (int w = 0; w < index; ++w) {
+        QTime worktime_from = worktime[w].getTimeFrom();
+        QTime worktime_to = worktime[w].getTimeUntil();
+
+        if (price_per_unit == 0) {
             inputDate = inputDate.addDays(1);
             inputDate.setTime(worktime_from);
-        return GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, durationMin, true, prepaid);
+            double const partialCost = GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, durationMinutes, true, prepaid);
+            if (partialCost <= __DBL_MIN__) {
+                return 0.0;
+            }
+            costFromDuration += partialCost;
+            continue;
         }
 
         // If overtime flag is set
-    if (overtime || nextDay)
+        if (overtime || nextDay) {
-    {
             inputDate.setTime(worktime_from);
             overtime = false;
         }
 
         // Check prepaid
-    if (!prepaid)
+        if (!prepaid) {
-    {
+            if ((inputDate.time() < worktime_from) || (inputDate.time() > worktime_to)) {
-        if ((inputDate.time() < worktime_from) || (inputDate.time() > worktime_to))
+                qDebug() << "[STOP] * Ticket is not valid * ";
-        {
-            LOG_DEBUG("[STOP] * Ticket is not valid * ");
                 return 0.0f;
             }
-    }
+        } else {
-    else
+            qDebug() << "* PREPAID MODE ACTIVE *";
-    {
+            if (inputDate.time() < worktime_from) {
-        LOG_DEBUG("* PREPAID MODE ACTIVE *");
-        if (inputDate.time() < worktime_from)
-        {
                 inputDate.setTime(worktime_from);
-        }
+            } else if(inputDate.time() > worktime_to) {
-        else if(inputDate.time() > worktime_to)
+                qDebug() << " *** PREPAID *** Current time is past the time range end, searching for next available day";
-        {
-            LOG_DEBUG(" *** PREPAID *** Current time is past the time range end, searching for next available day");
                 inputDate = inputDate.addDays(1);
-            return GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, durationMin, true, prepaid);
+                double const partialCost = GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, durationMinutes, true, prepaid);
+                if (partialCost < __DBL_MIN__) {
+                    return 0.0;
+                }
+                costFromDuration += partialCost;
+                continue;
             }
         }
 
-    while(true)
+        while(durationMinutes > 0) {
-    {
+            // Check for active year period
-        if(total_duration_min <= 0) break;
+            if (std::none_of(cfg->YearPeriod.begin(),
-
+                             cfg->YearPeriod.end(),
-        // Check year period
+                    [&inputDate](std::pair<int, ATBPeriodYear> const &year) {
-        bool isYearPeriodActive = false;
+                        QDate const input(2004, // 2004 is a leap year
-
+                                          inputDate.date().month(),
-        //// Parse input date
+                                          inputDate.date().day());
-        int dayCurrent = inputDate.date().day();
+                        QDate const s(2004, year.second.pye_start_day, year.second.pye_start_month);
-        int monthCurrent = inputDate.date().month();
+                        QDate const e(2004, year.second.pye_end_day, year.second.pye_end_month);
-
+                        return (input >= s && input <= e);
-        // Current date time
+                    })) {
-        int cdt = (monthCurrent * 100) + dayCurrent;
+                qCritical() << "NO VALID YEAR PERIOD";
-
+                return 0.0;
-        multimap<int, ATBPeriodYear>::iterator year_period_itr;
-        for (year_period_itr = cfg->YearPeriod.begin(); year_period_itr != cfg->YearPeriod.end(); ++year_period_itr)
-        {
-            int dStart = year_period_itr->second.pye_start_day;
-            int dEnd = year_period_itr->second.pye_end_day;
-
-            int mStart = year_period_itr->second.pye_start_month;
-            int mEnd = year_period_itr->second.pye_end_month;
-
-            int start = (mStart * 100) + dStart;
-            int end = (mEnd * 100) + dEnd;
-
-            if (cdt >= start && cdt <= end) {
-                isYearPeriodActive = true;
-                break;
             }
-        }
-        if (!isYearPeriodActive)
-        {
-            LOG_DEBUG("Year period is not valid");
-            return 0.0f;
-        }
-
-        int carry_over_status = 0;
-        carry_over_status = cfg->PaymentOption.find(payment_option)->second.pop_carry_over;
 
             // Go to next day if minutes not spent
-        if(inputDate.time() >= worktime_to)
+            if(inputDate.time() >= worktime_to) {
-        {
+                // check for carry_over status
-            if (carry_over_status < 1) break;
+                if (cfg->PaymentOption.find(payment_option)->second.pop_carry_over < 1) {
+                    break;
+                }
+
+                qDebug() << "Reached end of worktime, searching for the next working day";
 
-            LOG_DEBUG("Reached end of worktime, searching for the next working day");
                 inputDate = inputDate.addDays(1);
                 overtime = true;
-            return GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, total_duration_min);
+                double const partialCost = GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, durationMinutes, false, false);
+                if (partialCost < __DBL_MIN__) {
+                    return 0.0;
                 }
-
+                costFromDuration += partialCost;
+                break; // stop while, and continue in outer loop
+            } else {
                 // Increment input date minutes for each monetary unit
                 inputDate = inputDate.addSecs(60);
-        total_duration_min -=1;
+                durationMinutes -= 1;
-        total_cost += price_per_unit;
+                costFromDuration += price_per_unit;
-
             }
-    qDebug() << "GetCostFromDuration(): Valid until:" << inputDate.toString(Qt::ISODate).toStdString().c_str();
+        }
+    }
+
+    qDebug() << "GetCostFromDuration(): Valid until:" << inputDate.toString(Qt::ISODate);
 
     end_datetime = inputDate;
 
-    double ret_val = total_cost;
+    //double ret_val = total_cost;
-    total_cost = 0.0f;
+    //total_cost = 0.0f;
-    return ceil(ret_val);
+    //return ceil(ret_val);
+
+    // TODO: runden nur falls oberster stack-rahmen
+
+    return ceil(costFromDuration);
+}
+
+
+
+QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
+    QList<int> timeSteps;
+
+    int const pop_id = cfg->getPaymentOptions().pop_id;
+
+    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
+    {
+        int const durationId = itr->second.pra_payment_unit_id;
+        int const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
+        timeSteps << durationUnit;
+    }
+
+    return timeSteps;
+}
+
+uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep) const {
+
+    int const pop_id = cfg->getPaymentOptions().pop_id;
+
+    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
+    {
+        int const payment_unit_id = itr->second.pra_payment_unit_id;
+        int const pun_id = cfg->Duration.find(payment_unit_id)->second.pun_id;
+
+        Q_ASSERT(pun_id == payment_unit_id);
+
+        int const pun_duration = cfg->Duration.find(payment_unit_id)->second.pun_duration;
+        if (timeStep == pun_duration) {
+            return (uint32_t)(itr->second.pra_price);
+        }
+    }
+
+    return 0;
+}
+
+uint32_t Calculator::GetDurationForPrice(Configuration *cfg, int price) const {
+    int const pop_id = cfg->getPaymentOptions().pop_id;
+
+    uint32_t duration = 0;
+
+    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
+    {
+        int const durationId = itr->second.pra_payment_unit_id;
+        int const pra_price = itr->second.pra_price;
+
+        uint32_t const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
+
+        if (pra_price == price) {
+            return durationUnit;
+        }
+
+        if (pra_price < price) {
+            duration = durationUnit;
+        }
+    }
+
+    return duration;
 }

library/src/configuration.cpp

@@ -59,8 +59,9 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 			|| !document.HasMember("PaymentRate")
 			|| !document.HasMember("Duration")
 			//|| !document.HasMember("WeekDays")
-			|| !document.HasMember("SpecialDaysWorktime")
+            //|| !document.HasMember("SpecialDaysWorktime")
-			|| !document.HasMember("SpecialDays"))
+            //|| !document.HasMember("SpecialDays")
+            )
 		{
 			printf("%s", "Error: not a valid configuration JSON\n");
 			return false;
@@ -87,13 +88,26 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 			const char* mb_name = i->name.GetString();
             if (mb_name == NULL) continue;
 
-            // if (!document[mb_name].IsArray()) {
+            if (document[mb_name].IsString()) {
-                std::string const _mb_name(mb_name);
+                QString const _mb_name(mb_name);
-                if (_mb_name == "version" || _mb_name == "project" ||
+                if (_mb_name.startsWith("Project", Qt::CaseInsensitive)) {
-                    _mb_name == "zone" || _mb_name == "info") {
+                    cfg->project.project = document[mb_name].GetString();
+                    continue;
+                 }
+                if (_mb_name.startsWith("Version", Qt::CaseInsensitive)) {
+                    cfg->project.version = document[mb_name].GetString();
+                    continue;
+                }
+                if (_mb_name.startsWith("Info", Qt::CaseInsensitive)) {
+                    cfg->project.info = document[mb_name].GetString();
+                    continue;
+                }
+            }
+
+            // ... everything else should be an array
+            if (!document[mb_name].IsArray()) {
                 continue;
             }
-            // }
 
 			//printf(" -%s\n", mb_name);
 
@@ -155,6 +169,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 						else if (strcmp(inner_obj_name, "pop_min_price") == 0) PaymentOption.pop_min_price = k->value.GetDouble();
 						else if (strcmp(inner_obj_name, "pop_carry_over") == 0) PaymentOption.pop_carry_over = k->value.GetInt();
                         else if (strcmp(inner_obj_name, "pop_daily_card_price") == 0) PaymentOption.pop_daily_card_price = k->value.GetInt();
+                        this->currentPaymentOptions = PaymentOption;
                         break;
 					case MemberType::DurationType:
 						if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
@@ -245,3 +260,10 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 		return false;
 	}
 }
+
+
+
+const ATBPaymentOption & Configuration::getPaymentOptions()
+{
+    return this->currentPaymentOptions;
+}

main/main.cpp

@@ -36,7 +36,7 @@ extern "C" char* strptime(const char* s,
 
 int main() {
 
-    std::ifstream input(QDir::homePath().append("/tariff01.json").toStdString());
+    std::ifstream input("/tmp/tariff_korneuburg.json");
     std::stringstream sstr;
     while(input >> sstr.rdbuf());
     std::string json(sstr.str());
@@ -47,14 +47,12 @@ int main() {
     bool isParsed = cfg.ParseJson(&cfg, json.c_str());
     cout << endl;
 
-    char const *startDate = "";
 
     if (isParsed)
     {
-        startDate = "2023-05-10T13:52:18.665Z";
+        QDateTime start = QDateTime::fromString("2023-05-11T08:00:00",Qt::ISODate);
-        std::string duration = calculator.GetDurationFromCost(&cfg, 3, (char *)startDate, 33, false, true);
+        QDateTime end = start.addSecs(120);
-        cout << "---> startDate " << startDate << " _price_ = " << 33
+        calculator.GetCostFromDuration(&cfg, 3, start, end, 60);
-             << " Total duration is: " << duration << endl;
     }
 
     return 0;
@@ -69,6 +67,7 @@ int main() {
     if (init_tariff(&tariff, "/etc/psa_tariff/")) {      
         struct price_t price;
         memset(&price, 0x00, sizeof(price));
+
         QDateTime start = QDateTime::fromString("2023-05-11T07:50:00",Qt::ISODate); //QDateTime::currentDateTime();
         time_t start_parking_time = start.toSecsSinceEpoch() / 60;
         time_t end_parking_time = start_parking_time + 615;

test-files/tariff_korneuburg.json

@@ -0,0 +1,160 @@
+{
+  "Project" :   "Korneuburg",
+  "Version" :   "1.0.0",
+  "Info"    :   "",
+  "Currency": [
+    {
+      "pcu_id": 2,
+      "pcu_sign": "€",
+      "pcu_major": "EUR",
+      "pcu_minor": "",
+      "pcu_active": true
+    }
+  ],
+  "PaymentMethod": [
+    {
+      "pme_id": 1,
+      "pme_label": "progressive"
+    },
+    {
+      "pme_id": 2,
+      "pme_label": "degressive"
+    },
+    {
+      "pme_id": 3,
+      "pme_label": "linear"
+    },
+    {
+      "pme_id": 4,
+      "pme_label": "steps"
+    }
+  ],
+  "PaymentOption": [
+    {
+      "pop_id": 1049,
+      "pop_label": "Zone 1",
+      "pop_payment_method_id": 3,
+      "pop_day_end_time": "00:00:00",
+      "pop_day_night_end_time": "00:00:00",
+      "pop_price_night": 0,
+      "pop_min_time": 30,
+      "pop_max_time": 180,
+      "pop_min_price": 60,
+      "pop_carry_over": 0,
+      "pop_daily_card_price": 0
+    }
+  ],
+  "PaymentRate": [
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 1,
+      "pra_price": 10
+    }
+  ],
+  "Duration": [
+    {
+      "pun_id": 1,
+      "pun_label": "5 min",
+      "pun_duration": 5 
+    },
+    {
+      "pun_id": 3,
+      "pun_label": "15 min",
+      "pun_duration": 15
+    },
+    {
+      "pun_id": 4,
+      "pun_label": "1 min",
+      "pun_duration": 1
+    }
+  ],
+  "WeekDaysWorktime": [
+    {
+      "pwd_id": 621,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 1,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
+    },
+    {
+      "pwd_id": 621,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 1,
+      "pwd_time_from": "14:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 622,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 2,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
+    },
+    {
+      "pwd_id": 622,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 2,
+      "pwd_time_from": "14:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 623,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 3,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
+    },
+    {
+      "pwd_id": 623,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 3,
+      "pwd_time_from": "14:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 624,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 4,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
+    },
+    {
+      "pwd_id": 624,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 4,
+      "pwd_time_from": "14:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 625,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 5,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
+    },
+    {
+      "pwd_id": 625,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 5,
+      "pwd_time_from": "14:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 626,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 6,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
+    }
+  ],
+  "PeriodYear": [
+    {
+      "pye_id": 8,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    }
+  ]
+}