updated some tests

Removed exit(0)-call which was used for testing.

library/include/mobilisis/calculate_price.h

@@ -197,11 +197,11 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
 
 QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg);
 
-int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration *cfg,
+int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg,
                                                   PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING,
                                                   int paymentOptionIndex=0);
 
-int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration *cfg,
+int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
                                                   PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING,
                                                   int paymentOptionIndex=0);
 

library/include/mobilisis/configuration.h

@@ -38,6 +38,9 @@ class Configuration
 public:
     using SpecialDaysType = std::multimap<int, ATBSpecialDays>;
     using SpecialDaysWorktimeType = std::multimap<int, ATBSpecialDaysWorktime>;
+    using TimeRangeType = std::multimap<int, ATBTimeRange>;
+    using TariffProductType = std::multimap<int, ATBTariffProduct>;
+    using ATBPaymentOptionType = std::multimap<int, ATBPaymentOption>;
 
     ATBProject project;
     ATBCurrency Currency;
@@ -51,13 +54,13 @@ public:
 	multimap<int, ATBWeekDays> WeekDays;
 	multimap<int, ATBPeriodYear> YearPeriod;
 	multimap<int, ATBWeekDaysWorktime> WeekDaysWorktime;
-	multimap<int, ATBPaymentOption> PaymentOption;
+    ATBPaymentOptionType PaymentOption;
     multimap<int, ATBDailyTicket> DailyTicket;
-    multimap<int, ATBTimeRange> TimeRange;
+    TimeRangeType TimeRange;
     multimap<int, ATBTimeStepConfig> TimeStepConfig;
     multimap<int, ATBTimeBase> TimeBase;
     multimap<int, ATBCustomer> Customer;
-    multimap<int, ATBTariffProduct> TariffProduct;
+    TariffProductType TariffProduct;
 
 	/// <summary>
 	/// Parse JSON string
@@ -85,6 +88,7 @@ public:
     std::optional<QVector<ATBTariffProduct>> getTariffProductForAllKeys() const;
     std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(int id) const;
     std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(PermitType permitType) const;
+    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductTypeName(QString const &permitTypeName) const;
     std::optional<ATBCustomer> getCustomerForType(ATBCustomer::CustomerType customerType);
     std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
 

library/include/mobilisis/payment_opt.h

@@ -5,6 +5,8 @@
 #include <string>
 #include <cinttypes>
 
+#include <QDateTime>
+
 class ATBPaymentOption
 {
 public:
@@ -47,6 +49,14 @@ public:
     int pop_daily_card_price;
     uint64_t pop_business_hours;
     int pop_time_step_config;
+
+    struct ATBMaxDateTime {
+        int direction;
+        uint8_t week;
+        uint8_t day;
+        QTime time;
+    } pop_min_date_time,
+      pop_max_date_time;
 };
 
 #endif // PAYMENT_OPT_H_INCLUDED

library/include/mobilisis/tariff_business_hours.h

@@ -8,21 +8,24 @@
 
 #include <Qt>
 
-#define _NO_RESTRICTION_24_7_           (uint64_t)(0ULL)
-#define _MON_                           (uint64_t)(1ULL << 8)
-#define _TUE_                           (uint64_t)(1ULL << 9)
-#define _WED_                           (uint64_t)(1ULL << 10)
-#define _THU_                           (uint64_t)(1ULL << 11)
-#define _FRI_                           (uint64_t)(1ULL << 12)
-#define _SAT_                           (uint64_t)(1ULL << 13)
-#define _SUN_                           (uint64_t)(1ULL << 14)
-#define _WEEK_DAYS_                     ((_MON_|_TUE_|_WED_|_THU_|_FRI_))
-#define _WORKING_DAYS_                  ((_MON_|_TUE_|_WED_|_THU_|_FRI_|_SAT_))
-#define _ALL_DAYS_                      ((_MON_|_TUE_|_WED_|_THU_|_FRI_|_SAT_|_SUN_))
-#define _OFFICIAL_HOLIDAY_              (uint64_t)(1ULL << 15)
-#define _ONLY_WEEKEND_                  ((_SAT_|_SUN_))
-#define _ONLY_OPEN_FOR_BUSINESS_DAYS_   (uint64_t)(1ULL << 16)    /* verkaufsoffen */
-#define _NOT_DEFINED_                   (uint64_t)(~0ULL)
+#define _NO_RESTRICTION_24_7_               (uint64_t)(0ULL)
+#define _MON_                               (uint64_t)(1ULL << 8)
+#define _TUE_                               (uint64_t)(1ULL << 9)
+#define _WED_                               (uint64_t)(1ULL << 10)
+#define _THU_                               (uint64_t)(1ULL << 11)
+#define _FRI_                               (uint64_t)(1ULL << 12)
+#define _SAT_                               (uint64_t)(1ULL << 13)
+#define _SUN_                               (uint64_t)(1ULL << 14)
+#define _WEEK_DAYS_                         ((_MON_|_TUE_|_WED_|_THU_|_FRI_))
+#define _WORKING_DAYS_                      ((_MON_|_TUE_|_WED_|_THU_|_FRI_|_SAT_))
+#define _ALL_DAYS_                          ((_MON_|_TUE_|_WED_|_THU_|_FRI_|_SAT_|_SUN_))
+#define _OFFICIAL_HOLIDAY_                  (uint64_t)(1ULL << 15)
+#define _ONLY_WEEKEND_                      ((_SAT_|_SUN_))
+#define _ONLY_OPEN_FOR_BUSINESS_DAYS_       (uint64_t)(1ULL << 16)    /* verkaufsoffen */
+#define _WITH_RESTRICTED_HOURS_             (uint64_t)(1ULL << 17)
+#define _ALL_DAYS_WITH_RESTRICTED_HOURS_    ((_WITH_RESTRICTED_HOURS_|_ALL_DAYS_))
+#define _WEEKEND_WITH_RESTRICTED_HOURS_     ((_WITH_RESTRICTED_HOURS_|_FRI_|_SAT_|_SUN_))
+#define _NOT_DEFINED_                       (uint64_t)(~0ULL)
 
 enum BusinessHours : std::uint64_t
 {
@@ -54,6 +57,8 @@ enum BusinessHours : std::uint64_t
     OFFICIAL_HOLIDAY = _OFFICIAL_HOLIDAY_,
     ONLY_WEEKEND = _ONLY_WEEKEND_,
     ONLY_OPEN_FOR_BUSINESS_DAYS = _ONLY_OPEN_FOR_BUSINESS_DAYS_,
+    ALL_DAYS_WITH_RESTRICTED_HOURS = _ALL_DAYS_WITH_RESTRICTED_HOURS_,
+    WEEKEND_WITH_RESTRICTED_HOURS = _WEEKEND_WITH_RESTRICTED_HOURS_,
     NOT_DEFINED = _NOT_DEFINED_
 };
 

