Added test cases for Fuchs/Schnals

Minor: changed some debug output.

library/include/mobilisis/configuration.h

@@ -28,7 +28,6 @@
 #include "tariff_interpolation.h"
 #include "tariff_prepaid.h"
 #include "tariff_carryover.h"
-#include "tariff_prepay.h"
 #include "tariff_permit_type.h"
 
 #include <QVector>
@@ -48,7 +47,6 @@ public:
     using ATBPaymentOptionType = std::multimap<int, ATBPaymentOption>;
     using TariffInterpolationType = std::multimap<int, ATBInterpolation>;
     using TariffPrepaidType = std::multimap<int, ATBPrepaid>;
-    using TariffPrepayOptionType = std::multimap<int, ATBPrepay>;
     using TariffCarryOverType = std::multimap<int, ATBCarryOver>;
     using TariffDurationType = std::multimap<int, ATBDuration>;
 
@@ -56,7 +54,7 @@ public:
     ATBCurrency Currency;
     ATBDuration duration;
 
-	TariffDurationType Duration;
+    TariffDurationType Duration;
 	multimap<int, ATBPaymentMethod> PaymentMethod;
 	multimap<int, ATBPaymentRate> PaymentRate;
 	SpecialDaysWorktimeType SpecialDaysWorktime;
@@ -73,7 +71,6 @@ public:
 	TariffProductType TariffProduct;
 	TariffInterpolationType TariffInterpolations;
 	TariffPrepaidType TariffPrepaidOptions;
-	TariffPrepayOptionType TariffPrepayOptions;
 	TariffCarryOverType TariffCarryOverOptions;
 
 	/// <summary>

library/include/mobilisis/duration.h

@@ -1,7 +1,6 @@
 #include <string>
 
 #include <QDebug>
-#include <QDateTime>
 
 class ATBDuration
 {
@@ -13,35 +12,20 @@ public:
       , pun_duration_saved(0)
       , pun_duration_min(0)
       , pun_duration_max(0)
-      , pun_interpolation_id(-1)
-      , pun_netto(false)
-      , pun_brutto(false)
-      , pun_fixed(false)
-      , pun_mutable(false)
-      , pun_round_to_next_24h_boundary(false)
-      , pun_round_to_prev_24h_boundary(false)
-      , pun_align_with_timepoint(QDateTime())
-      , pun_next_step_correction(0) {
+      , pun_interpolation_id(-1) {
     }
 
     friend QDebug operator<<(QDebug debug, ATBDuration const &td) {
         QDebugStateSaver saver(debug);
 
         debug.nospace()
-            << "                        pun_id: " << td.pun_id << "\n"
-            << "                     pun_label: " << QString::fromStdString(td.pun_label) << "\n"
-            << "                  pun_duration: " << td.pun_duration << "\n"
-            << "            pun_duration_saved: " << td.pun_duration_saved << "\n"
-            << "              pun_duration_min: " << td.pun_duration_min << "\n"
-            << "              pun_duration_max: " << td.pun_duration_max << "\n"
-            << "          pun_interpolation_id: " << td.pun_interpolation_id << "\n"
-            << "                     pun_netto: " << td.pun_netto << "\n"
-            << "                    pun_brutto: " << td.pun_brutto << "\n"
-            << "                     pun_fixed: " << td.pun_fixed << "\n"
-            << "                   pun_mutable: " << td.pun_mutable << "\n"
-            << "pun_round_to_next_24h_boundary: " << td.pun_round_to_next_24h_boundary << "\n"
-            << "pun_round_to_prev_24h_boundary: " << td.pun_round_to_prev_24h_boundary << "\n"
-            << "      pun_align_with_timepoint: " << td.pun_align_with_timepoint << endl;
+            << "              pun_id: " << td.pun_id << "\n"
+            << "           pun_label: " << QString::fromStdString(td.pun_label) << "\n"
+            << "        pun_duration: " << td.pun_duration << "\n"
+            << "  pun_duration_saved: " << td.pun_duration_saved << "\n"
+            << "    pun_duration_min: " << td.pun_duration_min << "\n"
+            << "    pun_duration_max: " << td.pun_duration_max << "\n"
+            << "pun_interpolation_id: " << td.pun_interpolation_id << "\n";
 
         return debug;
     }
@@ -49,16 +33,8 @@ public:
 	int pun_id;
 	std::string pun_label;
 	int pun_duration;
-	int pun_duration_saved;
-	int pun_duration_min;
-	int pun_duration_max;
-	int pun_interpolation_id;
-	bool pun_netto;             // the timestep expressed by this duration is a netto timestep
-	bool pun_brutto;            // the timestep expressed by this duration is a brutto timestep
-	bool pun_fixed;             // the value given in tariff-file is fixed (constant)
-	bool pun_mutable;           // the value could change
-	bool pun_round_to_next_24h_boundary;
-	bool pun_round_to_prev_24h_boundary;
-	QDateTime pun_align_with_timepoint;
-	int pun_next_step_correction;
+    int pun_duration_saved;
+    int pun_duration_min;
+    int pun_duration_max;
+    int pun_interpolation_id;
 };

library/include/mobilisis/member_type.h

@@ -13,17 +13,16 @@ enum MemberType
 	WeekDaysWorkTimeType = 0x06,
 	SpecialDaysWorktimeType = 0x07,
 	SpecialDaysType = 0x08,
-	PeriodYearType = 0x09,
-	DailyTicketType = 0x0A,
-	CustomerType = 0x0B,
-	TimeBaseType = 0x0C,
-	TimeRangeType = 0x0D,
-	TimeStepConfigType = 0x0E,
-	ProductType = 0x0F,
-	InterpolationType = 0x10,
-	PrepaidType = 0x11, // deprecated
-	CarryOverType = 0x12,
-	PrepaidOptionType = 0x13,
+    PeriodYearType = 0x09,
+    DailyTicketType = 0x0A,
+    CustomerType = 0x0B,
+    TimeBaseType = 0x0C,
+    TimeRangeType = 0x0D,
+    TimeStepConfigType = 0x0E,
+    ProductType = 0x0F,
+    InterpolationType = 0x10,
+    PrepaidType = 0x11,
+    CarryOverType = 0x12
 };
 
 #endif // MEMBER_TYPE_H_INCLUDED

library/include/mobilisis/payment_opt.h

@@ -28,7 +28,6 @@ public:
         pop_carry_over = -1;
         pop_carry_over_option_id = -1;
         pop_prepaid_option_id = -1;
-        pop_prepay_option_id = -1;
         pop_truncate_last_interpolation_step = false;
         pop_accumulate_prices = false;
         pop_accumulate_durations = false;
@@ -62,8 +61,7 @@ public:
     int pop_carry_over;
     int pop_carry_over_option_id;
     bool pop_truncate_last_interpolation_step;
-    int pop_prepaid_option_id; // deprecated
-    int pop_prepay_option_id;
+    int pop_prepaid_option_id;
     bool pop_carry_over_target;
     int pop_carry_over_time_range_id;
     int pop_carry_over_start_time_range;

library/include/mobilisis/tariff_prepay.h

