From 9438a535eaac5f9a27b1efe54b137e92d51ec6a9 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Wed, 31 Jan 2024 15:08:16 +0100
Subject: [PATCH] Only minor changes

---
 main/main.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/main/main.cpp b/main/main.cpp
index fae0277..3581cf5 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -136,9 +136,11 @@ int main() {
         QDateTime s(QDate(2023, 11, 30), QTime());
         QDateTime end;
         struct price_t price;
-        memset(&price, 0, sizeof(struct price_t));
         for (int offset = 480; offset < 1080; ++offset) {
             QDateTime start = s.addSecs(offset * 60);
+
+            // qCritical() << QString(Calculator::GetInstance().isParkingAllowed(&cfg, start));
+
             CalcState cs = compute_price_for_daily_ticket(&cfg, start, end,
                                                           PERMIT_TYPE::DAY_TICKET_ADULT, &price);
             qCritical() << "start=" << start.toString(Qt::ISODate)
@@ -156,13 +158,12 @@ int main() {
 #endif
 
 #if NEUHAUSER_LINSINGER_MASCHINENBAU==1
-    std::ifstream input("/tmp/tariff_linsinger_maschinenbau.json");
+    std::ifstream input("/opt/ptu5/opt/customer_741/etc/psa_tariff/tariff01.json");
 
     std::stringstream sstr;
     while(input >> sstr.rdbuf());
     std::string json(sstr.str());
 
-    Calculator calculator;
     Configuration cfg;
 
     bool isParsed = cfg.ParseJson(&cfg, json.c_str());
@@ -181,14 +182,14 @@ int main() {
                 QDateTime start = s.addSecs(offset * 60);
                 //qCritical() << "start" << start.toString(Qt::ISODate);
 
-                double cost = calculator.GetCostFromDuration(&cfg, 4, start, end, marken[duration], nextDay, prePaid);
+                double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 4, start, end, marken[duration], nextDay, prePaid);
                 //qCritical() << "";
                 //qCritical() << "start" << start.toString(Qt::ISODate)
                 //            << "end" << end.toString(Qt::ISODate)
                 //            << "duration" << marken[duration]
                 //            << "cost" << cost;
 
-                std::string d = calculator.GetDurationFromCost(&cfg, 4, start.toString(Qt::ISODate).toStdString().c_str(), cost);
+                std::string d = Calculator::GetInstance().GetDurationFromCost(&cfg, 4, start.toString(Qt::ISODate).toStdString().c_str(), cost);
                 qCritical() << "start" << start.toString(Qt::ISODate)
                             << "cost" << cost
                             << "until" << d.c_str() << start.secsTo(QDateTime::fromString(d.c_str(), Qt::ISODate)) / 60;