library/include/mobilisis/tariff_permit_type.h

@@ -4,15 +4,16 @@
 #include <QString>
 
 enum class PERMIT_TYPE : quint8 {
-    SHORT_TERM_PARKING,
-    DAY_TICKET,
-    SZEGED_START,
-    SZEGED_STOP,
-    DAY_TICKET_ADULT,
-    DAY_TICKET_TEEN,
-    DAY_TICKET_CHILD,
-    FOOD_STAMP,
-    INVALID
+    SHORT_TERM_PARKING=0,
+    DAY_TICKET=1,
+    SZEGED_START=2,
+    SZEGED_STOP=3,
+    DAY_TICKET_ADULT=4,
+    DAY_TICKET_TEEN=5,
+    DAY_TICKET_CHILD=6,
+    INVALID=7,
+    FOOD_STAMP=8,
+    TWENTY_FOUR_HOURS_TICKET=9
 };
 
 struct PermitType {
@@ -45,6 +46,9 @@ struct PermitType {
         case 7:
             m_permitType = PERMIT_TYPE::FOOD_STAMP;
             break;
+        case 8:
+            m_permitType = PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET;
+            break;
         default:
             m_permitType = PERMIT_TYPE::INVALID;
         }
@@ -74,6 +78,8 @@ struct PermitType {
             return 6;
         case PERMIT_TYPE::FOOD_STAMP:
             return 7;
+        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
+            return 8;
         default:
             break;
         }
@@ -81,7 +87,7 @@ struct PermitType {
 
     }
 
-    operator QString () {
+    QString toString() {
         switch(m_permitType) {
         case PERMIT_TYPE::DAY_TICKET:
             return QString("DAY_TICKET");
@@ -99,13 +105,15 @@ struct PermitType {
             return QString("SZEGED_STOP");
         case PERMIT_TYPE::FOOD_STAMP:
             return QString("FOOD_STAMP");
+        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
+            return QString("TWENTY_FOUR_HOURS_TICKET");
         default:
             break;
         }
         return QString("INVALID");
     }
 
-    operator QString () const {
+    QString toString() const {
         switch(m_permitType) {
         case PERMIT_TYPE::DAY_TICKET:
             return QString("DAY_TICKET");
@@ -123,11 +131,21 @@ struct PermitType {
             return QString("SZEGED_STOP");
         case PERMIT_TYPE::FOOD_STAMP:
             return QString("FOOD_STAMP");
+        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
+            return QString("TWENTY_FOUR_HOURS_TICKET");
         default:
             break;
         }
         return QString("INVALID");
     }
+
+    operator QString () {
+        return toString();
+    }
+
+    operator QString () const {
+        return toString();
+    }
 };
 
 #endif // TARIFF_PERMIT_TYPE_H_INCLUDED

library/src/calculate_price.cpp

@@ -14,7 +14,7 @@ QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg) {
     return Calculator::GetInstance().GetTimeSteps(cfg);
 }
 
-int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration *cfg,
+int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg,
                                                   PERMIT_TYPE permitType,
                                                   int paymentOptionIndex) {
     int minTime = 0;
@@ -33,14 +33,14 @@ int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration *cfg,
         // for each new sell-procedure, recomute the timesteps. implicitly, set
         // the minimal parking time.
         Calculator::GetInstance().ResetTimeSteps(paymentOptionIndex);
-        Calculator::GetInstance().GetTimeSteps(cfg, paymentOptionIndex);
+        Calculator::GetInstance().GetTimeSteps((Configuration *)cfg, paymentOptionIndex);
         minTime = qRound(cfg->getPaymentOptions(paymentOptionIndex).pop_min_time);
     }
 
     return minTime;
 }
 
-int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration *cfg,
+int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
                                                   PERMIT_TYPE permitType,
                                                   int paymentOptionIndex) {
     int maxTime = 0;
@@ -59,6 +59,7 @@ int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration *cfg,
     }
 
     return maxTime;