@@ -1,68 +0,0 @@
-#ifndef TARIFF_PREPAY_H_INCLUDED
-#define TARIFF_PREPAY_H_INCLUDED
-
-#include <QTime>
-
-struct ATBPrepay {
-    struct week {
-        int day;
-        bool prepaid;       // yes/no
-        QTime start; // only valid if prepaid == true
-        QTime end;
-        int duration;
-    } prepay[8];
-
-    int id;
-
-    friend QDebug operator<<(QDebug debug, ATBPrepay const &pp) {
-        QDebugStateSaver saver(debug);
-
-        debug.nospace()
-            << "          id:" << pp.id << "\n"
-            << "        **** Monday **** \n"
-            << "         day: " << pp.prepay[(int)Qt::Monday].day << "\n"
-            << "       start: " << pp.prepay[(int)Qt::Monday].start.toString(Qt::ISODate) << "\n"
-            << "         end: " << pp.prepay[(int)Qt::Monday].end.toString(Qt::ISODate) << "\n"
-            << "    duration: " << pp.prepay[(int)Qt::Monday].duration << "\n"
-            << "     prepaid: " << pp.prepay[(int)Qt::Monday].prepaid << "\n"
-            << "        **** Tuesday **** \n"
-            << "         day: " << pp.prepay[(int)Qt::Tuesday].day << "\n"
-            << "       start: " << pp.prepay[(int)Qt::Tuesday].start.toString(Qt::ISODate) << "\n"
-            << "         end: " << pp.prepay[(int)Qt::Tuesday].end.toString(Qt::ISODate) << "\n"
-            << "    duration: " << pp.prepay[(int)Qt::Monday].duration << "\n"
-            << "     prepaid: " << pp.prepay[(int)Qt::Tuesday].prepaid << "\n"
-            << "        **** Wednesday **** \n"
-            << "         day: " << pp.prepay[(int)Qt::Wednesday].day << "\n"
-            << "       start: " << pp.prepay[(int)Qt::Wednesday].start.toString(Qt::ISODate) << "\n"
-            << "         end: " << pp.prepay[(int)Qt::Wednesday].end.toString(Qt::ISODate) << "\n"
-            << "    duration: " << pp.prepay[(int)Qt::Monday].duration << "\n"
-            << "     prepaid: " << pp.prepay[(int)Qt::Wednesday].prepaid << "\n"
-            << "        **** Thursday **** \n"
-            << "         day: " << pp.prepay[(int)Qt::Thursday].day << "\n"
-            << "       start: " << pp.prepay[(int)Qt::Thursday].start.toString(Qt::ISODate) << "\n"
-            << "         end: " << pp.prepay[(int)Qt::Thursday].end.toString(Qt::ISODate) << "\n"
-            << "    duration: " << pp.prepay[(int)Qt::Monday].duration << "\n"
-            << "     prepaid: " << pp.prepay[(int)Qt::Thursday].prepaid << "\n"
-            << "        **** Friday **** \n"
-            << "         day: " << pp.prepay[(int)Qt::Friday].day << "\n"
-            << "       start: " << pp.prepay[(int)Qt::Friday].start.toString(Qt::ISODate) << "\n"
-            << "         end: " << pp.prepay[(int)Qt::Friday].end.toString(Qt::ISODate) << "\n"
-            << "     prepaid: " << pp.prepay[(int)Qt::Friday].prepaid << "\n"
-            << "        **** Saturday **** \n"
-            << "         day: " << pp.prepay[(int)Qt::Saturday].day << "\n"
-            << "       start: " << pp.prepay[(int)Qt::Saturday].start.toString(Qt::ISODate) << "\n"
-            << "         end: " << pp.prepay[(int)Qt::Saturday].end.toString(Qt::ISODate) << "\n"
-            << "    duration: " << pp.prepay[(int)Qt::Monday].duration << "\n"
-            << "     prepaid: " << pp.prepay[(int)Qt::Saturday].prepaid << "\n"
-            << "        **** Sunday **** \n"
-            << "         day: " << pp.prepay[(int)Qt::Sunday].day << "\n"
-            << "       start: " << pp.prepay[(int)Qt::Sunday].start.toString(Qt::ISODate) << "\n"
-            << "         end: " << pp.prepay[(int)Qt::Sunday].end.toString(Qt::ISODate) << "\n"
-            << "    duration: " << pp.prepay[(int)Qt::Monday].duration << "\n"
-            << "     prepaid: " << pp.prepay[(int)Qt::Sunday].prepaid << "\n";
-
-        return debug;
-    }
-};
-
-#endif // TARIFF_CARRYOVER_H_INCLUDED

library/include/mobilisis/tariff_timestep_config.h

