Minor: add some (commented out) debug output -> used for debugging.

call compute_product_price(cfg, permitType, start) to get
minimal price dependent on 'start' datetime.

library/include/mobilisis/calculate_price.h

@@ -207,7 +207,8 @@ int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
 
 int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
                                                    PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING,
-                                                   int paymentOptionIndex=0);
+                                                   int paymentOptionIndex = 0,
+                                                   QDateTime const &start = QDateTime::currentDateTime());
 
 int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
                                                    PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING,

library/src/calculate_price.cpp

@@ -64,7 +64,8 @@ int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
 
 int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
                                                    PERMIT_TYPE permitType,
-                                                   int paymentOptionIndex) {
+                                                   int paymentOptionIndex,
+                                                   QDateTime const &start) {
     int minPrice = -1;
 
     switch(permitType) {
@@ -77,6 +78,9 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
     } break;
     case PERMIT_TYPE::DAY_TICKET_CHILD: {
     } break;
+    case PERMIT_TYPE::DAY_TICKET: {
+        minPrice = compute_product_price(cfg, permitType, start);
+    } break;
     default: ;
     }
 
@@ -145,6 +149,10 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg,
                 QTime const &startTime = p.getTimeStart();
                 QTime const &endTime = p.getTimeEnd();
 