+
 }
 
 int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
@@ -156,6 +157,28 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg,
             return product_price;
         }
     } break;
+    case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET: {
+        std::optional<QVector<ATBTariffProduct>> products = cfg->getTariffProductForProductId(permitType);
+        if (products) {
+            int product_price = 0;
+            QVector<ATBTariffProduct> product = products.value();
+
+            if (product.size() > 0) {
+                if (productStart && productEnd) {
+                    int pop_min_time = get_minimal_parkingtime(cfg); // in minutes
+                    int pop_max_time = get_maximal_parkingtime(cfg); // in minutes
+                    if (pop_max_time >= pop_min_time) {
+                        *productStart = start;
+                        *productEnd = start.addSecs(pop_max_time*60);
+                        product_price = product[0].getProductPrice();
+                    }
+                }
+            }
+
+            return product_price;
+        }
+
+    } break;
     default:
       break;
     }
@@ -487,6 +510,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                 return calcState;
             }
             cost = Calculator::GetInstance().GetCostFromDuration(tariff, start_parking_time, netto_parking_time, paymentOptionIndex);
+            end_parking_time = start_parking_time.addSecs(netto_parking_time*60);
         } else {
             cost = Calculator::GetInstance().GetCostFromDuration(
                         tariff,

library/src/calculator_functions.cpp

@@ -1833,6 +1833,8 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex)
     if (m_timeSteps.size() > paymentOptionIndex) {
         //qCritical() << __PRETTY_FUNCTION__ << "timeSteps:" << m_timeSteps;
         return m_timeSteps[paymentOptionIndex];
+    } else {
+        m_timeSteps.push_back(QList<int>());
     }
 
     QDateTime start = QDateTime::currentDateTime();
@@ -1888,7 +1890,7 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex)
                                     qCritical() << "(" << __func__ << ":" << __LINE__ << ") configured minimal parking time:" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
 
                                     // set dynamic minimal parking time
-                                    cfg->getPaymentOptions().pop_min_time = timeStep;
+                                    cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = timeStep;
 
                                     qCritical() << "(" << __func__ << ":" << __LINE__ << ") computed minimal parking time:" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
 

library/src/configuration.cpp

@@ -9,6 +9,7 @@
 
 #include <QString>
 #include <QDebug>
+#include <QRegularExpression>
 
 /// <inheritdoc/>
 MemberType Configuration::IdentifyJsonMember(const char* member_name)
@@ -436,6 +437,55 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                             }
                         } else if (strcmp(inner_obj_name, "pop_time_step_config") == 0) {
                             this->currentPaymentOptions.last().pop_time_step_config = k->value.GetInt();
+                        } else if ((strcmp(inner_obj_name, "pop_min_date_time") == 0)
+                                || (strcmp(inner_obj_name, "pop_max_date_time") == 0)) {
+                            if (k->value.IsString()) { // -w0dFriT16:20:00 or +w0dMonT00:00:00
+                                static const QRegularExpression re(R"(([+-])w([0-9]+)d([A-Za-z]{3})T([0-9]{2}:[0-9]{2}:[0-9]{2}))");
+                                QString const &s = QString::fromStdString(k->value.GetString());
+                                QRegularExpressionMatch match = re.match(s);
+                                if (match.hasMatch()) {
+                                    ATBPaymentOption::ATBMaxDateTime dt;
+                                    int lastCaptured = match.lastCapturedIndex();
+                                    if (lastCaptured == 4) {
+                                        dt.direction = (match.captured(1) == "-") ? -1 : +1;
+
+                                        bool ok;
+                                        uint8_t week = match.captured(2).toUInt(&ok);
+                                        if (ok) {
+                                            dt.week = week;
+                                        }
+
+                                        QString const &day = match.captured(3);
+                                        if (day.compare("Mon", Qt::CaseInsensitive) == 0) {
+                                            dt.day = (int)Qt::Monday;
+                                        } else if (day.compare("Tue", Qt::CaseInsensitive) == 0) {
+                                            dt.day = (int)Qt::Tuesday;
+                                        } else if (day.compare("Wed", Qt::CaseInsensitive) == 0) {
+                                            dt.day = (int)Qt::Wednesday;
+                                        } else if (day.compare("Thu", Qt::CaseInsensitive) == 0) {
+                                            dt.day = (int)Qt::Thursday;
+                                        } else if (day.compare("Fri", Qt::CaseInsensitive) == 0) {
+                                            dt.day = (int)Qt::Friday;
+                                        } else if (day.compare("Sat", Qt::CaseInsensitive) == 0) {
+                                            dt.day = (int)Qt::Saturday;
+                                        } else if (day.compare("Sun", Qt::CaseInsensitive) == 0) {
+                                            dt.day = (int)Qt::Sunday;
+                                        }
+
+                                        QTime t = QTime::fromString(match.captured(4), Qt::ISODate);
+                                        if (t.isValid()) {
+                                            dt.time = t;
+                                        }
+                                    }
+
+                                    if (strcmp(inner_obj_name, "pop_min_date_time") == 0) {
+                                        this->currentPaymentOptions.last().pop_min_date_time = dt;
+                                    } else
+                                    if (strcmp(inner_obj_name, "pop_max_date_time") == 0) {
+                                        this->currentPaymentOptions.last().pop_max_date_time = dt;
+                                    }
+                                }
+                            }
                         }
                         break;
 					case MemberType::DurationType:
@@ -583,7 +633,7 @@ int Configuration::getPaymentOptionIndex(QDateTime const &dt) const {
         if (sd.ped_id != 0) {
             for (int opt=0; opt < numOptions; ++opt) {
                 uint64_t const pop_id = getPaymentOptions(opt).pop_id;
-                if (pop_id == sd.ped_payment_option_id) {
+                if (pop_id == (uint64_t)sd.ped_payment_option_id) {
                     return opt;
                 }
             }
@@ -627,7 +677,8 @@ int Configuration::getPaymentOptionIndex(QDateTime const &dt) const {
         }
     }
 
-    return -1;
+    qCritical() << DBG_HEADER << "ERROR: DEFAULT VALUE OF '0' RETURNED AS STATIC VALUE";
+    return 0;
 }
 
 ATBSpecialDays Configuration::specialDay(QDateTime const &dt) const {
@@ -718,12 +769,38 @@ Configuration::getTariffProductForAllKeys() const {
 }
 
 std::optional<QVector<ATBTariffProduct>>
-Configuration::getTariffProductForProductId(PermitType permitType) const {
+Configuration::getTariffProductForProductTypeName(QString const &permitTypeName) const {
     QVector<ATBTariffProduct> products;
     std::optional<QVector<ATBTariffProduct>> value;
 
     products.clear();
 
+    for(const auto &product: this->TariffProduct) {
+        ATBTariffProduct const &v = product.second;
+        if (v.m_tariff_product_name == permitTypeName) {
+            products.append(v);
+        }
+    }
+
+    if (products.size() > 0) {
+        value = value.value_or(products);
+    }
+
+    return value;
+}
+
+std::optional<QVector<ATBTariffProduct>>
+Configuration::getTariffProductForProductId(PermitType permitType) const {
+    QString permitTypeName(permitType);
+    return getTariffProductForProductTypeName(permitTypeName);
+
+    /*
+    QVector<ATBTariffProduct> products;
+    std::optional<QVector<ATBTariffProduct>> value;
+
+    products.clear();
+
+
     for (auto[it, rangeEnd] = this->TariffProduct.equal_range(permitType); it != rangeEnd; ++it) {
         products.append(it->second);
     }
@@ -733,6 +810,7 @@ Configuration::getTariffProductForProductId(PermitType permitType) const {
     }
 
     return value;
+    */
 }
 
 std::optional<QVector<ATBTariffProduct>>

library/src/utilities.cpp

@@ -408,7 +408,10 @@ uint32_t Utilities::getMaximalParkingPrice(Configuration const *cfg, PaymentMeth
 
 uint32_t Utilities::getTimeRangeStep(Configuration const *cfg, int step, PaymentMethod methodId) {
     if (methodId == PaymentMethod::Progressive) {
-        return std::max((int)cfg->TimeRange.find(step)->second.time_range_to_in_minutes_from_start, 0);
+        Configuration::TimeRangeType::const_iterator it = cfg->TimeRange.find(step);
+        if (it != cfg->TimeRange.cend()) {
+            return std::max((int)(it->second.time_range_to_in_minutes_from_start), 0);
+        }
     }
 
     return 0;

main/main.cpp

@@ -41,10 +41,129 @@ extern "C" char* strptime(const char* s,
 #define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (0)
 #define NEUHAUSER_BILEXA_GALTUER                (0)
 #define NEUHAUSER_KIRCHDORF                     (0)
-#define BAD_NEUENAHR_AHRWEILER                  (1)
-#define NEUHAUSER_CHRISTOPH_REISEN              (0)
+#define BAD_NEUENAHR_AHRWEILER                  (0)
+#define NEUHAUSER_CHRISTOPH_REISEN              (1)
 #define NEUHAUSER_PERNEGG_AN_DER_MUR            (0)
 
+#if NEUHAUSER_KIRCHDORF==1
+static bool test_neuhauser_kirchdorf(int step, double cost) {
+    return true;
+
+
+    switch (step) {
+    case 30:
+        if (cost != 30) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 30;
+            return false;
+        }
+        break;
+    case 35:
+        if (cost != 40) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 40;
+            return false;
+        }
+        break;
+    case 40:
+        if (cost != 50) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 50;
+            return false;
+        }
+        break;
+    case 45:
+        if (cost != 60) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 60;
+            return false;
+        }
+        break;
+    case 50:
+        if (cost != 70) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 70;
+            return false;
+        }
+        break;
+    case 55:
+        if (cost != 80) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 80;
+            return false;
+        }
+        break;
+    case 60:
+        if (cost != 90) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 90;
+            return false;
+        }
+        break;
+    case 65:
+        if (cost != 100) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 100;
+            return false;
+        }
+        break;
+    case 70:
+        if (cost != 110) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 110;
+            return false;
+        }
+        break;
+    case 75:
+        if (cost != 120) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 120;
+            return false;
+        }
+        break;
+    case 80:
+        if (cost != 130) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 130;
+            return false;
+        }
+        break;
+    case 85:
+        if (cost != 140) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 140;
+            return false;
+        }
+        break;
+    case 90:
+        if (cost != 150) {
+            qCritical() << "ERROR COMPUTING COST"
+                        << "HAVE" << cost
+                        << "SHOULD" << 150;
+            return false;
+        }
+        break;
+    default:
+        break;
+    }
+
+    return true;
+}
+#endif
+
+
 int main() {
 #if NEUHAUSER_PERNEGG_AN_DER_MUR==1
     std::ifstream input;
@@ -84,20 +203,27 @@ int main() {
         QDateTime start = QDateTime::currentDateTime();
         start.setTime(QTime(0, 0, 0));
         price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start);
-        qCritical() << QString("price (%1) :").arg(start.time().toString(Qt::ISODate)) << price;
+        qCritical() << QString("line=%1 price (%2) :")
+                       .arg(__LINE__)
+                       .arg(start.time().toString(Qt::ISODate)) << price;
 
         start.setTime(QTime(6, 0, 0));
         productStart = productEnd = QDateTime();
         price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
-        qCritical() << QString("price (%1-%2) :")
+        qCritical() << QString("line=%1 price (%2-%3) :")
+                       .arg(__LINE__)
                        .arg(productStart.time().toString(Qt::ISODate))
                        .arg(productEnd.time().toString(Qt::ISODate))
                     << price;
 
+        price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start);
+        qCritical() << QString("line=%1 price:").arg(__LINE__) << price;
+
         start.setTime(QTime(15, 0, 0));
         productStart = productEnd = QDateTime();
         price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