@@ -6,7 +6,7 @@
 #include <QDebugStateSaver>
 
 struct ATBTimeStepConfig {
-    enum class TimeStepConfig {STATIC=1, DYNAMIC=2, RECOMPUTE_SOME=3};
+    enum class TimeStepConfig {STATIC=1, DYNAMIC=2};
 
     ATBTimeStepConfig() = default;
     int tsconfig_id;

library/library.pro

@@ -38,24 +38,24 @@ SOURCES += \
     src/tariff_global_defines.cpp
 
 HEADERS += \
-    include/mobilisis/calculator_functions.h \
-    include/mobilisis/duration.h \
-    include/mobilisis/payment_opt.h \
-    include/mobilisis/spec_days.h \
-    include/mobilisis/utilities.h \
-    include/mobilisis/configuration.h \
-    include/mobilisis/member_type.h \
-    include/mobilisis/payment_option.h \
-    include/mobilisis/spec_days_worktime.h \
-    include/mobilisis/weekdays.h \
-    include/mobilisis/currency.h \
-    include/mobilisis/payment_method.h \
-    include/mobilisis/payment_rate.h \
-    include/mobilisis/time_range.h \
-    include/mobilisis/weekdays_worktime.h \
-    include/mobilisis/day_of_week.h \
-    include/mobilisis/payment_mtd.h \
-    include/mobilisis/period_year.h \
+	include/mobilisis/calculator_functions.h \
+	include/mobilisis/duration.h \
+	include/mobilisis/payment_opt.h \
+	include/mobilisis/spec_days.h \
+	include/mobilisis/utilities.h \
+	include/mobilisis/configuration.h \
+	include/mobilisis/member_type.h \
+	include/mobilisis/payment_option.h \
+	include/mobilisis/spec_days_worktime.h \
+	include/mobilisis/weekdays.h \
+	include/mobilisis/currency.h \
+	include/mobilisis/payment_method.h \
+	include/mobilisis/payment_rate.h \
+	include/mobilisis/time_range.h \
+	include/mobilisis/weekdays_worktime.h \
+	include/mobilisis/day_of_week.h \
+	include/mobilisis/payment_mtd.h \
+	include/mobilisis/period_year.h \
     include/mobilisis/time_range_header.h \
     include/mobilisis/tariff_cfg.h \
     include/mobilisis/tariff_calc.h \
@@ -89,14 +89,12 @@ HEADERS += \
     include/mobilisis/tariff_interpolation.h \
     include/mobilisis/tariff_prepaid.h \
     include/mobilisis/tariff_carryover.h \
-    include/mobilisis/tariff_prepay.h \
     include/mobilisis/tariff_global_defines.h
 
-# OTHER_FILES += src/main.cpp \
-#    ../tariffs/tariff_korneuburg.json \
-#    ../tariffs/tariff_linsinger_maschinenbau.json \
-#    ../tariffs/tariff_naz.json \
-#    /home/linux/customer_502/etc/psa_tariff/tariff03.json
+OTHER_FILES += src/main.cpp \
+    ../tariffs/tariff_korneuburg.json \
+    ../tariffs/tariff_linsinger_maschinenbau.json \
+    ../tariffs/tariff_naz.json
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin

library/src/calculate_price.cpp

@@ -36,10 +36,11 @@ int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg,
                                                   int paymentOptionIndex) {
     int minTime = 0;
 
+    qCritical() << __func__ << __LINE__ << "permit" << PermitType(permitType).toString();
+
     paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
 
     qCritical() << __func__ << __LINE__ << "paymentOptionIndex" << paymentOptionIndex;
-    qCritical() << __func__ << __LINE__ << "permit" << PermitType(permitType).toString();
 
     switch(permitType) {
     case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
@@ -327,8 +328,6 @@ int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
     case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
         if (paymentMethodId == PaymentMethod::Progressive || paymentMethodId == PaymentMethod::Steps) {
             maxPrice = Utilities::getMaximalParkingPrice(cfg, paymentMethodId);
-        } else if (paymentMethodId == PaymentMethod::Degressive) {
-            maxPrice = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price;
         } else { // PaymentMethod::Linear -> e.g. szeged
             int const key = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
             int const maxTime = cfg->getPaymentOptions(paymentOptionIndex).pop_max_time; // maxTime is given in minutes
@@ -725,9 +724,14 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
     int paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
 
+    QList<int> tlist = Calculator::GetInstance().GetTimeSteps(tariff, paymentOptionIndex);
+    //Q_UNUSED(tlist);
+
     double minMin = tariff->getPaymentOptions(paymentOptionIndex).pop_min_time;
     double maxMin = tariff->getPaymentOptions(paymentOptionIndex).pop_max_time;
 
+    // netto_parking_time = minMin;
+
     // DEBUG
     qCritical() << "compute_price_for_parking_ticket() " << endl
                 << "          paymentOptionIndex: " << paymentOptionIndex << endl
@@ -735,8 +739,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                 << "          netto_parking_time: " << netto_parking_time << endl
                 << "               start + netto: " << start_parking_time.addSecs(netto_parking_time * 60) << endl
                 << "                      minMin: " << minMin << endl
-                << "                      maxMin: " << maxMin
-                << "                     prepaid: " << prepaid
+                << "                      maxMin: " << maxMin << endl
+                << "                     prepaid: " << prepaid << endl
                 << "                  permitType: " << permitType.toString();
 
     if (netto_parking_time < 0) {
@@ -745,14 +749,17 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                                start_parking_time.toString(Qt::ISODate)));
         return calcState.set(CalcState::State::NEGATIVE_PARKING_TIME);
     }
+
     if (netto_parking_time > maxMin) {
         calcState.setDesc(QString("duration=%1, maxMin=%2").arg(netto_parking_time).arg(maxMin));
         return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
     }
+
     if (netto_parking_time < minMin) {
         calcState.setDesc(QString("duration=%1, minMin=%2").arg(netto_parking_time).arg(minMin));
         return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
     }
+
     if (netto_parking_time == 0) {
         return calcState.set(CalcState::State::SUCCESS);
     }
@@ -770,15 +777,12 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                 return calcState;
             }
 
-            QList<int> tlist = Calculator::GetInstance().GetTimeSteps(tariff, paymentOptionIndex, start_parking_time_);
-            Q_UNUSED(tlist);
 
             // compute cost (price)
             cost = Calculator::GetInstance().GetCostFromDuration(tariff, start_parking_time, netto_parking_time, paymentOptionIndex);
 
             int weekDay = start_parking_time.date().dayOfWeek();
             int pop_carry_over_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
-            qCritical() << __func__ << __LINE__ << "configured carry-over-id" << pop_carry_over_option_id;
 
             std::optional<ATBPeriodYear> yperiod = Utilities::GetYearPeriodActive(tariff, start_parking_time);
             if (yperiod.has_value()) {
@@ -807,13 +811,14 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                     } else
                     if (start_parking_time.time() > p.static_start) {   // static_start: e.g. 22:00:00
                         effectiveStartTime.setTime(p.static_start);
+                        effectiveStartTime == effectiveStartTime.addSecs(carryOverDuration * 60);
                     }
                 }
             }
 
             // handle carry over
             int minutesUntilCarryOver = effectiveStartTime.time().secsTo(carryOverStart) / 60;
-            if (netto_parking_time > minutesUntilCarryOver) {
+            if (netto_parking_time >= minutesUntilCarryOver) {
                 int const rest = netto_parking_time - minutesUntilCarryOver;
                 QDateTime s(effectiveStartTime);
                 s = s.addSecs(minutesUntilCarryOver * 60);
@@ -923,15 +928,12 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
     bool const nextDay = false;
 
     // DEBUG
-    // if (DBG_LEVEL >= DBG_DEBUG) {
-        qCritical() << "\ncompute_duration_for_parking_ticket(2):";
-        qCritical() << "                              start time:" << start_parking_time.toString(Qt::ISODate);
-        qCritical() << "                    payment option index:" << paymentOptionIndex;
-        qCritical() << "                                 prepaid:" << prepaid;
-        qCritical() << "                                   price:" << price;
-        qCritical() << "                             permit type:" << permitType.toString() << endl;
-
-    // }
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << "compute_duration_for_parking_ticket(2): ";
+        qCritical() << " payment option index: " << paymentOptionIndex;
+        qCritical() << "              prepaid: " << prepaid;
+        qCritical() << "                price: " << price;
+    }
 
     if (start_parking_time.isValid()) {
         QString cs = start_parking_time.toString(Qt::ISODate);
@@ -1012,10 +1014,9 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
             }
 
             // DEBUG
-            qCritical() << "\ncompute_duration_for_parking_ticket():";
-            qCritical() << "                           start time:" << start_parking_time.toString(Qt::ISODate);
-            qCritical() << "                              endTime:" << endTime;
-            qCritical() << "                        ticketEndTime:" << ticketEndTime.toString(Qt::ISODate) << endl;
+            qCritical() << "compute_duration_for_parking_ticket(): ";
+            qCritical() << "                 endTime: " << endTime;
+            qCritical() << "           ticketEndTime: " << ticketEndTime;
         }
     } else {
         return calcState.set(CalcState::State::INVALID_START_DATE);

library/src/calculator_functions.cpp

@@ -10,12 +10,9 @@
 #include <sstream>
 #include <algorithm>
 #include <optional>
-#include <iterator>
-
 #include <QDateTime>
 #include <QScopedArrayPointer>
 #include <QDebug>
-#include <QTimeZone>
 
 double total_duration_min = 0.0f;
 double total_cost = 0.0f;
@@ -162,8 +159,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
             return CalcState::BELOW_MIN_PARKING_PRICE.toStdString();
         }
 
