library/include/mobilisis/tariff_carryover.h

@@ -61,28 +61,6 @@ struct ATBTariffCarryOver {
         return QString("ERROR unknown carry over application: %1").arg(static_cast<int>(m_carryOverIf));
     }
 
-    int computeMinutesUntilCarryOverEnd(QDateTime const &dt) {
-        int minutes = 0;
-        QString end = m_range.m_end.toString(Qt::ISODate);
-        if (end == "24:00:00") {
-            QDateTime t = dt.addDays(1);
-            t.setTime(QTime(0,0,0));
-            minutes = dt.secsTo(t) / 60;
-        } else {
-            QDateTime t(dt);
-            t.setTime(QTime::fromString(end, Qt::ISODate));
-            minutes = dt.secsTo(t) / 60;
-        }
-
-        if (minutes < 0 || minutes > m_range.m_duration) {
-            minutes = 0;
-        }
-
-        // qCritical() << __func__ << ":" << __LINE__ << "minutes" << minutes;
-
-        return minutes;
-    }
-
     friend QDebug operator<<(QDebug debug, ATBTariffCarryOver const &co) {
         QDebugStateSaver saver(debug);
 

library/include/mobilisis/time_range.h

@@ -34,13 +34,6 @@ struct TimeRange {
         m_duration = timeRange.m_duration;
         return *this;
     }
-
-    TimeRange &operator=(TimeRange const &timeRange) {
-        m_start = timeRange.m_start;
-        m_end = timeRange.m_end;
-        m_duration = timeRange.m_duration;
-        return *this;
-    }
 };
 
 #endif // TIME_RANGE_H_INCLUDED

library/src/calculator_functions.cpp