-        qCritical() << QString("price (%1-%2) :")
+        qCritical() << QString("line=%1 price (%2-%3) :")
+                       .arg(__LINE__)
                        .arg(productStart.time().toString(Qt::ISODate))
                        .arg(productEnd.time().toString(Qt::ISODate))
                     << price;
@@ -105,7 +231,8 @@ int main() {
         start.setTime(QTime(16, 0, 0));
         productStart = productEnd = QDateTime();
         price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
-        qCritical() << QString("price (%1-%2) :")
+        qCritical() << QString("line=%1 price (%2-%3) :")
+                       .arg(__LINE__)
                        .arg(productStart.time().toString(Qt::ISODate))
                        .arg(productEnd.time().toString(Qt::ISODate))
                     << price;
@@ -113,7 +240,8 @@ int main() {
         start.setTime(QTime(17, 0, 0));
         productStart = productEnd = QDateTime();
         price = compute_product_price(&cfg, PERMIT_TYPE::INVALID, start, &productStart, &productEnd);
-        qCritical() << QString("price (%1-%2) :")
+        qCritical() << QString("line=%1 price (%2-%3) :")
+                       .arg(__LINE__)
                        .arg(productStart.time().toString(Qt::ISODate))
                        .arg(productEnd.time().toString(Qt::ISODate))
                     << price;
@@ -191,7 +319,10 @@ int main() {
 #endif
 
             QDateTime start = QDateTime::currentDateTime();
-            //start.setTime(QTime(0, 0, 0));
+            start.setTime(QTime(10, 2, 30));
+            start.setDate(QDate(2024, 5, 5));
+
+            // 2024-05-05 10:02:30
 
             struct price_t costs;
             double const cost[] = {600, 700, 800, 1600, 2400, 3000, 3600};
@@ -217,7 +348,7 @@ int main() {
                 }
 
                 qCritical() << "compute_price_for_parking_ticket()/GetCostFromDuration() TIME: "
-                            << timeSteps.at(i) << "PRICE=" << price1;
+                            << timeSteps.at(i) << "(" << timeSteps.at(i)/60 << "h)" << "PRICE=" << price1;
 
 
                 std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg, 4,
@@ -241,7 +372,7 @@ int main() {
     int pop_carry_over;
     int pop_carry_over_time_range_id;
 
-    for (int zone=2; zone < 3; ++zone) {
+    for (int zone=7; zone < 8; ++zone) {
     //for (int t=6; t < 7; t+=20) {
         switch (zone) {
         case 1: {
@@ -464,53 +595,361 @@ int main() {
                     }
                 }
             }
+            if (zone == 3) {
+                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);
+                pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+                qCritical() << "        pop_min_time: " << pop_min_time;
+                qCritical() << "        pop_max_time: " << pop_max_time;
+                qCritical() << "       pop_min_price: " << pop_min_price;
+                qCritical() << "       pop_max_price: " << pop_max_price;
+                qCritical() << "pop_daily_card_price: " << pop_daily_card_price;
+
+                static QList<int> const stepsConfigured
+                    = QList(std::initializer_list<int>{20, 40, 60, 80, 100, 120});
+
+                static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+                qCritical() << "TimeSteps" << timeSteps;
+
+                if (stepsConfigured != timeSteps) {
+                    qCritical() << "TIME-STEPS SHOULD BE" << stepsConfigured;
+                    return -1;
+                }
+
+                bool fail;
+                QDateTime start;
+
+                for (int i=0; i < 5; ++i) {
+                    switch (i) {
+                    case 0:
+                        start = QDateTime(QDate(2024, 5, 1), QTime(16, 0, 0));  // holiday
+                        fail = false;
+                    break;
+                    case 1:
+                        start = QDateTime(QDate(2024, 4, 21), QTime(16, 0, 0)); // sunday
+                        fail = false;
+                    break;
+                    case 2:
+                        start = QDateTime(QDate(2024, 4, 22), QTime(8, 0, 0));  // monday
+                        fail = false;
+                    break;
+                    case 3:
+                        start = QDateTime(QDate(2024, 4, 23), QTime(17, 30, 0)); // tuesday
+                        fail = true;
+                    break;
+                    case 4:
+                        start = QDateTime(QDate(2024, 4, 24), QTime(7, 30, 0)); // wednesday
+                        fail = true;
+                    break;
+                    default:;
+                    }
+
+                    QDateTime end;
+                    struct price_t price;
+
+                    //start = QDateTime::currentDateTime();
+                    QList<int> timeSteps;
+
+                    int paymentOptionIndex = cfg.getPaymentOptionIndex(start);
+                    if (paymentOptionIndex != -1) {
+                        qCritical() << "paymentOptionIndex" << paymentOptionIndex;
+                        timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg, paymentOptionIndex);
+                        qCritical() << "TimeSteps" << timeSteps;
+
+                        QList<int>::const_iterator step;
+                        for (step = timeSteps.cbegin(); step != timeSteps.cend(); ++step) {
+
+                            double cost = 0;
+                            CalcState cs;
+
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                                cost = price.netto;
+                                qCritical() << "step" << *step << ": cost" << cost;
+                            } else {
+                                if (fail == false) {
+                                    qCritical() << "<<<ERROR>>> cs =" << QString(cs);
+                                }
+                            }
+                        }
+                    } else {
+                        qCritical() << "ERROR paymentOptionIndex =" << paymentOptionIndex;
+                    }
+                }
+
+            }
+            if (zone == 4) {
+                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);
+                pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+                qCritical() << "        pop_min_time: " << pop_min_time;
+                qCritical() << "        pop_max_time: " << pop_max_time;
+                qCritical() << "       pop_min_price: " << pop_min_price;
+                qCritical() << "       pop_max_price: " << pop_max_price;
+                qCritical() << "pop_daily_card_price: " << pop_daily_card_price;
+
+                static QList<int> const stepsConfigured
+                    = QList(std::initializer_list<int>{20, 40, 60, 80, 100, 120});
+
+                static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+                qCritical() << "TimeSteps" << timeSteps;
+
+                if (stepsConfigured != timeSteps) {
+                    qCritical() << "TIME-STEPS SHOULD BE" << stepsConfigured;
+                    return -1;
+                }
+
+                bool fail;
+                QDateTime start;
+
+                for (int i=4; i < 5; ++i) {
+                    switch (i) {
+                    case 0:
+                        start = QDateTime(QDate(2024, 5, 1), QTime(16, 0, 0));  // holiday
+                        fail = false;
+                    break;
+                    case 1:
+                        start = QDateTime(QDate(2024, 4, 21), QTime(16, 0, 0)); // sunday
+                        fail = false;
+                    break;
+                    case 2:
+                        start = QDateTime(QDate(2024, 4, 22), QTime(8, 0, 0));  // monday
+                        fail = false;
+                    break;
+                    case 3:
+                        start = QDateTime(QDate(2024, 4, 23), QTime(17, 30, 0)); // tuesday
+                        fail = true;
+                    break;
+                    case 4:
+                        start = QDateTime(QDate(2024, 4, 24), QTime(7, 30, 0)); // wednesday
+                        fail = true;
+                    break;
+                    default:;
+                    }
+
+                    QDateTime end;
+                    struct price_t price;
+
+                    //start = QDateTime::currentDateTime();
+                    QList<int> timeSteps;
+
+                    int paymentOptionIndex = cfg.getPaymentOptionIndex(start);
+                    if (paymentOptionIndex != -1) {
+                        qCritical() << "paymentOptionIndex" << paymentOptionIndex;
+                        timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg, paymentOptionIndex);
+                        qCritical() << "TimeSteps" << timeSteps;
+
+                        QList<int>::const_iterator step;
+                        for (step = timeSteps.cbegin(); step != timeSteps.cend(); ++step) {
+
+                            double cost = 0;
+                            CalcState cs;
+
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                                cost = price.netto;
+                                qCritical() << "step" << *step << ": cost" << cost;
+                            } else {
+                                if (fail == false) {
+                                    qCritical() << "<<<ERROR>>> cs =" << QString(cs);
+                                }
+                            }
+                        }
+                    } else {
+                        qCritical() << "ERROR paymentOptionIndex =" << paymentOptionIndex;
+                    }
+                }
+            }
+            if (zone == 5) {
+
+            }
+            if (zone == 6) {    // sondertarif: 24h ticket wohnmobile
+                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);
+                pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+                qCritical() << zone << "        pop_min_time: " << pop_min_time;
+                qCritical() << zone << "        pop_max_time: " << pop_max_time;
+                qCritical() << zone << "       pop_min_price: " << pop_min_price;
+                qCritical() << zone << "       pop_max_price: " << pop_max_price;
+                qCritical() << zone << "pop_daily_card_price: " << pop_daily_card_price;
+
+                QDateTime start = QDateTime::currentDateTime();
+                start.setTime(QTime(0, 0, 0));
+
+                for (int i=0; i<1440; ++i) {
+
+                    QDateTime productStart;
+                    QDateTime productEnd;
+
+                    int v = compute_product_price(&cfg, PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET, start, &productStart, &productEnd);
+                    if (v != 800) {
+                        qCritical() << "ERROR [" << i << "]" << "price 24h-ticket"
+                                    << v << productStart.toString(Qt::ISODate)
+                                    << productEnd.toString(Qt::ISODate);
+                        exit(-1);
+                    } else {
+                        qCritical() << v << productStart.toString(Qt::ISODate)
+                                    << productEnd.toString(Qt::ISODate);
+
+                    }
+                    start = start.addSecs(60);
+                }
+            }
+            if (zone == 7) {
+                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);
+                pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+                qCritical() << zone << "        pop_min_time: " << pop_min_time;
+                qCritical() << zone << "        pop_max_time: " << pop_max_time;
+                qCritical() << zone << "       pop_min_price: " << pop_min_price;
+                qCritical() << zone << "       pop_max_price: " << pop_max_price;
+                qCritical() << zone << "pop_daily_card_price: " << pop_daily_card_price;
+
+
+                static QList<int> const stepsConfigured
+                    = QList(std::initializer_list<int>{
+                        20, 40, 60, 80, 100, 120, 140, 160, 180, 200, 220, 240, 260, 1440});
+
+                //static QList<double> const cost
+                //    = QList(std::initializer_list<double>{
+                //        0, 40, 80, 120, 160, 200, 240, 280, 320, 360, 400, 440, 480, 500});
+
+                static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+                qCritical() << "( TimeSteps  :" << __LINE__ << ")" << timeSteps;
+
+                if (stepsConfigured != timeSteps) {
+                    qCritical() << "TIME-STEPS SHOULD BE" << stepsConfigured;
+                    return -1;
+                }
+
+                QDateTime start = QDateTime::currentDateTime();
+
+                struct price_t costs;
+                double price1 = 0;
+                double price2 = 0;
+
+                for (int m=0; m < 1440; ++m) {
+                    start.setTime(QTime(0, 0, 0));
+                    start = start.addSecs(m*60);
+
+                    qCritical() << "START" << start.toString(Qt::ISODate);
+
+                    //int Down = 0;
+                    //int Up = 1;
+                    // for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
+                    //    int nextTimeStep = compute_next_timestep(&cfg, timeSteps.at(i), Up);
+                    //    qCritical() << "nextTimeStep" << nextTimeStep;
+                    //
+                    //    int prevTimeStep = compute_next_timestep(&cfg, timeSteps.at(i), Down);
+                    //    qCritical() << "prevTimeStep" << prevTimeStep;
+                    //}
+
+                    CalcState cs;
+
+                    for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
+                        QDateTime end = start.addSecs(timeSteps.at(i)*60);
+
+                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs);
+                        if (cs.getStatus() != CalcState::State::SUCCESS) {
+                            if (start.time().hour() >= 8 && start.time().hour() < 18) {
+                                qCritical() << "ERROR CALC-STATE-1=" << QString(cs);
+                                exit(-1);
+                            } else {
+                                if (cs.getStatus() == CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME) {
+                                    qCritical() << "CALC-STATE=" << QString(cs);
+                                    continue;
+                                }
+                                qCritical() << "ERROR CALC-STATE-2=" << QString(cs);
+                                exit(-1);
+                            }
+                        }
+                        price1 = costs.netto;
+                        price2 = Calculator::GetInstance().GetCostFromDuration(&cfg, start, timeSteps.at(i));
+
+                        if (price1 != price2) {
+                            qCritical() << "ERROR DIFFERENT PRICES" << price1 << price2;
+                            exit(-1);
+                        }
+
+                        qCritical() << "compute_price_for_parking_ticket()/GetCostFromDuration() TIME: "
+                                    << timeSteps.at(i) << "PRICE=" << price1;
+
+
+                        //std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg, 4,
+                        //                                                                     start.toString(Qt::ISODate).toStdString().c_str(),
+                        //                                                                     cost[i], false, true);
+                        //qCritical() << "duration" << duration.c_str();
+                    }
+                }
+            }
         }
     }
 #endif
 
 #if SCHOENAU_KOENIGSEE==1