-        int const pop_time_step_config = cfg->getPaymentOptions(paymentOptionIndex).pop_time_step_config;
-        if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::RECOMPUTE_SOME || prepaid == false) {
+        if (prepaid == false) {
             int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
             int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;
             int const pop_accumulate_durations = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_durations;
@@ -178,9 +174,6 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 
             for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
                 int const pra_price = itr->second.pra_price;
-
-                // qCritical() << DBG_HEADER << "pra_price" << pra_price;
-
                 int const durationId = itr->second.pra_payment_unit_id;
                 if (pop_accumulate_prices) {
                     price += pra_price;
@@ -198,9 +191,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                     ATBDuration duration = search->second;
 
                     if (pop_accumulate_prices) {
-                        int32_t const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
-
-                        // qCritical() << DBG_HEADER << "  duration unit" << durationUnit;
+                        uint32_t const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
 
                         new_price += pra_price;
                         // qCritical() << "(" << __func__ << ":" << __LINE__ << ")  old price" << price << ", new_price:" << new_price;
@@ -353,8 +344,6 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 #if DEBUG_GET_DURATION_FROM_COST==1
                 qCritical() << DBG_HEADER << "(ADAPTED) INPUT-DATE" << inputDate.toString(Qt::ISODate);
 #endif
-                //qCritical() << __func__ << __LINE__;
-
                 // inputDate is now located in a valid operational-working-range
                 // find this working-time-range
                 int pwd_period_day_in_week_id = inputDate.date().dayOfWeek();
@@ -368,8 +357,6 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                     return "";
                 }
 
-                //qCritical() << __func__ << __LINE__;
-
                 QTime current_working_time_from;
                 QTime current_working_time_to;
 
@@ -1027,12 +1014,14 @@ uint32_t Calculator::GetCostFromDuration(Configuration * cfg,
                                          int paymentOptionIndex) const {
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
 
-    //qCritical() << __func__ << __LINE__ << "paymentOptionIndex" << paymentOptionIndex;
+    // qCritical() << __func__ << __LINE__ << "paymentOptionIndex" << paymentOptionIndex;
 
     if (paymentMethodId == PaymentMethod::Steps ||
         paymentMethodId == PaymentMethod::Degressive) {
         int const timeStepInMinutes = start.secsTo(end) / 60;
         QList<int> tlist = Calculator::GetInstance().GetTimeSteps(cfg, paymentOptionIndex, start);
+        qCritical() << DBG_HEADER << "       start" << start.toString(Qt::ISODate);
+        qCritical() << DBG_HEADER << "         end" << end.toString(Qt::ISODate);
         qCritical() << DBG_HEADER << "timeStepList" << timeStepInMinutes << tlist;
         qCritical() << DBG_HEADER << "timeStepInMinutes" << timeStepInMinutes << start.toString(Qt::ISODate);
 
@@ -2541,10 +2530,10 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                             }
                         }
                     } else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
-                        //if (DBG_LEVEL >= DBG_DEBUG) {
+                        if (DBG_LEVEL >= DBG_DEBUG) {
                             qCritical() << "(" << __func__ << ":" << __LINE__ << ")        carry over time range from:" << carryOverTimeRangeFrom.toString(Qt::ISODate);
                             qCritical() << "(" << __func__ << ":" << __LINE__ << ")          carry over time range to:" << carryOverTimeRangeTo.toString(Qt::ISODate);
-                        //}
+                        }
 
                         m_timeSteps[paymentOptionIndex].clear();
 
@@ -2568,7 +2557,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                 qCritical() << "(" << __func__ << ":" << __LINE__ << ")             interpolation end:" << interpolationEnd.toString(Qt::ISODate);
                             }
                         } else {
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
+                            // qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
                         }
 
                         // int const start_time = start.time().hour() * 60 + start.time().minute();
@@ -2596,7 +2585,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                         for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
                             int const durationId = itr->second.pra_payment_unit_id;
 
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  durationId" << durationId;
+                            // qCritical() << "(" << __func__ << ":" << __LINE__ << ")  durationId" << durationId;
                             // int const price = itr->second.pra_price;
 
                             auto search = cfg->Duration.find(durationId);
@@ -2620,7 +2609,8 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                     ATBInterpolation interpolation = ipolCheck.value();
 
                                     if (duration.pun_interpolation_id == (int)ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE) {
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")  HIER NICHT";
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")     payment option id:" << pop_id;
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  pun_intnerpolation_id:" << duration.pun_interpolation_id;
 
                                         interpolation.dynamic_start = start.time();
                                         interpolation.dynamic_start.setHMS(start.time().hour(), start.time().minute(), 0);
@@ -2675,6 +2665,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                     if (duration.pun_interpolation_id == (int)ATBInterpolation::NO_INTERPOLATION) {
 
                                         //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                            pun_id:" << duration.pun_id;
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")              paymentOptionIndex:" << paymentOptionIndex;
                                         //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                      pun duration:" << duration.pun_duration;
                                         //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
                                         //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (2):" << runtimeInMinutes;
@@ -2687,6 +2678,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                                     m_timeSteps[paymentOptionIndex] << duration.pun_duration;
                                                     search->second = duration;
                                                     cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = runtimeInMinutes;
+                                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")       pop_min_time" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
                                                     continue;
                                                 }
                                             }
@@ -2763,7 +2755,6 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                         m_timeSteps[paymentOptionIndex] << duration.pun_duration;
                                         search->second = duration;
                                     } else {
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")  HIER NICHT";
                                         cfg->Duration.erase(search);
                                     }
                                 }
@@ -2779,243 +2770,6 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                  qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
             }
         }
