Compare commits

..

No commits in common. "e9b10166d2b3e974973c65ea5e9321ab81f610d2" and "7679eb9481864973873f0d2078f77842f53fa248" have entirely different histories.

4 changed files with 86 additions and 76 deletions

View File

@ -13,8 +13,36 @@
using namespace std; using namespace std;
class Calculator { class Calculator {
QDateTime m_start;
mutable uint16_t m_timeStepCompensation = 0;
public: public:
explicit Calculator() = default; explicit Calculator() = default;
explicit Calculator(QDateTime const start) : m_start(start) {
m_start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
qCritical() << "init m_start time:" << m_start.toString(Qt::ISODate);
}
void setStartDateTime(QDateTime const &start) {
m_start = start;
m_start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
qCritical() << "set m_start time:" << m_start.toString(Qt::ISODate);
}
QDateTime const &getStartDateTime() const {
return m_start;
}
QDateTime &getStartDateTime() {
return m_start;
}
void setTimeStepCompensation(uint16_t timeStepCompensation) {
m_timeStepCompensation = timeStepCompensation;
}
uint16_t getTimeStepCompensation() const {
return m_timeStepCompensation;
}
/// <summary> /// <summary>
/// Gets duration in seconds from cost /// Gets duration in seconds from cost
@ -44,7 +72,7 @@ public:
// helper function to find time steps for a tariff with PaymentMethod::Steps // helper function to find time steps for a tariff with PaymentMethod::Steps
// (e.g. Schoenau/Koenigsee) // (e.g. Schoenau/Koenigsee)
// //
QList<int> GetTimeSteps(Configuration *cfg, quint64 startInMinutes = QDateTime::currentSecsSinceEpoch() / 60) const; QList<int> GetTimeSteps(Configuration *cfg) const;
QList<int> GetSteps(Configuration *cfg) const { return GetTimeSteps(cfg); } QList<int> GetSteps(Configuration *cfg) const { return GetTimeSteps(cfg); }
// additional helper functions // additional helper functions
@ -61,7 +89,7 @@ public:
} }
// testing public: // testing public:
//private: private:
// Introduced for PaymentMethod::Steps (e.g. Schoenau) // Introduced for PaymentMethod::Steps (e.g. Schoenau)
// For tariff of following structure: only steps, no special days, nonstop. // For tariff of following structure: only steps, no special days, nonstop.
uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, quint64 durationMinutes) const; uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, quint64 durationMinutes) const;

View File

@ -58,8 +58,7 @@ public:
/// <returns>Returns operation status bool (OK | FAIL) </returns> /// <returns>Returns operation status bool (OK | FAIL) </returns>
bool ParseJson(Configuration* cfg, const char* json); bool ParseJson(Configuration* cfg, const char* json);
ATBPaymentOption &getPaymentOptions(); ATBPaymentOption const &getPaymentOptions();
ATBPaymentOption const &getPaymentOptions() const;
QVector<ATBDailyTicket> const &getDailyTickets() const; QVector<ATBDailyTicket> const &getDailyTickets() const;
private: private:

View File