-    //QString f("/opt/ptu5/opt/customer_332/etc/psa_tariff/tariff01.json");
-    QString f("/opt/ptu5/opt/customer_332/etc/psa_tariff/tariff02.json");
+    for (int zone=1; zone < 3; ++zone) {
+        std::ifstream input;
 
-    std::ifstream input(f.toUtf8().constData());
+        if (zone == 1) {
+            input.open("/opt/ptu5/opt/customer_332/etc/psa_tariff/tariff01.json");
+        }
+        if (zone == 2) {
+            input.open("/opt/ptu5/opt/customer_332/etc/psa_tariff/tariff02.json");
+        }
 
-    std::stringstream sstr;
-    while(input >> sstr.rdbuf());
-    std::string json(sstr.str());
+        qCritical() << "--------------------";
+        qCritical() << "        ZONE" << zone;
+        qCritical() << "--------------------";
 
-    Configuration cfg;
+        std::stringstream sstr;
+        while(input >> sstr.rdbuf());
+        std::string json(sstr.str());
 
-    bool isParsed = cfg.ParseJson(&cfg, json.c_str());
-    cout << endl;
+        Configuration cfg;
 
-    if (isParsed) {
-        qCritical() << "parsed" << f;
+        bool isParsed = cfg.ParseJson(&cfg, json.c_str());
+        cout << endl;
 
-        int minParkingTime = get_minimal_parkingtime(&cfg);
-        qCritical() << "minimal_parking_time" << minParkingTime;
+        if (isParsed) {
+            // qCritical() << "parsed zone" << zone << "file";
 
-        QDateTime start = QDateTime::currentDateTime();
+            int minParkingTime = get_minimal_parkingtime(&cfg);
+            qCritical() << "minimal_parking_time" << minParkingTime;
 
-        // zone 1
-        //int timeSteps[] = {60, 180, 1440, 2880, 4320, 5670, 7200, 8640, 10080, 11520, 12960, 14400};
+            QDateTime start = QDateTime::currentDateTime();
 
-        static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
-        qCritical() << "TimeSteps" << timeSteps;
+            // zone 1
+            //int timeSteps[] = {60, 180, 1440, 2880, 4320, 5670, 7200, 8640, 10080, 11520, 12960, 14400};
 
-        for (int i = 0 ; i < timeSteps.size(); ++i) {
-            QDateTime end = start.addSecs(timeSteps.at(i)*60);
+            static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+            qCritical() << "TimeSteps" << timeSteps;
 
-            double price = Calculator::GetInstance().GetCostFromDuration(
-                                 &cfg,
-                                 start,
-                                 timeSteps.at(i));
-            qDebug() << "GetCostFromDuration() time: " << timeSteps.at(i)
-                     << "(" << timeSteps.at(i)/60 << "h)"
-                     << "price=" << price;
+            for (int i = 0 ; i < timeSteps.size(); ++i) {
+                QDateTime end = start.addSecs(timeSteps.at(i)*60);
+
+                double price = Calculator::GetInstance().GetCostFromDuration(
+                                     &cfg,
+                                     start,
+                                     timeSteps.at(i));
+                qDebug() << "GetCostFromDuration() time: " << timeSteps.at(i)
+                         << "(" << timeSteps.at(i)/60 << "h)"
+                         << "price=" << price;
+            }
         }
     }
 #endif
 
+
 #if NEUHAUSER_KIRCHDORF==1
     //if (QDir("/opt/app/tools/atbupdate/customer_743").exists()) {
     //    if(QFileInfo::exists("/etc/psa_tariff/tariff01.json")) {
@@ -869,7 +1308,7 @@ int main() {
     cout << endl;
 
     if (isParsed) {
-        int minParkingTime = get_minimal_parkingtime(&cfg);
+        //int minParkingTime = get_minimal_parkingtime(&cfg);
         QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
         qCritical() << timeSteps;
         int Down = 0;
@@ -877,11 +1316,19 @@ int main() {
         //compute_next_timestep(&cfg, )
 
         QDateTime const start = QDateTime::currentDateTime();
+        int paymentOptionIndex = cfg.getPaymentOptionIndex(start);
+
+        if (paymentOptionIndex < 0) {
+            qCritical() << "ERROR paymentOptionIndex" << paymentOptionIndex
+                        << "< 0 for start" << start.toString(Qt::ISODate);
+            exit(-1);
+        }
+
         for (int i=0; i<timeSteps.size(); ++i) {
             int nextTimeStep = compute_next_timestep(&cfg, timeSteps.at(i), Up);
             qCritical() << "nextTimeStep" << nextTimeStep;
 
-            uint32_t price = Calculator::GetInstance().GetPriceForTimeStep(&cfg, timeSteps.at(i));
+            uint32_t price = Calculator::GetInstance().GetPriceForTimeStep(&cfg, timeSteps.at(i), paymentOptionIndex);
             uint32_t duration = Calculator::GetInstance().GetDurationForPrice(&cfg, price);
             qCritical() << "nextTimeStep relative to start:"
                         << duration << start.addSecs(duration * 60).toString(Qt::ISODate)
@@ -914,20 +1361,23 @@ int main() {
         QDateTime s(QDate(2023, 11, 30), QTime());
         QDateTime end;
         struct price_t price;
-#define ADULT 1
-//#define TEEN 1
 
         for (int offset = 480; offset < 1200; ++offset) {
             QDateTime start = s.addSecs(offset * 60);
             CalcState cs = compute_price_for_daily_ticket(&cfg, start, end,
-#if ADULT==1
                                                           PERMIT_TYPE::DAY_TICKET_ADULT,
-#elif TEEN==1
-                                                          PERMIT_TYPE::DAY_TICKET_TEEN,
-#endif
                                                           &price);
             qCritical() << "start=" << start.toString(Qt::ISODate)
-                        << "end" << end.toString(Qt::ISODate) << "price" << price.netto;
+                        << "end" << end.toString(Qt::ISODate) << "price (ADULT)" << price.netto;
+        }
+
+        for (int offset = 480; offset < 1200; ++offset) {
+            QDateTime start = s.addSecs(offset * 60);
+            CalcState cs = compute_price_for_daily_ticket(&cfg, start, end,
+                                                          PERMIT_TYPE::DAY_TICKET_TEEN,
+                                                          &price);
+            qCritical() << "start=" << start.toString(Qt::ISODate)
+                        << "end" << end.toString(Qt::ISODate) << "price (TEEN)" << price.netto;
         }
     }
 #undef ADULT
@@ -996,6 +1446,21 @@ int main() {
                     //            << "until" << duration.c_str() << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60;
                 }
             }
+
+            Configuration::SpecialDaysType specialDays = cfg.SpecialDays;
+            for (Configuration::SpecialDaysType::const_iterator it = specialDays.cbegin();
+                 it != specialDays.cend(); ++it) {
+                QDate d = QDate::fromString(QString::fromStdString(it->second.ped_date_start), Qt::ISODate);
+                s.setDate(d);
+                s.setTime(QTime(12, 0, 0));
+                int duration = 30;
+                double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, s, end, duration, nextDay, prePaid);
+                qCritical() << "start" << s.toString(Qt::ISODate)
+                            << "end" << end.toString(Qt::ISODate)
+                            << "duration" << duration
+                            << "cost" << cost;
+            }
+
         }
     }
     return 0;