Pass paymentOptionIndex to cfg->getPaymentOptions(), which has

a default parameter of paymentOptionIndex=0.

library/include/mobilisis/configuration.h

@@ -38,6 +38,7 @@ class Configuration
 public:
     using SpecialDaysType = std::multimap<int, ATBSpecialDays>;
     using SpecialDaysWorktimeType = std::multimap<int, ATBSpecialDaysWorktime>;
+    using TimeRangeType = std::multimap<int, ATBTimeRange>;
 
     ATBProject project;
     ATBCurrency Currency;
@@ -53,7 +54,7 @@ public:
 	multimap<int, ATBWeekDaysWorktime> WeekDaysWorktime;
 	multimap<int, ATBPaymentOption> PaymentOption;
     multimap<int, ATBDailyTicket> DailyTicket;
-    multimap<int, ATBTimeRange> TimeRange;
+    TimeRangeType TimeRange;
     multimap<int, ATBTimeStepConfig> TimeStepConfig;
     multimap<int, ATBTimeBase> TimeBase;
     multimap<int, ATBCustomer> Customer;

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/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

@@ -37,14 +37,133 @@ extern "C" char* strptime(const char* s,
 #define SZEGED                                  (0)
 #define SCHOENAU_KOENIGSEE                      (0)
 #define NEUHAUSER_KORNEUBURG                    (0)
-#define NEUHAUSER_LINSINGER_MASCHINENBAU        (0)
+#define NEUHAUSER_LINSINGER_MASCHINENBAU        (1)
 #define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (0)
 #define NEUHAUSER_BILEXA_GALTUER                (0)
 #define NEUHAUSER_KIRCHDORF                     (0)
-#define BAD_NEUENAHR_AHRWEILER                  (1)
+#define BAD_NEUENAHR_AHRWEILER                  (0)
 #define NEUHAUSER_CHRISTOPH_REISEN              (0)
 #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,12 +203,15 @@ 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;
@@ -97,7 +219,8 @@ int main() {
         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 +228,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 +237,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;
@@ -217,7 +342,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,
@@ -469,48 +594,59 @@ int main() {
 #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 +1005,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 +1013,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 +1058,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 +1143,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;