+                // qCritical() << __LINE__ << startTime.toString(Qt::ISODate);
+                // qCritical() << __LINE__ << endTime.toString(Qt::ISODate);
+                // qCritical() << __LINE__ << start.toString(Qt::ISODate);
+
                 if (start.time() >= startTime && start.time() < endTime) {
                     product_price = p.getProductPrice();
                     if (productStart && productEnd) {
@@ -476,6 +484,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
     // DEBUG
     qCritical() << "compute_price_for_parking_ticket() " << endl
+                << "          paymentOptionIndex: " << paymentOptionIndex << endl
                 << "          start_parking_time: " << start_parking_time << endl
                 << "          netto_parking_time: " << netto_parking_time << endl
                 << "                      minMin: " << minMin << endl
@@ -502,15 +511,21 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
     double cost = -1;
     if (start_parking_time.isValid()) {
-        if (tariff->getPaymentOptions().pop_payment_method_id == PaymentMethod::Steps) {
+        if (tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id == PaymentMethod::Steps) {
             // hier muesste man unterscheiden: uebertrag oder nicht?
             calcState = Calculator::GetInstance().isParkingAllowed(tariff, start_parking_time,
                                                                    netto_parking_time, paymentOptionIndex);
             if (calcState.getStatus() == CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME) {
+                // qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                //             << calcState.toString();
                 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);
+
+            // qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+            //             << "end_parking_time" << end_parking_time.toString(Qt::ISODate);
+
         } else {
             cost = Calculator::GetInstance().GetCostFromDuration(
                         tariff,

main/main.cpp

@@ -42,8 +42,8 @@ extern "C" char* strptime(const char* s,
 #define NEUHAUSER_BILEXA_GALTUER                (0)
 #define NEUHAUSER_KIRCHDORF                     (0)
 #define BAD_NEUENAHR_AHRWEILER                  (0)
-#define NEUHAUSER_CHRISTOPH_REISEN              (1)
-#define NEUHAUSER_PERNEGG_AN_DER_MUR            (0)
+#define NEUHAUSER_CHRISTOPH_REISEN              (0)
+#define NEUHAUSER_PERNEGG_AN_DER_MUR            (1)
 
 #if NEUHAUSER_KIRCHDORF==1
 static bool test_neuhauser_kirchdorf(int step, double cost) {
@@ -207,6 +207,9 @@ int main() {
                        .arg(__LINE__)
                        .arg(start.time().toString(Qt::ISODate)) << price;
 
+        price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
+        qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
+
         start.setTime(QTime(6, 0, 0));
         productStart = productEnd = QDateTime();
         price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
@@ -216,6 +219,10 @@ int main() {
                        .arg(productEnd.time().toString(Qt::ISODate))
                     << price;
 
+        price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
+        qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__)
+                    << price;
+
         price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start);
         qCritical() << QString("line=%1 price:").arg(__LINE__) << price;
 
@@ -228,6 +235,9 @@ int main() {
                        .arg(productEnd.time().toString(Qt::ISODate))
                     << price;
 
+        price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
+        qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
+
         start.setTime(QTime(16, 0, 0));
         productStart = productEnd = QDateTime();
         price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
@@ -237,14 +247,23 @@ int main() {
                        .arg(productEnd.time().toString(Qt::ISODate))
                     << price;
 
+        price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
+        qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
+
         start.setTime(QTime(17, 0, 0));
         productStart = productEnd = QDateTime();
-        price = compute_product_price(&cfg, PERMIT_TYPE::INVALID, start, &productStart, &productEnd);
+        price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
         qCritical() << QString("line=%1 price (%2-%3) :")
                        .arg(__LINE__)
                        .arg(productStart.time().toString(Qt::ISODate))
                        .arg(productEnd.time().toString(Qt::ISODate))
                     << price;
+
+        price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
+        qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
+
+        price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET);
+        qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
     }
 #endif
 
@@ -372,34 +391,41 @@ int main() {
     int pop_carry_over;
     int pop_carry_over_time_range_id;
 
-    for (int zone=7; zone < 8; ++zone) {
+    for (int zone=6; zone < 7; ++zone) {
     //for (int t=6; t < 7; t+=20) {
         switch (zone) {
         case 1: {
+            // standard-tarif
             input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff01.json");
             //pop_max_time = 6*60;
         } break;
         case 2: {
+            // kuzzeit-1-tarif
             input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff02.json");
             //pop_max_time = 5*60;
         } break;
         case 3: {
+            // kuzzeit-2-tarif
             input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff03.json");
             //pop_max_time = 6*60;
         } break;
         case 4: {
+            // kuzzeit-3-tarif
             input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff04.json");
             //pop_max_time = 4*60;
         } break;
         case 5: {
+            // langzeit-tarif
             input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff05.json");
             //pop_max_time = 6*60;
         } break;
         case 6: {
+            // sondertarif
             input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff06.json");
             //pop_max_time = 4*60;
         } break;
         case 7: {
+            // wochenend-tarif
             input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff07.json");
             //pop_max_time = 4*60;
         } break;
@@ -764,10 +790,67 @@ int main() {
                     }
                 }
             }
-            if (zone == 5) {
+            if (zone == 5) {    // langzeit-tarif
+                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, 4320, 10080
+                      });
+
+                static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+                qCritical() << "( TimeSteps  :" << __LINE__ << ")" << timeSteps;
+
+                if (stepsConfigured != timeSteps) {
+                    qCritical() << "TIME-STEPS SHOULD BE" << stepsConfigured;
+                    return -1;
+                }
+
+                bool fail;
+                QDateTime start = QDateTime::currentDateTime();
+
+                int paymentOptionIndex = cfg.getPaymentOptionIndex(start);
+                if (paymentOptionIndex != -1) {
+                    QDateTime end;
+                    struct price_t price;
+
+                    qCritical() << "paymentOptionIndex" << paymentOptionIndex;
+
+                    QList<int>::const_iterator step;
+                    int i = 0;
+                    for (step = timeSteps.cbegin(); step != timeSteps.cend(); ++step) {
+                        if (++i < 16) continue;
+
+                        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);
+                            }
+                        }
+                        exit(0);
+                    }
+                } else {
+                    qCritical() << "ERROR paymentOptionIndex =" << paymentOptionIndex;
+                }
 
             }
             if (zone == 6) {    // sondertarif: 24h ticket wohnmobile
+                                // 8 euro; hoechstparkdauer 24h
                 pop_min_time = get_minimal_parkingtime(&cfg);
                 pop_max_time = get_maximal_parkingtime(&cfg);
                 pop_min_price = get_minimal_parkingprice(&cfg);
@@ -795,8 +878,18 @@ int main() {
                                     << productEnd.toString(Qt::ISODate);
                         exit(-1);
                     } else {
-                        qCritical() << v << productStart.toString(Qt::ISODate)
+
+                        int const secs = productStart.secsTo(productEnd);
+                        if (secs != 86400) {
+                            qCritical() << "ERROR" << i << secs << v
+                                        << productStart.toString(Qt::ISODate)
+                                        << productEnd.toString(Qt::ISODate);
+                            exit(-1);
+                        } else {
+                        qCritical() << i << secs << v
+                                    << productStart.toString(Qt::ISODate)
                                     << productEnd.toString(Qt::ISODate);
+                        }
 
                     }
                     start = start.addSecs(60);
@@ -815,7 +908,6 @@ int main() {
                 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});
@@ -834,10 +926,23 @@ int main() {
 
                 QDateTime start = QDateTime::currentDateTime();
 
+                // testing
+                start.setDate(QDate(2024, 5, 5));
+                start.setTime(QTime(16, 0, 0));
+
                 struct price_t costs;
                 double price1 = 0;
                 double price2 = 0;
 
+                CalcState cs;
+                for (int i = 13, 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);
+                    qCritical() << endl;
+                }
+
+                exit(0);
+
                 for (int m=0; m < 1440; ++m) {
                     start.setTime(QTime(0, 0, 0));
                     start = start.addSecs(m*60);
@@ -854,8 +959,6 @@ int main() {
                     //    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);