@ -695,86 +695,72 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
cost, Ticket::s[VALID]); cost, Ticket::s[VALID]);
} }
QList<int> Calculator::GetTimeSteps(Configuration *cfg, quint64 startInMinutes) const { QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
static QList<int> timeSteps; QList<int> timeSteps;
if (timeSteps.size() == 0) { int const pop_id = cfg->getPaymentOptions().pop_id;
int const pop_id = cfg->getPaymentOptions().pop_id; int const pop_carry_over = cfg->getPaymentOptions().pop_carry_over;
int const pop_carry_over = cfg->getPaymentOptions().pop_carry_over; int const pop_time_step_config = cfg->getPaymentOptions().pop_time_step_config;
int const pop_time_step_config = cfg->getPaymentOptions().pop_time_step_config;
qCritical() << " payment option id:" << pop_id; if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) {
qCritical() << " payment option carry over:" << pop_carry_over; if (pop_carry_over) {
qCritical() << "payment option time step config:" << pop_time_step_config; int const pop_carry_over_time_range_id = cfg->getPaymentOptions().pop_carry_over_time_range_id;
QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from;
QTime const carryOverTimeRangeTo = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_to;
if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) { if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
QDateTime start; if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
start.setSecsSinceEpoch(startInMinutes * 60); for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
uint16_t timeStepCompensation = 0; int const durationId = itr->second.pra_payment_unit_id;
auto search = cfg->Duration.find(durationId);
if (search != cfg->Duration.end()) {
ATBDuration duration = search->second;
if (durationId == 1) {
//duration.pun_duration_min = search->second.pun_duration_min;
//duration.pun_duration_max = search->second.pun_duration_max;
if (pop_carry_over) { QDateTime carryOver = m_start;
int const pop_carry_over_time_range_id = cfg->getPaymentOptions().pop_carry_over_time_range_id; carryOver = carryOver.addDays(1);
QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from; carryOver.setTime(QTime(0, 0, 0));
QTime const carryOverTimeRangeTo = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_to;
if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00 int const timeStep = std::ceil(m_start.secsTo(carryOver) / 60.0);
if (carryOverTimeRangeFrom == QTime(0, 0, 0)) { if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) { qCritical()
int const durationId = itr->second.pra_payment_unit_id; << QString("ERROR timeStep (%1) < durationMin (%2) || timeStep (%3)) > durationMax (%4)")
auto search = cfg->Duration.find(durationId); .arg(timeStep).arg(duration.pun_duration_min)
if (search != cfg->Duration.end()) { .arg(timeStep).arg(duration.pun_duration_max);
ATBDuration duration = search->second; break;
if (durationId == 1) {
QDateTime carryOver = start;
carryOver = carryOver.addDays(1);
carryOver.setTime(QTime(0, 0, 0));
int const timeStep = std::ceil(start.secsTo(carryOver) / 60.0);
if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
qCritical()
<< QString("ERROR timeStep (%1) < durationMin (%2) || timeStep (%3)) > durationMax (%4)")
.arg(timeStep).arg(duration.pun_duration_min)
.arg(timeStep).arg(duration.pun_duration_max);
break;
}
qCritical() << "configured minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
// set dynamic minimal parking time
cfg->getPaymentOptions().pop_min_time = timeStep;
qCritical() << " computed minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
duration.pun_duration = timeStep;
timeStepCompensation = duration.pun_duration_max - duration.pun_duration;
timeSteps << duration.pun_duration;
} else {
duration.pun_duration = duration.pun_duration_max - timeStepCompensation;
timeSteps << duration.pun_duration;;
} }
duration.pun_duration = timeStep;
cfg->Duration.erase(search); m_timeStepCompensation = duration.pun_duration_max - duration.pun_duration;
cfg->Duration.insert(pair<int, ATBDuration>(duration.pun_id, duration)); timeSteps << duration.pun_duration;
} else {
} else { // if (search != cfg->Duration.end()) { duration.pun_duration = duration.pun_duration_max - m_timeStepCompensation;
// TODO timeSteps << duration.pun_duration;;
} }
cfg->Duration.erase(search);
cfg->Duration.insert(pair<int, ATBDuration>(duration.pun_id, duration));
} else { // if (search != cfg->Duration.end()) {
// TODO
} }
} else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
// TODO
} }
} else { // if (carryOverTimeRangeFrom == carryOverTimeRangeTo) { } else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
// TODO // TODO
} }
} else { // if (pop_carry_over) { } else { // if (carryOverTimeRangeFrom == carryOverTimeRangeTo) {
// TODO // TODO
} }
} else { } else { // if (pop_carry_over) {
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) // TODO
{ }
int const durationId = itr->second.pra_payment_unit_id; } else {
int const durationUnit = cfg->Duration.find(durationId)->second.pun_duration; for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
timeSteps << durationUnit; {
} int const durationId = itr->second.pra_payment_unit_id;
int const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
timeSteps << durationUnit;
} }
} }

View File

@ -442,10 +442,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
ATBPaymentOption const &Configuration::getPaymentOptions() const { const ATBPaymentOption & Configuration::getPaymentOptions()
return this->currentPaymentOptions; {
}
ATBPaymentOption &Configuration::getPaymentOptions() {
return this->currentPaymentOptions; return this->currentPaymentOptions;
} }