@@ -458,7 +458,7 @@ Calculator::ComputeDurationFromCost(Configuration *cfg,
                                                         arg(cost).arg(nettoParktimeForCost);
 
     int cnt = 0;
-    while (++cnt < 10 && netto_parking_time_in_minutes < nettoParktimeForCost) {
+    while (++cnt < 1000 && netto_parking_time_in_minutes < nettoParktimeForCost) {
         // qCritical() << __func__ << ":" << __LINE__ << "cnt [" << cnt;
 
         brutto_parking_time_in_minutes = free_parking_time_in_minutes + netto_parking_time_in_minutes;
@@ -555,21 +555,19 @@ Calculator::ComputeDurationFromCost(Configuration *cfg,
                        .arg(free_parking_time_in_minutes);
 
         if (std::optional<ATBTariffCarryOver> co = getCarryOver(cfg, dt)) {
-            int minutes = co.value().computeMinutesUntilCarryOverEnd(dt);
+            TimeRange const &carryOverTimeRange = co.value().m_range;
-            if (minutes > 0) {
+            free_parking_time_in_minutes += carryOverTimeRange.m_duration;
-                free_parking_time_in_minutes += minutes;
 
-                brutto_parking_time_in_minutes = free_parking_time_in_minutes + netto_parking_time_in_minutes;
+            brutto_parking_time_in_minutes = free_parking_time_in_minutes + netto_parking_time_in_minutes;
-                dt = inputDate.addSecs(brutto_parking_time_in_minutes * 60);
+            dt = inputDate.addSecs(brutto_parking_time_in_minutes * 60);
-                weekDay = dt.date().dayOfWeek();
+            weekDay = dt.date().dayOfWeek();
 
-                qCritical() << __func__ << ":" << __LINE__ << QString("%1 (%2): brutto: %3 = netto: %4 + free: %5")
+            qCritical() << __func__ << ":" << __LINE__ << QString("%1 (%2): brutto: %3 = netto: %4 + free: %5")
-                               .arg(dt.toString(Qt::ISODate))
+                           .arg(dt.toString(Qt::ISODate))
-                               .arg(weekDay)
+                           .arg(weekDay)
-                               .arg(brutto_parking_time_in_minutes)
+                           .arg(brutto_parking_time_in_minutes)
-                               .arg(netto_parking_time_in_minutes)
+                           .arg(netto_parking_time_in_minutes)
-                               .arg(free_parking_time_in_minutes);
+                           .arg(free_parking_time_in_minutes);
-            }
         }
 
         if (std::optional<ATBTariffService> serv = getService(cfg, dt)) {
@@ -579,8 +577,6 @@ Calculator::ComputeDurationFromCost(Configuration *cfg,
                 int rest_parking_time_in_minutes = nettoParktimeForCost - netto_parking_time_in_minutes;
                 ATBTime t(dt.time().hour(), dt.time().minute(), 0, 0);
                 int timeToServiceEnd = t.secsTo(serviceTimeRange.m_end.toString(Qt::ISODate)) / 60;
-
-                // TODO: wohl aehnlich wie carry-over zu behandlen
                 if (serviceTimeRange.m_duration > 0) {
                     if (timeToServiceEnd < rest_parking_time_in_minutes) {
                         netto_parking_time_in_minutes += timeToServiceEnd;
@@ -605,41 +601,20 @@ Calculator::ComputeDurationFromCost(Configuration *cfg,
         // qCritical() << __func__ << ":" << __LINE__ << "cnt" << cnt << "]";
     }
 
-    if (cnt >= 10) {
+    if (cnt >= 1000) {
         qCritical() << __func__ << ":" << __LINE__ << "BREAK";
     }
 
     // configure if last carry-over ranges shall be added to ticket-end-time
-    dt = inputDate.addSecs(brutto_parking_time_in_minutes * 60);
-
     cnt = 0;
-    QVector<TimeRange> timeRanges;
+    while (std::optional<ATBTariffCarryOver> co = getCarryOver(cfg, inputDate.addSecs(brutto_parking_time_in_minutes * 60))) {
-    while (std::optional<ATBTariffCarryOver> co = getCarryOver(cfg, dt)) {
+        if (++cnt > 5) {
-        if (++cnt > 10) {
+            qCritical() << __func__ << ":" << __LINE__ << "BREAK";
             break;
         }
         TimeRange const &carryOverTimeRange = co.value().m_range;
-        if (!timeRanges.isEmpty()) {
+        free_parking_time_in_minutes += carryOverTimeRange.m_duration;
-            if (timeRanges.last().m_end != carryOverTimeRange.m_start) {
+        brutto_parking_time_in_minutes = free_parking_time_in_minutes + netto_parking_time_in_minutes;
-                break;
-            }
-        }
-        timeRanges.push_back(carryOverTimeRange);
-
-        int minutes = co.value().computeMinutesUntilCarryOverEnd(dt);
-        if (minutes > 0) {
-            free_parking_time_in_minutes += co.value().computeMinutesUntilCarryOverEnd(dt);
-            brutto_parking_time_in_minutes = free_parking_time_in_minutes + netto_parking_time_in_minutes;
-
-            qCritical() << __func__ << ":" << __LINE__ << QString("%1 (%2): brutto: %3 = netto: %4 + free: %5")
-                           .arg(dt.toString(Qt::ISODate))
-                           .arg(weekDay)
-                           .arg(brutto_parking_time_in_minutes)
-                           .arg(netto_parking_time_in_minutes)
-                           .arg(free_parking_time_in_minutes);
-
-            dt = inputDate.addSecs(brutto_parking_time_in_minutes * 60);
-        } else break;
     }
 
     brutto_parking_time_in_minutes = free_parking_time_in_minutes + netto_parking_time_in_minutes;

main/main.cpp

@@ -39,11 +39,11 @@ extern "C" char* strptime(const char* s,
 
 #define SZEGED                                  (0)
 #define SCHOENAU_KOENIGSEE                      (0)
-#define NEUHAUSER_KORNEUBURG                    (1)
+#define NEUHAUSER_KORNEUBURG                    (0)
 #define NEUHAUSER_LINSINGER_MASCHINENBAU        (0)
 #define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (0)
 #define NEUHAUSER_BILEXA_GALTUER                (0)
-#define BAD_NEUENAHR_AHRWEILER                  (0)
+#define BAD_NEUENAHR_AHRWEILER                  (1)
 #define NEUHAUSER_CHRISTOPH_REISEN              (0)
 #define NEUHAUSER_PERNEGG_AN_DER_MUR            (0)
 #define NEUHAUSER_STOCKERAU                     (0)
@@ -52,7 +52,6 @@ extern "C" char* strptime(const char* s,
 #define SCHNALS_LEITER_KIRCHL                   (0)
 #define SCHNALS_STAUMAUER                       (SCHNALS_LEITER_KIRCHL)
 #define VALSER_ALM                              (0)
-#define NEUHAUSER_FORCHACH                      (0)
 
 #if NEUHAUSER_KIRCHDORF==1
 static bool test_neuhauser_kirchdorf(int step, double cost) {
@@ -1387,29 +1386,6 @@ int main() {
             }
         }
 
-#endif
-#if NEUHAUSER_FORCHACH==1
-    std::ifstream input;
-    input.open("/opt/ptu5/opt/customer_749/etc/psa_tariff/tariff01.json");
-
-    std::stringstream sstr;
-    while(input >> sstr.rdbuf());
-    std::string json(sstr.str());
-
-    Configuration cfg;
-
-    bool isParsed = cfg.ParseJson(&cfg, json.c_str());
-    cout << endl;
-
-    if (isParsed) {
-        compute_product_price(&cfg, PermitType(PERMIT_TYPE::DAY_TICKET_PKW));
-        compute_product_price(&cfg, PermitType(PERMIT_TYPE::DAY_TICKET_CAMPER));
-
-        QDateTime start = QDateTime::currentDateTime();
-        QDateTime ticketEndTime;
-        compute_duration_for_daily_ticket(&cfg, start, ticketEndTime, PermitType(PERMIT_TYPE::DAY_TICKET));
-    }
-
 #endif
 #if BAD_NEUENAHR_AHRWEILER==1
     std::ifstream input;
@@ -2804,62 +2780,24 @@ int main() {
             bool nextDay = false;
             bool prePaid = true;
             // zone 1 (lila)
-            QDateTime s(QDate(2024, 10, 8), QTime());
+            QDateTime s(QDate(2023, 11, 30), QTime());
             QDateTime end;
-
-            static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
-            qCritical() << "TimeSteps" << timeSteps;
-
             for (int duration = 30; duration <= pop_max_time; duration += 5) {
-                int offset = 600;
+                for (int offset = 420; offset < 1140; ++offset) {
-                //for (int offset = 720; offset < 601; ++offset) {
+                    if (offset > 720 && offset < 840) {
-                    //if (offset > 720 && offset < 840) {
+                        continue;
-                    //    continue;
+                    }
-                    //}
                     QDateTime start = s.addSecs(offset * 60);
                     //qCritical() << "start" << start.toString(Qt::ISODate);
 
-                    CalcState cs;
+                    double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, start, end, duration, nextDay, prePaid);
-#if 1
-                    struct price_t costs;
-                    for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
-                        QDateTime end = start.addSecs(timeSteps.at(i)*60);
-
-                        // if (i != 2) continue;
-
-                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
-                        int price1 = costs.netto;
-
-                        qCritical() << "compute_price_for_parking_ticket()/GetCostFromDuration() TIME: "
-                                    << timeSteps.at(i) << "ZZZZZZZZZZZZZ PRICE=" << price1 << "end=" << end.toString(Qt::ISODate);
-                    }
-                    exit(0);
-#else
-
-                    double cost = 360;
-                    qCritical() << "XXXXXXXX START" << start.toString(Qt::ISODate) << "cost" << cost;
-                    QDateTime end;
-
-                    cs = compute_duration_for_parking_ticket(&cfg, start, cost, end,
-                                                             PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
-                        qCritical() << __LINE__ << cs.toString()
-                                    << "START" << start.toString(Qt::ISODate)
-                                    << "<duration" << start.secsTo(end) / 60
-                                    << "cost" << cost
-                                    << "> end" << end.toString(Qt::ISODate);
-                    //}
-
-                    exit(0);
-#endif
-
-                    //double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, start, end, duration, nextDay, prePaid);
                     //Q_ASSERT(cost == duration*2.5);
                     //qCritical() << "";
-                    //qCritical() << "start" << start.toString(Qt::ISODate)
+                    qCritical() << "start" << start.toString(Qt::ISODate)
-                    //            << "end" << end.toString(Qt::ISODate)
+                                << "end" << end.toString(Qt::ISODate)
-                    //            << "duration" << duration
+                                << "duration" << duration
-                    //            << "cost" << cost;
+                                << "cost" << cost;
-#if 0
+
                     switch(duration) {
                     case 30:
                         if (cost == 60.0) {
@@ -3023,17 +2961,15 @@ int main() {
                                     << "cost" << cost;
                         exit(-1);
                     }
-#endif
 
                     //std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg, 3, start.toString(Qt::ISODate).toStdString().c_str(), cost);
                     //Q_ASSERT(cost == duration*2.5);
                     //qCritical() << "start" << start.toString(Qt::ISODate)
                     //            << "cost" << cost
                     //            << "until" << duration.c_str() << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60;
-                //}
+                }
             }
 
-#if 0
             Configuration::SpecialDaysType specialDays = cfg.SpecialDays;
             for (Configuration::SpecialDaysType::const_iterator it = specialDays.cbegin();
                  it != specialDays.cend(); ++it) {
@@ -3054,7 +2990,7 @@ int main() {
                             << "duration" << duration
                             << "cost" << cost;
             }
-#endif
+
         }
     }
     return 0;