-    } else
-    if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::RECOMPUTE_SOME) {
-        // some durations / timesteps have to be recomputed
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") payment option time step config:" << "TimeStepConfig::RECOMPUTE_SOME";
-        int size = m_timeSteps.size();
-
-        while (size <= paymentOptionIndex) {
-            m_timeSteps.push_back(QList<int>());
-            size = m_timeSteps.size();
-        }
-
-        int const pop_accumulate_durations = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_durations;
-
-        m_timeSteps[paymentOptionIndex].clear();
-
-        QDateTime const start(s.date(),
-                              QTime(s.time().hour(), s.time().minute(), 0),
-                              s.timeZone());
-
-        if (DBG_LEVEL >= DBG_DEBUG) {
-            qCritical() << "(" << __func__ << ":" << __LINE__ << ") start:" << start.toString(Qt::ISODate);
-        }
-
-        QDateTime current(start);
-
-        bool casePrepay = false;
-        int const weekDay = start.date().dayOfWeek();
-
-        int const pop_prepay_option_id = cfg->getPaymentOptions(paymentOptionIndex).pop_prepay_option_id;
-
-        // compute prepay settings
-        // assumption: prepay settings the same for all days
-        QDateTime prepayStart(start);
-        QDateTime prepayEnd(start);
-
-        prepayStart.setTime(cfg->TariffPrepayOptions.find(pop_prepay_option_id)->second.prepay[weekDay].start);
-        prepayEnd.setTime(cfg->TariffPrepayOptions.find(pop_prepay_option_id)->second.prepay[weekDay].end);
-
-        if (start <= prepayEnd) {
-            prepayStart = prepayStart.addDays(-1);
-        } else {
-            prepayEnd = prepayEnd.addDays(1);
-        }
-
-        if (DBG_LEVEL >= DBG_DEBUG) {
-            qCritical() << "(" << __func__ << ":" << __LINE__ << ") prepay start" << prepayStart.toString(Qt::ISODate);
-            qCritical() << "(" << __func__ << ":" << __LINE__ << ")   prepay end" << prepayEnd.toString(Qt::ISODate);
-        }
-
-        int const prepayDurationInMinutes = start.secsTo(prepayEnd) / 60;
-
-        // compute carryover settings
-        // assumption: carryover settings the same for all days
-        int const pop_carry_over_option_id = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
-        QDateTime carryOverStart(start);
-        QDateTime carryOverEnd(start);
-
-        carryOverStart.setTime(cfg->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start);
-        carryOverEnd.setTime(cfg->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_end);
-
-        if (start <= carryOverEnd) {
-            carryOverStart = carryOverStart.addDays(-1);
-        } else {
-            carryOverEnd = carryOverEnd.addDays(1);
-        }
-
-        if (DBG_LEVEL >= DBG_DEBUG) {
-            qCritical() << "(" << __func__ << ":" << __LINE__ << ") carry over start" << carryOverStart.toString(Qt::ISODate);
-            qCritical() << "(" << __func__ << ":" << __LINE__ << ")   carry over end" << carryOverEnd.toString(Qt::ISODate);
-        }
-
-        // int cnt = 0;
-
-        for (Configuration::TariffDurationType::iterator it = cfg->Duration.begin();
-             it != cfg->Duration.end();
-             ++it) {
-            it->second.pun_duration = it->second.pun_duration_saved;
-
-            // if (++cnt > 2) continue;
-
-            if (DBG_LEVEL >= DBG_DEBUG) {
-                qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << it->second.pun_id;
-            }
-
-            if (it->second.pun_mutable) {
-                if (it->second.pun_netto) {
-                    if (it->second.pun_round_to_next_24h_boundary == false) {
-                        //int weekDay = start.date().dayOfWeek();
-                        if (m_timeSteps[paymentOptionIndex].isEmpty()) {
-                            // handle possible prepay-condition, which applies only
-                            // for the very first step
-
-                            if (DBG_LEVEL >= DBG_DEBUG) {
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ") prepay start" << prepayStart.toString(Qt::ISODate);
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")   prepay end" << prepayEnd.toString(Qt::ISODate);
-                            }
-
-                            if (prepayStart <= start && start <= prepayEnd) {
-                                it->second.pun_duration = prepayDurationInMinutes;
-                                it->second.pun_duration += it->second.pun_duration_saved ;
-                                casePrepay = true;
-                            }
-
-                            if (DBG_LEVEL >= DBG_DEBUG) {
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << it->second.pun_duration;
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ") prepay" << casePrepay;
-                            }
-                        }
-
-                        if (!casePrepay) {
-                            // handle possible carryover-condition
-
-                            int const durationInSecs = it->second.pun_duration_saved * 60;
-                            it->second.pun_duration = it->second.pun_duration_saved;
-
-                            if (current >= carryOverStart && current < carryOverEnd) {
-                                it->second.pun_duration += current.secsTo(carryOverEnd) / 60;
-                            } else {
-                                // start < carryOverStart
-                                QDateTime const &newCurrent = current.addSecs(durationInSecs);
-                                if (newCurrent > carryOverStart && newCurrent <= carryOverEnd) {
-                                    // cross carry over section
-                                    it->second.pun_next_step_correction = carryOverStart.secsTo(carryOverEnd) / 60;
-                                    it->second.pun_duration += it->second.pun_next_step_correction;
-                                }
-                            }
-
-                        } else {
-                            // qCritical() << "(" << __func__ << ":" << __LINE__ << ")";
-                        }
-
-                        if (pop_accumulate_durations) {
-                            m_timeSteps[paymentOptionIndex] << it->second.pun_duration;
-                        } else {
-                            if (!m_timeSteps[paymentOptionIndex].isEmpty()) {
-                                int d = m_timeSteps[paymentOptionIndex].last();
-                                m_timeSteps[paymentOptionIndex] << (d + it->second.pun_duration);
-                            }
-                        }
-
-                        current = current.addSecs(m_timeSteps[paymentOptionIndex].last() * 60);
-
-                        if (DBG_LEVEL >= DBG_DEBUG) {
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << m_timeSteps[paymentOptionIndex];
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") current" << current.toString(Qt::ISODate);
-                        }
-
-                    } else { // if (it->pun_round_to_next_24h_boundary == false) {
-                        if (DBG_LEVEL >= DBG_DEBUG) {
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") round-to-next-24h-boundary";
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") prepay" << casePrepay;
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") current" << current.toString(Qt::ISODate);
-                        }
-
-                        if (casePrepay) {
-                            // the last time step contains the (dynamic) prepay duration
-                            // so it is possible to compute the last duration
-                            int lastDuration =  m_timeSteps[paymentOptionIndex].last() - prepayDurationInMinutes;
-                            // qCritical() << "(" << __func__ << ":" << __LINE__ << ") last duration " << lastDuration;
-
-                            int const minutesToAdd = 1440 - lastDuration;
-                            current = current.addSecs(minutesToAdd * 60);
-
-                            if (DBG_LEVEL >= DBG_DEBUG) {
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ") minutes to add " << minutesToAdd;
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ") current" << current.toString(Qt::ISODate);
-                            }
-
-                            if (pop_accumulate_durations) {
-                                m_timeSteps[paymentOptionIndex] << minutesToAdd;
-                            } else {
-                                if (!m_timeSteps[paymentOptionIndex].isEmpty()) {
-                                    int d = m_timeSteps[paymentOptionIndex].last();
-                                    m_timeSteps[paymentOptionIndex] << (d + minutesToAdd);
-                                }
-                            }
-
-                            // qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << m_timeSteps[paymentOptionIndex];
-
-                            casePrepay = false;
-
-                        } else {
-                            if (DBG_LEVEL >= DBG_DEBUG) {
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << it->second.pun_id;
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ") current" << current.toString(Qt::ISODate);
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_duration" << it->second.pun_duration;
-                            }
-
-                            int secs = s.secsTo(current);
-                            int const dayInSecs = 1440 * 60;
-                            int const rest = secs % dayInSecs;
-                            int const minutesToAdd = (dayInSecs - rest) / 60;
-
-                            current = current.addSecs(minutesToAdd * 60);
-                            it->second.pun_duration = minutesToAdd;
-
-                            if (DBG_LEVEL >= DBG_DEBUG) {
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ") minutes to add " << minutesToAdd;
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ") current" << current.toString(Qt::ISODate);
-                            }
-
-                            if (pop_accumulate_durations) {
-                                m_timeSteps[paymentOptionIndex] << minutesToAdd;
-                            } else {
-                                if (!m_timeSteps[paymentOptionIndex].isEmpty()) {
-                                    int d = m_timeSteps[paymentOptionIndex].last();
-                                    m_timeSteps[paymentOptionIndex] << (d + minutesToAdd);
-                                }
-                            }
-                            // qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << m_timeSteps[paymentOptionIndex];
-                        }
-                    }
-
-                } else { // if (it->second.pun_netto) {
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")\n" << it->second;
-                }
-            } else { // mutable == false
-                if (it->second.pun_brutto) {    // no handling for prepay and carry-over
-                    if (pop_accumulate_durations) {
-                        m_timeSteps[paymentOptionIndex] << it->second.pun_duration;
-                    } else {
-                        if (!m_timeSteps[paymentOptionIndex].isEmpty()) {
-                            int d = m_timeSteps[paymentOptionIndex].last();
-                            m_timeSteps[paymentOptionIndex] << (d + it->second.pun_duration);
-                        }
-                    }
-
-                    // qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << m_timeSteps[paymentOptionIndex];
-
-                } else {
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")\n" << it->second;
-                }
-            }
-        }
-
     } else {
         qCritical() << "(" << __func__ << ":" << __LINE__ << ") payment option time step config:" << "TimeStepConfig::STATIC";
 
@@ -3034,12 +2788,13 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
         }
     }
 
