From 36478e111eb5e96da17e550114dcfb58f0ab38c4 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 24 Nov 2023 13:23:59 +0100 Subject: [PATCH] start changes for neuhauser --- .../include/mobilisis/calculator_functions.h | 2 +- library/include/mobilisis/tariff_time_range.h | 21 +- library/src/calculator_functions.cpp | 306 +++++++++--------- main/main.cpp | 11 +- 4 files changed, 168 insertions(+), 172 deletions(-) diff --git a/library/include/mobilisis/calculator_functions.h b/library/include/mobilisis/calculator_functions.h index 413429b..f1b3eb9 100644 --- a/library/include/mobilisis/calculator_functions.h +++ b/library/include/mobilisis/calculator_functions.h @@ -27,7 +27,7 @@ public: /// Date/time of park end to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z) /// Duration of parking in minutes /// Returns cost (data type: double) - double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, const QDateTime start_datetime, QDateTime & end_datetime, double durationMin, bool nextDay = false, bool prepaid = false); + double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, const QDateTime start_datetime, QDateTime & end_datetime, int durationMin, bool nextDay = false, bool prepaid = false); // Daily ticket QDateTime GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over); diff --git a/library/include/mobilisis/tariff_time_range.h b/library/include/mobilisis/tariff_time_range.h index 55243e2..8bca48e 100644 --- a/library/include/mobilisis/tariff_time_range.h +++ b/library/include/mobilisis/tariff_time_range.h @@ -1,17 +1,28 @@ -// #pragma once #ifndef TARIFF_TIME_RANGE_H_INCLUDED #define TARIFF_TIME_RANGE_H_INCLUDED -#include +#include /// /// Time range definition /// class TariffTimeRange { + QTime m_time_from; + QTime m_time_until; + public: - time_t time_from; - time_t time_to; - TariffTimeRange() : time_from(0), time_to(0) {} + + TariffTimeRange() + : m_time_from(QTime()) + , m_time_until(QTime()) {} + + void setTimeRange(QTime const& from, QTime const &until) { + m_time_from = from; + m_time_until = until; + } + + QTime const &getTimeFrom() const { return m_time_from; } + QTime const &getTimeUntil() const { return m_time_until; } }; #endif // TARIFF_TIME_RANGE_H_INCLUDED diff --git a/library/src/calculator_functions.cpp b/library/src/calculator_functions.cpp index 65b7a9c..7e505fc 100644 --- a/library/src/calculator_functions.cpp +++ b/library/src/calculator_functions.cpp @@ -2,10 +2,13 @@ #include "payment_option.h" #include "utilities.h" #include "tariff_log.h" +#include "tariff_time_range.h" #include +#include #include -#include +#include +#include double total_duration_min = 0.0f; double total_cost = 0.0f; @@ -386,86 +389,71 @@ uint32_t Calculator::GetCostFromDuration(Configuration * cfg, /////////////////////////////////////// /// -double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_option, const QDateTime start_datetime, QDateTime & end_datetime, double durationMin, bool nextDay, bool prepaid) +double Calculator::GetCostFromDuration(Configuration* cfg, + uint8_t payment_option, + const QDateTime start_datetime, + QDateTime &end_datetime, + int durationMinutes, + bool nextDay, + bool prepaid) { if (cfg->YearPeriod.size() == 0 && cfg->SpecialDays.size() == 0 && cfg->SpecialDaysWorktime.size() == 0) { - end_datetime = start_datetime.addSecs(durationMin*60); + end_datetime = start_datetime.addSecs(durationMinutes*60); return GetCostFromDuration(cfg, start_datetime, end_datetime); } + //Get min and max time defined in JSON + static int const minMin = std::max((int)cfg->PaymentOption.find(payment_option)->second.pop_min_time, 0); + static int const maxMin = std::max((int)cfg->PaymentOption.find(payment_option)->second.pop_max_time, 0); + + static const bool checkMinMaxMinutes = [](int minMin, int maxMin){ return (minMin < maxMin) ? true : false; }(minMin, maxMin); + + if (!checkMinMaxMinutes) { + qCritical() << QString("ERROR: CONDITION minMin < maxMin (%1 < %2) IS NOT VALID").arg(minMin).arg(maxMin); + return 0.0; + } + // Get input date QDateTime inputDate = start_datetime; // Get day of week - int weekdayId = 0; - weekdayId = Utilities::ZellersAlgorithm(inputDate.date().day(),inputDate.date().month(),inputDate.date().year()); + int const weekdayId = inputDate.date().dayOfWeek(); - //Get min and max time defined in JSON - double minMin = 0; - minMin = cfg->PaymentOption.find(payment_option)->second.pop_min_time; - - double maxMin = 0; - maxMin = cfg->PaymentOption.find(payment_option)->second.pop_max_time; - - if (minMin < 0) minMin = 0; - if (maxMin < 0) maxMin = 0; - if (minMin >= maxMin) - { - LOG_ERROR("Error: min_min cannot be greater or equal to max_min"); - return 0.0f; - } - if (maxMin <= minMin) - { - LOG_ERROR("Error: max_min cannot be lower or equal than min_min"); - return 0.0f; - } + // weekdayId = Utilities::ZellersAlgorithm(inputDate.date().day(),inputDate.date().month(),inputDate.date().year()); // Check overtime - if (!overtime) - { - if (durationMin > maxMin) - { - LOG_WARNING("Total duration is greater or equal to max_min"); + if (!overtime) { + if (durationMinutes > maxMin) { + qWarning() << QString("Total duration >= max_min (%1 >= %2)").arg(durationMinutes).arg(maxMin); return maxMin; } - if (durationMin < minMin) - { - LOG_WARNING("Total duration is lower or equal to min_min"); + if (durationMinutes < minMin) { + qWarning() << QString("Total duration <= minMin (%1 <= %2)").arg(durationMinutes).arg(minMin); return 0.0f; } } - // Get payment method - uint8_t p_method = PaymentMethod::Undefined; - p_method = payment_option; - LOG_DEBUG("Payment method id: ", (unsigned)p_method); - - // Check special day - double day_price = 0.0f; + double day_price = 0.0; int current_special_day_id = -1; - bool is_special_day = Utilities::CheckSpecialDay(cfg, inputDate.toString(Qt::ISODate).toStdString().c_str(), ¤t_special_day_id, &day_price); - LOG_DEBUG("Special day: ", is_special_day); - - total_duration_min = durationMin; - LOG_DEBUG("Total min:", total_duration_min); - double price_per_unit = 0.0f; - QTime worktime_from; - QTime worktime_to; - if(is_special_day) - { + int const timeRanges = std::max((int)cfg->WeekDaysWorktime.count(weekdayId), 1); + QScopedArrayPointer worktime(new TariffTimeRange[timeRanges]); + int index = 0; + + if(Utilities::CheckSpecialDay(cfg, + inputDate.toString(Qt::ISODate).toStdString().c_str(), + ¤t_special_day_id, + &day_price)) { // Set special day price price_per_unit = Utilities::CalculatePricePerUnit(day_price); - worktime_from = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_from.c_str()); - worktime_to = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_to.c_str()); - } - else - { + worktime[index].setTimeRange(QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_from.c_str()), + QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_to.c_str())); + } else { // Set new price for the normal day int pop_id = cfg->PaymentOption.find(payment_option)->second.pop_id; @@ -476,125 +464,119 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio price_per_unit = Utilities::CalculatePricePerUnit(day_price,durationUnit); // If no working day found, skip it (recursively call method again) - size_t found = 0; - found = cfg->WeekDaysWorktime.count(weekdayId); - - // When no workday found, go to next available day - if(found <=0) - { - LOG_DEBUG("- No workday found, trying to find next available day"); + if (cfg->WeekDaysWorktime.count(weekdayId) <= 0) { + // When no workday found, go to next available day + qDebug() << "No workday found, trying to find next available day"; inputDate = inputDate.addDays(1); - return floor(GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, durationMin, true, prepaid)); + return floor(GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, durationMinutes, true, prepaid)); + } + + for (auto[itr, rangeEnd] = cfg->WeekDaysWorktime.equal_range(weekdayId); itr != rangeEnd; ++itr) { + qCritical() << itr->first << itr->second.pwd_time_from.c_str() << itr->second.pwd_time_to.c_str(); + worktime[index].setTimeRange(QTime::fromString(itr->second.pwd_time_from.c_str()), + QTime::fromString(itr->second.pwd_time_to.c_str())); + index += 1; } - worktime_from = QTime::fromString(cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_from.c_str()); - worktime_to = QTime::fromString(cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_to.c_str()); } if (price_per_unit < 0) price_per_unit = 1.0f; - LOG_DEBUG("Calculated price per minute: ", price_per_unit); + qDebug() << "Calculated price per minute=" << price_per_unit; - if (price_per_unit == 0) - { - inputDate = inputDate.addDays(1); - inputDate.setTime(worktime_from); - return GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, durationMin, true, prepaid); - } + double costFromDuration = 0.0; + for (int w = 0; w < index; ++w) { + QTime worktime_from = worktime[w].getTimeFrom(); + QTime worktime_to = worktime[w].getTimeUntil(); - // If overtime flag is set - if (overtime || nextDay) - { - inputDate.setTime(worktime_from); - overtime = false; - } - - // Check prepaid - if (!prepaid) - { - if ((inputDate.time() < worktime_from) || (inputDate.time() > worktime_to)) - { - LOG_DEBUG("[STOP] * Ticket is not valid * "); - return 0.0f; - } - } - else - { - LOG_DEBUG("* PREPAID MODE ACTIVE *"); - if (inputDate.time() < worktime_from) - { - inputDate.setTime(worktime_from); - } - else if(inputDate.time() > worktime_to) - { - LOG_DEBUG(" *** PREPAID *** Current time is past the time range end, searching for next available day"); + if (price_per_unit == 0) { inputDate = inputDate.addDays(1); - return GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, durationMin, true, prepaid); + inputDate.setTime(worktime_from); + double const partialCost = GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, durationMinutes, true, prepaid); + if (partialCost <= __DBL_MIN__) { + return 0.0; + } + costFromDuration += partialCost; + continue; } - } - while(true) - { - if(total_duration_min <= 0) break; + // If overtime flag is set + if (overtime || nextDay) { + inputDate.setTime(worktime_from); + overtime = false; + } - // Check year period - bool isYearPeriodActive = false; - - //// Parse input date - int dayCurrent = inputDate.date().day(); - int monthCurrent = inputDate.date().month(); - - // Current date time - int cdt = (monthCurrent * 100) + dayCurrent; - - multimap::iterator year_period_itr; - for (year_period_itr = cfg->YearPeriod.begin(); year_period_itr != cfg->YearPeriod.end(); ++year_period_itr) - { - int dStart = year_period_itr->second.pye_start_day; - int dEnd = year_period_itr->second.pye_end_day; - - int mStart = year_period_itr->second.pye_start_month; - int mEnd = year_period_itr->second.pye_end_month; - - int start = (mStart * 100) + dStart; - int end = (mEnd * 100) + dEnd; - - if (cdt >= start && cdt <= end) { - isYearPeriodActive = true; - break; + // Check prepaid + if (!prepaid) { + if ((inputDate.time() < worktime_from) || (inputDate.time() > worktime_to)) { + qDebug() << "[STOP] * Ticket is not valid * "; + return 0.0f; + } + } else { + qDebug() << "* PREPAID MODE ACTIVE *"; + if (inputDate.time() < worktime_from) { + inputDate.setTime(worktime_from); + } else if(inputDate.time() > worktime_to) { + qDebug() << " *** PREPAID *** Current time is past the time range end, searching for next available day"; + inputDate = inputDate.addDays(1); + double const partialCost = GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, durationMinutes, true, prepaid); + if (partialCost < __DBL_MIN__) { + return 0.0; + } + costFromDuration += partialCost; + continue; } } - if (!isYearPeriodActive) - { - LOG_DEBUG("Year period is not valid"); - return 0.0f; + + while(durationMinutes > 0) { + // Check for active year period + if (std::none_of(cfg->YearPeriod.begin(), + cfg->YearPeriod.end(), + [&inputDate](std::pair const &year) { + QDate const input(2004, // 2004 is a leap year + inputDate.date().month(), + inputDate.date().day()); + QDate const s(2004, year.second.pye_start_day, year.second.pye_start_month); + QDate const e(2004, year.second.pye_end_day, year.second.pye_end_month); + return (input >= s && input <= e); + })) { + qCritical() << "NO VALID YEAR PERIOD"; + return 0.0; + } + + // Go to next day if minutes not spent + if(inputDate.time() >= worktime_to) { + // check for carry_over status + if (cfg->PaymentOption.find(payment_option)->second.pop_carry_over < 1) { + break; + } + + qDebug() << "Reached end of worktime, searching for the next working day"; + + inputDate = inputDate.addDays(1); + overtime = true; + double const partialCost = GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, durationMinutes); + if (partialCost < __DBL_EPSILON__) { + return 0.0; + } + costFromDuration += partialCost; + break; // stop while, and continue in outer loop + } else { + // Increment input date minutes for each monetary unit + inputDate = inputDate.addSecs(60); + durationMinutes -= 1; + costFromDuration += price_per_unit; + } } - - int carry_over_status = 0; - carry_over_status = cfg->PaymentOption.find(payment_option)->second.pop_carry_over; - - // Go to next day if minutes not spent - if(inputDate.time() >= worktime_to) - { - if (carry_over_status < 1) break; - - LOG_DEBUG("Reached end of worktime, searching for the next working day"); - inputDate = inputDate.addDays(1); - overtime = true; - return GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, total_duration_min); - } - - // Increment input date minutes for each monetary unit - inputDate = inputDate.addSecs(60); - total_duration_min -=1; - total_cost += price_per_unit; - } - qDebug() << "GetCostFromDuration(): Valid until:" << inputDate.toString(Qt::ISODate).toStdString().c_str(); + + qDebug() << "GetCostFromDuration(): Valid until:" << inputDate.toString(Qt::ISODate); end_datetime = inputDate; - double ret_val = total_cost; - total_cost = 0.0f; - return ceil(ret_val); + //double ret_val = total_cost; + //total_cost = 0.0f; + //return ceil(ret_val); + + return ceil(costFromDuration); } @@ -637,19 +619,23 @@ uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep) const uint32_t Calculator::GetDurationForPrice(Configuration *cfg, int price) const { int const pop_id = cfg->getPaymentOptions().pop_id; + uint32_t duration = 0; for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) { - int const payment_unit_id = itr->second.pra_payment_unit_id; + int const durationId = itr->second.pra_payment_unit_id; int const pra_price = itr->second.pra_price; - if (price == pra_price) { - int const durationId = itr->second.pra_payment_unit_id; - int const durationUnit = cfg->Duration.find(durationId)->second.pun_duration; + uint32_t const durationUnit = cfg->Duration.find(durationId)->second.pun_duration; + if (pra_price == price) { return durationUnit; } + + if (pra_price < price) { + duration = durationUnit; + } } - return 0; + return duration; } diff --git a/main/main.cpp b/main/main.cpp index b315a34..566a0d6 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -36,7 +36,7 @@ extern "C" char* strptime(const char* s, int main() { - std::ifstream input(QDir::homePath().append("/tariff01.json").toStdString()); + std::ifstream input("/tmp/tariff_korneuburg.json"); std::stringstream sstr; while(input >> sstr.rdbuf()); std::string json(sstr.str()); @@ -47,14 +47,12 @@ int main() { bool isParsed = cfg.ParseJson(&cfg, json.c_str()); cout << endl; - char const *startDate = ""; if (isParsed) { - startDate = "2023-05-10T13:52:18.665Z"; - std::string duration = calculator.GetDurationFromCost(&cfg, 3, (char *)startDate, 33, false, true); - cout << "---> startDate " << startDate << " _price_ = " << 33 - << " Total duration is: " << duration << endl; + QDateTime start = QDateTime::fromString("2023-05-11T08:00:00",Qt::ISODate); + QDateTime end = start.addSecs(120); + calculator.GetCostFromDuration(&cfg, 3, start, end, 60); } return 0; @@ -69,6 +67,7 @@ int main() { if (init_tariff(&tariff, "/etc/psa_tariff/")) { struct price_t price; memset(&price, 0x00, sizeof(price)); + QDateTime start = QDateTime::fromString("2023-05-11T07:50:00",Qt::ISODate); //QDateTime::currentDateTime(); time_t start_parking_time = start.toSecsSinceEpoch() / 60; time_t end_parking_time = start_parking_time + 615;