tests for galtuer

library/include/mobilisis/calculator_functions.h

@@ -91,7 +91,7 @@ public:
     // helper function to find time steps for a tariff with PaymentMethod::Steps
     // (e.g. Schoenau/Koenigsee)
     //
-    QList<int> GetTimeSteps(Configuration *cfg, int paymentOptionIndex=0) const;
+    QList<int> &GetTimeSteps(Configuration *cfg, int paymentOptionIndex=0) const;
     QList<int> GetSteps(Configuration *cfg, int paymentOptionIndex=0) const { return GetTimeSteps(cfg, paymentOptionIndex); }
 
     QList<int> GetPriceSteps(Configuration *cfg) const;

library/src/calculate_price.cpp

@@ -344,7 +344,7 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
     qCritical() << "   compute_next_timestep()     currentTimeMinutes: " << currentTimeMinutes;
     qCritical() << "   compute_next_timestep() up/down (1=up, 0=down): " << UpDown;
 
-    Configuration *cfg = tariff;
+    Configuration const *cfg = tariff;
 
     // compute payment method id (e.g. Linear=3, Steps=4)
     PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
@@ -372,71 +372,39 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
         // progressive tariff: e.g. Neuhauser, Kirchdorf (743)
         (paymentMethodId == PaymentMethod::Progressive))
     {
-        QVector<QList<int>> stepListVec;
+        QList<int> &stepList = Calculator::GetInstance().GetTimeSteps(tariff);
-        QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(tariff);
+        int const size = stepList.size();
-
+        if (size == 0) {
-        qCritical() << "   compute_next_timestep() time-steps: " << timeSteps;
+            qCritical() << "compute_next_timestep() *ERROR empty step-list*";
-
-        int paymentOptionIndex = 0;
-        int const pop_time_step_config = tariff->getPaymentOptions(paymentOptionIndex).pop_time_step_config;
-
-        if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) {
-            QList<int> lst;
-            for (int index = 0; index < 5; ++index) {
-                lst.clear();
-                QListIterator<int> i(timeSteps);
-                while (i.hasNext()) {
-                    switch (index) {
-                    case 0:
-                        lst.append(i.next());
-                    break;
-                    case 1:
-                        lst.append(i.next() - 2);
-                    break;
-                    case 2:
-                        lst.append(i.next() - 1);
-                    break;
-                    case 3:
-                        lst.append(i.next() + 1);
-                    break;
-                    case 4:
-                        lst.append(i.next() + 2);
-                    break;
-                    default:;
-                    }
-                }
-                qCritical() << "   compute_next_timestep() " << index << "list of time-steps" << lst;
-                stepListVec.append(lst);
-            }
-        }
-
-        int stepListIndex = -1;
-
-        for (int index = 0; index < stepListVec.size(); ++index) {
-            if (stepListVec[index].indexOf(currentTimeMinutes) != -1) {
-                stepListIndex = index;
-                break;
-            }
-        }
-
-        if (stepListIndex == -1) {
-            qCritical() << "compute_next_timestep() *NO STEP INDEX* for currentTimeMinutes (" << currentTimeMinutes << ")";
             return  currentTimeMinutes;
         }
 
-        QList<int> const &stepList = stepListVec[stepListIndex];
+        qCritical() << "   compute_next_timestep()      first time step:" << stepList[0];
-        qCritical() << "   compute_next_timestep()         index:" << stepListIndex;
         qCritical() << "   compute_next_timestep()            timeSteps:" << stepList;
+        qCritical() << "   compute_next_timestep() currentTimeInMinutes:" << currentTimeMinutes;
 
-        int const currentStepIndex = stepList.indexOf(currentTimeMinutes); // must be currentStepIndex != -1
+        // consider time shift: the step-list might have been computed at a
+        // slightly different time point
+        int maxStep = -1;
+        if (size >= 2) {
+            maxStep = stepList[1] - stepList[0];
+        }
+        int tolerance = (maxStep == -1) ? 5 : std::min(maxStep, 5);
+        if (std::abs(stepList[0] - currentTimeMinutes) <= tolerance) {
+            qCritical().noquote()
+                << QString("   compute_next_timestep() correction stepList[0]=%1 -> %2:")
+                                    .arg(stepList[0]).arg(currentTimeMinutes);
+            stepList[0] = currentTimeMinutes;
+            qCritical() << "   compute_next_timestep()        NEW timeSteps:" << stepList;
+        }
+
+        int currentStepIndex = stepList.indexOf(currentTimeMinutes);
 
         if (currentStepIndex == -1) {
             qCritical() << "compute_next_timestep() *NO STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
             return  currentTimeMinutes;
         }
 
-        cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = stepList.first();
-
         if (UpDown == 1) { // UP
             if (stepList[currentStepIndex] == stepList.last()) {
                 qCritical() << "compute_next_timestep() *NO NEXT STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";

library/src/calculator_functions.cpp

@@ -2090,21 +2090,17 @@ QList<int> Calculator::GetPriceSteps(Configuration * /*cfg*/) const {
     return QList<int>();
 }
 
-QList<int> Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex) const {
+QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex) const {
-    qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << cfg << "paymentOptionIndex:" << paymentOptionIndex;
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ")              paymentOptionIndex:" << paymentOptionIndex;
 
     if (m_timeSteps.size() > paymentOptionIndex) {
-        qCritical() << __func__ << ":" << __LINE__ << ")" << "timeSteps:" << m_timeSteps[m_timeSteps.size() - 1];
+        if (!m_timeSteps[paymentOptionIndex].isEmpty()) {
-        qCritical() << __func__ << ":" << __LINE__ << ")" << "timeSteps:" << m_timeSteps;
+            return m_timeSteps[paymentOptionIndex];
-        qCritical() << __func__ << ":" << __LINE__ << ")" << "timeSteps size:" << m_timeSteps.size();
+        }
-        return m_timeSteps[m_timeSteps.size() - 1];
     } else {
         m_timeSteps.push_back(QList<int>());
-        qCritical() << __func__ << ":" << __LINE__ << ")" << "timeSteps:" << m_timeSteps;
     }
 
-    qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << "m_timeSteps:" << m_timeSteps;
-
     QDateTime start = QDateTime::currentDateTime();
     start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
 
@@ -2128,8 +2124,6 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex)
                 m_timeSteps[paymentOptionIndex].append(step);
             }
         } else {
-            qCritical() << "(" << __func__ << ":" << __LINE__ << ")";
-
             uint16_t timeStepCompensation = 0;
 
             if (pop_carry_over) {
@@ -2207,7 +2201,7 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex)
         }
     }
 
-    qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << "NEW timeSteps:" << m_timeSteps;
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ")                   NEW timeSteps:" << m_timeSteps;
 
     return m_timeSteps[paymentOptionIndex];
 }

main/main.cpp

@@ -2755,7 +2755,7 @@ int main() {
 #endif
 
 #if NEUHAUSER_BILEXA_GALTUER==1
-    std::ifstream input("/opt/ptu5/opt/customer_745/etc/psa_tariff/tariff01.json");
+    std::ifstream input("/home/linux/customer_745/etc/psa_tariff/tariff01.json");
 
     std::stringstream sstr;
     while(input >> sstr.rdbuf());
@@ -2781,9 +2781,6 @@ int main() {
         int nextStep = compute_next_timestep(&cfg, minParkTime + 1, 1);
         qCritical() << "nextStep" << nextStep;
 
-
-        return 0;
-
         QDateTime const start = QDateTime::currentDateTime();
         int paymentOptionIndex = cfg.getPaymentOptionIndex(start);