-    //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                   NEW timeSteps:" << m_timeSteps;
+    // qCritical() << "(" << __func__ << ":" << __LINE__ << ")                   NEW timeSteps:" << m_timeSteps;
 
     if (DBG_LEVEL >= DBG_DEBUG) {
-        QDateTime nextTime(s);
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") start" << nextTime.toString(Qt::ISODate);
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                   NEW timeSteps:" << m_timeSteps;
+
         for (int i = 0; i < m_timeSteps[paymentOptionIndex].size(); ++i) {
+            QDateTime nextTime = s;
             // nextTime.setTime(QTime(0, 0, 0));
             int const secs = m_timeSteps[paymentOptionIndex][i] * 60;
             nextTime = nextTime.addSecs(secs);
@@ -3066,9 +2821,13 @@ uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int p
     uint32_t price = 0;
     int pun_duration = 0;
 
-    //qCritical() << "(" << __func__ << ":" << __LINE__ << ") paymentOptionIndex" << paymentOptionIndex;
-    //qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
-    //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id" << pop_id;
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") paymentOptionIndex" << paymentOptionIndex;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id" << pop_id;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_accumulate_prices" << pop_accumulate_prices;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_accumulate_durations" << pop_accumulate_durations;
+    }
 
     for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
     {
@@ -3093,6 +2852,7 @@ uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int p
         }
 
         if (DBG_LEVEL >= DBG_DEBUG) {
+            qCritical() << "(" << __func__ << ":" << __LINE__ << ")";
             qCritical() << "(" << __func__ << ":" << __LINE__ << ") price" << price;
             qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
             qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_unit_id" << payment_unit_id;

library/src/configuration.cpp

@@ -7,7 +7,6 @@
 #include "tariff_business_hours.h"
 #include "tariff_global_defines.h"
 #include "tariff_carryover.h"
-#include "tariff_prepay.h"
 #include "tariff_global_defines.h"
 
 #include <QString>
@@ -36,7 +35,6 @@ MemberType Configuration::IdentifyJsonMember(const char* member_name)
     if (strcmp(member_name, "Interpolation") == 0) return MemberType::InterpolationType;
     if (strcmp(member_name, "Prepaid") == 0) return MemberType::PrepaidType;
     if (strcmp(member_name, "CarryOver") == 0) return MemberType::CarryOverType;
-    if (strcmp(member_name, "PrepaidOption") == 0) return MemberType::PrepaidOptionType;
     else return MemberType::UnknownType;
 }
 
@@ -110,7 +108,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
             ATBInterpolation TariffInterpolation;
             ATBPrepaid TariffPrepaidOption;
             ATBCarryOver TariffCarryOver;
-            ATBPrepay TariffPrepayOption;
 
             MemberType mb_type = MemberType::UnknownType;
             this->currentPaymentOptions.clear();
@@ -144,7 +141,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                 continue;
             }
 
-            // qCritical() << " -" << mb_name;
+            qCritical() << " -" << mb_name;
 
             // Get array for each JSON object member
             auto mb_array = document[mb_name].GetArray();
@@ -174,61 +171,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                     {
                     case MemberType::UnknownType:
                         break;
-                    case MemberType::PrepaidOptionType: {
-                        if (QString(inner_obj_name) == QString("prepaid_option_id")) {
-                            if (k->value.IsInt()) {
-                                int const &x = k->value.GetInt();
-                                TariffPrepayOption.id = x;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("prepaid_option_week")) {
-                            if (k->value.IsArray()) {
-                                auto days = k->value.GetArray();
-                                for (rapidjson::SizeType j=0; j < days.Size(); ++j) {
-                                    if (days[j].IsObject()) {
-                                        auto weekday = days[j].GetObject();
-                                        for (auto w = weekday.MemberBegin(); w != weekday.MemberEnd(); ++w) {
-                                            int day = j+1; // 8 entries
-                                            QString member(QString::fromStdString(w->name.GetString()));
-                                            if (member == "prepaid_option_day") {
-                                                if (w->value.IsInt()) {
-                                                    rapidjson::SizeType const d = w->value.GetInt();
-                                                    if (d != (j+1)) {
-                                                        qCritical() << "ERROR: misconfigured jsonfile" << d << "!=" << (j+1);
-                                                    }
-                                                    TariffPrepayOption.prepay[day].day = day;
-                                                }
-                                            } else
-                                            if (member == "prepaid_option_duration") {
-                                                if (w->value.IsInt()) {
-                                                    TariffPrepayOption.prepay[day].duration = w->value.GetInt();
-                                                }
-                                            } else
-                                            if (member == "prepaid_option_prepaid") {
-                                                if (w->value.IsBool()) {
-                                                    bool b = w->value.GetBool();
-                                                    TariffPrepayOption.prepay[day].prepaid = b;
-                                                }
-                                            } else
-                                            if (member == "prepaid_option_start") {
-                                                if (w->value.IsString()) {
-                                                    QTime const &t = QTime::fromString(w->value.GetString(), Qt::ISODate);
-                                                    TariffPrepayOption.prepay[day].start = t;
-                                                }
-                                            } else
-                                            if (member == "prepaid_option_end") {
-                                                if (w->value.IsString()) {
-                                                    QTime const &t = QTime::fromString(w->value.GetString(), Qt::ISODate);
-                                                    TariffPrepayOption.prepay[day].end = t;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-
-                        }
-                    } break;
                     case MemberType::CarryOverType: {
                         if (QString(inner_obj_name) == QString("carry_over_id")) {
                             if (k->value.IsInt()) {
@@ -289,7 +231,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                             }
                         }
                     } break;
-                    // deprecated
                     case MemberType::PrepaidType: {
                         if (QString(inner_obj_name) == QString("prepaid_id")) {
                             if (k->value.IsInt()) {
@@ -681,10 +622,8 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                             this->currentPaymentOptions.last().pop_max_time = k->value.GetDouble();
                         } else if (strcmp(inner_obj_name, "pop_min_price") == 0) {
                             this->currentPaymentOptions.last().pop_min_price = k->value.GetDouble();
-                        } else if (strcmp(inner_obj_name, "pop_prepaid_option_id") == 0) { // deprecated
+                        } else if (strcmp(inner_obj_name, "pop_prepaid_option_id") == 0) {
                             this->currentPaymentOptions.last().pop_prepaid_option_id = k->value.GetInt();
-                        } else if (strcmp(inner_obj_name, "pop_prepay_option_id") == 0) {
-                            this->currentPaymentOptions.last().pop_prepay_option_id = k->value.GetInt();
                         } else if (strcmp(inner_obj_name, "pop_truncate_last_interpolation_step") == 0) {
                             this->currentPaymentOptions.last().pop_truncate_last_interpolation_step = k->value.GetBool();
                         } else if (strcmp(inner_obj_name, "pop_accumulate_prices") == 0) {
@@ -782,42 +721,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                         } else if (strcmp(inner_obj_name, "pun_duration_min") == 0) Duration.pun_duration_min = k->value.GetInt();
                         else if (strcmp(inner_obj_name, "pun_duration_max") == 0) Duration.pun_duration_max = k->value.GetInt();
                         else if (strcmp(inner_obj_name, "pun_interpolation_id") == 0) Duration.pun_interpolation_id = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pun_netto") == 0) {
-                            if (k->value.IsBool()) {
-                                Duration.pun_netto = k->value.GetBool();
-                            }
-                        }
-                        else if (strcmp(inner_obj_name, "pun_brutto") == 0) {
-                            if (k->value.IsBool()) {
-                                Duration.pun_brutto = k->value.GetBool();
-                            }
-                        }
-                        else if (strcmp(inner_obj_name, "pun_fixed") == 0) {
-                            if (k->value.IsBool()) {
-                                Duration.pun_fixed = k->value.GetBool();
-                            }
-                        }
-                        else if (strcmp(inner_obj_name, "pun_mutable") == 0) {
-                            if (k->value.IsBool()) {
-                                Duration.pun_mutable = k->value.GetBool();
-                            }
-                        }
-                        else if (strcmp(inner_obj_name, "pun_round_to_next_24h_boundary") == 0) {
-                            if (k->value.IsBool()) {
-                                Duration.pun_round_to_next_24h_boundary = k->value.GetBool();
-                            }
-                        }
-                        else if (strcmp(inner_obj_name, "pun_round_to_prev_24h_boundary") == 0) {
-                            if (k->value.IsBool()) {
-                                Duration.pun_round_to_prev_24h_boundary = k->value.GetBool();
-                            }
-                        }
-                        else if (strcmp(inner_obj_name, "pun_align_with_timepoint") == 0) {
-                            if (k->value.IsString()) {
-                                QDateTime const &dt = QDateTime::fromString(k->value.GetString(), Qt::ISODate);
-                                Duration.pun_align_with_timepoint = dt;
-                            }
-                        }
                         break;
                      case MemberType::SpecialDaysWorktimeType:
                         if (strcmp(inner_obj_name, "pedwt_id") == 0) SpecialDaysWorktime.pedwt_id = k->value.GetInt();
@@ -882,7 +785,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                 } break;
                 case MemberType::DurationType:
                     cfg->Duration.insert(pair<int, ATBDuration>(Duration.pun_id, Duration));
-                    //qCritical() << Duration;
+                    // qCritical() << Duration;
                     break;
                 case MemberType::SpecialDaysWorktimeType:
                     cfg->SpecialDaysWorktime.insert(pair<int, ATBSpecialDaysWorktime>(SpecialDaysWorktime.pedwt_period_exc_day_id, SpecialDaysWorktime));
@@ -936,10 +839,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                     cfg->TariffCarryOverOptions.insert(pair<int, ATBCarryOver>(TariffCarryOver.id, TariffCarryOver));
                     // qCritical() << TariffCarryOver;
                     break;
-                case MemberType::PrepaidOptionType:
-                    cfg->TariffPrepayOptions.insert(pair<int, ATBPrepay>(TariffPrepayOption.id, TariffPrepayOption));
-                    //qCritical() << TariffPrepayOption;
-                    break;
                 default:
                      break;
                 }

main/main.cpp

@@ -49,9 +49,9 @@ extern "C" char* strptime(const char* s,
 #define NEUHAUSER_STOCKERAU                     (0)
 #define KLEIPEDA_LITAUEN                        (0)
 #define SEXTEN                                  (0)
-#define SCHNALS_LEITER_KIRCHL                   (0)
+#define SCHNALS_LEITER_KIRCHL                   (1)
 #define SCHNALS_STAUMAUER                       (SCHNALS_LEITER_KIRCHL)
-#define VALSER_ALM                              (1)
+#define VALSER_ALM                              (0)
 
 #if NEUHAUSER_KIRCHDORF==1
 static bool test_neuhauser_kirchdorf(int step, double cost) {
@@ -575,8 +575,8 @@ int main() {
     int pop_max_price;
     int pop_daily_card_price;
 
-    //input.open("/home/linux/customer_505/etc/psa_tariff/tariff01.json");
-    input.open("/opt/ptu5/opt/customer_505/etc/psa_tariff/tariff01.json");
+    input.open("/home/linux/customer_505/etc/psa_tariff/tariff01.json");
+    //input.open("/opt/ptu5/opt/customer_505/etc/psa_tariff/tariff01.json");
 
     std::stringstream sstr;
     while(input >> sstr.rdbuf());
@@ -588,10 +588,13 @@ int main() {
     cout << endl;
 
     if (isParsed) {
-        pop_min_time = get_minimal_parkingtime(&cfg);
-        pop_max_time = get_maximal_parkingtime(&cfg);
-        pop_min_price = get_minimal_parkingprice(&cfg);
-        pop_max_price = get_maximal_parkingprice(&cfg);
+        //PermitType permitType(PERMIT_TYPE::SHORT_TERM_PARKING);
+        PermitType permitType(PERMIT_TYPE::DAY_TICKET_PKW);
+
+        pop_min_time = get_minimal_parkingtime(&cfg, permitType);
+        pop_max_time = get_maximal_parkingtime(&cfg, permitType);
+        pop_min_price = get_minimal_parkingprice(&cfg, permitType);
+        pop_max_price = get_maximal_parkingprice(&cfg, permitType);
         pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
 
         qCritical() << "        pop_min_time: " << pop_min_time;
@@ -649,10 +652,10 @@ int main() {
             }
 
             //for (int minutes = 0; minutes < 1440; ++minutes) {
-            for (int minutes = 1020; minutes <= 1020; minutes += 1) {
+            for (int minutes = 480; minutes <= 480; minutes += 1) {
                 QDateTime start = s.addSecs(minutes * 60);
 
-                qCritical() << "start" << start.toString(Qt::ISODate);
+                // qCritical() << "start" << start.toString(Qt::ISODate);
 
                 QDateTime effectiveStart = start;
 
@@ -669,8 +672,7 @@ int main() {
                 }
 
 #if 0
-                PermitType permitType(PERMIT_TYPE::SHORT_TERM_PARKING);
-                for (int i = 200; i <= 200; i += 10) {
+                for (int i = 700; i <= 1400; i += 700) {
                     cost = i;
 
                     if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, permitType))) {      // return value
@@ -682,38 +684,20 @@ int main() {
 //                        qCritical() << cs.toString();
                     }
 
-                    qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
-                                << "> end" << end.toString(Qt::ISODate);
+                    //qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
+                    //            << "> end" << end.toString(Qt::ISODate);
 
                 }
 #else
-                for (int i = 700; i <= 1400; i += 700) {
-                //for (int i = 2100; i <= 2100; i += 10) {
-                    cost = i;
-
-                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW)))) {      // return value
-                    }
-
-                    if (!cs) {
-                        qCritical() << "ERROR CalcState" << cs.toString() << endl;
-                    } else {
-//                        qCritical() << cs.toString();
-                    }
-
-                    qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
-                                << "> end" << end.toString(Qt::ISODate);
-                }
-#endif
-#if 0
 
                 start = QDateTime::currentDateTime();
-                start.setTime(QTime(9, 57, 0));
+                //start.setTime(QTime(9, 57, 0));
 
-                for (int i = 66; i <= 66; i += 6) {
+                for (int netto_parking_time = 60; netto_parking_time <= 60; netto_parking_time += 60) {
 
                     QDateTime end;
                     struct price_t price;
-                    cs = compute_price_for_parking_ticket(&cfg, start, i, end, &price);
+                    cs = compute_price_for_parking_ticket(&cfg, start, netto_parking_time, end, &price, permitType, true);
 
                     qCritical() << "start" << start.toString(Qt::ISODate) << "end" << end.toString(Qt::ISODate)
                                 << "price" << price.netto;
@@ -741,14 +725,7 @@ int main() {
         input.open("/opt/ptu5/opt/customer_502/etc/psa_tariff/tariff02.json");
     }
     if (zone == 3) {
-        //input.open("/opt/ptu5/opt/customer_502/etc/psa_tariff/tariff03.json");
-        //input.open("/home/linux/customer_502/etc/psa_tariff/tariff01.json");
-
-        // schnals
-        // input.open("/opt/ptu5/opt/customer_505/etc/psa_tariff/tariff01.json");
-
-        // muehlbach
-        input.open("/opt/ptu5/opt/customer_504/etc/psa_tariff/tariff01.json");
+        input.open("/opt/ptu5/opt/customer_502/etc/psa_tariff/tariff03.json");
     }
 
     std::stringstream sstr;
@@ -907,7 +884,7 @@ int main() {
             int Down = 0;
             int Up = 1;
 
-            QDateTime start = QDateTime::currentDateTime();
+            QDateTime const start = QDateTime::currentDateTime();
             int paymentOptionIndex = cfg.getPaymentOptionIndex(PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
 
             if (paymentOptionIndex != 0) {
@@ -920,61 +897,17 @@ int main() {
             //QSet<uint32_t> const prices2{500, 1600, 2400, 3200, 4000, 4800, 5600};
 
             QDateTime end;
-
-            QDateTime s(QDateTime::currentDateTime());
-            s.setTime(QTime(10, 0, 0));
-
-#if 0
-
-            pop_min_time = get_minimal_parkingtime(&cfg, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING), paymentOptionIndex);
-            pop_max_time = get_maximal_parkingtime(&cfg, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING), paymentOptionIndex);
-
-            pop_min_price = get_minimal_parkingprice(&cfg, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING), paymentOptionIndex, s);
-            pop_max_price = get_maximal_parkingprice(&cfg, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING), paymentOptionIndex);
-
-            pop_daily_card_price = cfg.getPaymentOptions(paymentOptionIndex).pop_daily_card_price;
-
-            int h = pop_min_time / 60;
-            int m = pop_min_time % 60;
-            qCritical().noquote() << QString("         pop_min_time %1 (%2h, %3m)").arg(pop_min_time).arg(h).arg(m);
-
-            h = pop_max_time / 60;
-            m = pop_max_time % 60;
-            qCritical().noquote()
-               << QString("         pop_max_time %1 (%2h, %3m)").arg(pop_max_time).arg(h).arg(m);
-
-            qCritical() << "       pop_min_price " << pop_min_price;
-            qCritical() << "       pop_max_price " << pop_max_price;
-            qCritical() << "pop_daily_card_price " << pop_daily_card_price;
-#endif
             CalcState calcState;
 
-#if 1
-            qCritical() << "start" << s.toString(Qt::ISODate);
-            //for (int i = 1; i < 11; ++i) {
-            for (int i = 0; i < 21; ++i) {
-                calcState = compute_duration_for_parking_ticket(&cfg, s,
-                                                    (double)i*10,
-                                                    end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
-                qCritical() << "RUN" << i << ": start" << s.toString(Qt::ISODate)
-                            << ": price" << i*10 << "->" << end.toString(Qt::ISODate) << calcState.toString();
-            }
-#else
-            struct price_t price;
-            int netto_parking_time = 1440;
+            QDateTime s(QDateTime::currentDateTime());
+            s.setTime(QTime(12, 0, 0));
 
-            start = s;
-            qCritical() << "RUN" << 0 << ": start" << s.toString(Qt::ISODate);
-
-            calcState = compute_price_for_parking_ticket(&cfg, start, netto_parking_time,
-                                                         end, &price,
-                                                         PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
-            qCritical() << "RUN" << 0 << ": start" << start.toString(Qt::ISODate)
-                        << ": price for netto-time" << netto_parking_time
-                        << "->" << price.netto << "->" << end.toString(Qt::ISODate) << calcState.toString();
-#endif
+            int minimal_parking_price = get_minimal_parkingprice(&cfg,
+                                                                 PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW),
+                                                                 paymentOptionIndex, s);
 
 #if 0
+            qCritical() << "minimal parking price" << minimal_parking_price;
 
             for (int i = 0; i < 8; ++i) {
                 calcState = compute_duration_for_parking_ticket(&cfg, s,
@@ -983,11 +916,11 @@ int main() {
                 qCritical() << "RUN" << i << end.toString(Qt::ISODate) << calcState.toString();
             }
 
-// #else
-            s.setTime(QTime(12, 0, 0));
+#else
+            s.setTime(QTime(15, 0, 0));
 
             minimal_parking_price = get_minimal_parkingprice(&cfg,
-                                                             PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_BUS),
+                                                             PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW),
                                                              paymentOptionIndex, s);
 
             qCritical() << "minimal parking price" << minimal_parking_price;
@@ -995,7 +928,7 @@ int main() {
             for (int i = 0; i < 8; ++i) {
                 calcState = compute_duration_for_parking_ticket(&cfg, s,
                                                     (double)minimal_parking_price + i*800,
-                                                    end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_BUS));
+                                                    end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
                 qCritical() << "RUN" << i << end.toString(Qt::ISODate) << calcState.toString();
             }
 #endif