GerhardHoffmann/MOBILISIS-Calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

save experimental

Browse Source
This commit is contained in:
Gerhard Hoffmann
2024-07-21 20:58:12 +02:00
parent 977356040c
commit 3503306637
12 changed files with 849 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
library/src/calculator_functions.cpp
View File

@@ -107,7 +107,7 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
int diff = abs(inputDateTime.time().secsTo(worktime_to));
inputDateTime = inputDateTime.addSecs(diff);
//qDebug() << "Ticket is valid until: " << inputDateTime.toString(Qt::ISODate) << "price = " << daily_card_price << ", duration = " << diff / 60;
//qDebug() << "Ticket is valid until: " << inputDateTime.toString(Qt::ISODate) << "price = " << daily_card_price << ", duration = " << diff / 60;
return inputDateTime;
}
}
@@ -2106,7 +2106,8 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex)
}
QDateTime start = QDateTime::currentDateTime();
start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
//start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
start.setTime(QTime(7, start.time().minute(), 0));
int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
int const pop_carry_over = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over;
@@ -2136,10 +2137,22 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex)
if (pop_carry_over) {
int const pop_carry_over_time_range_id = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_time_range_id;
int const pop_carry_over_option_id = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_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;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") carry over time range id:" << pop_carry_over_time_range_id;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") carry over option id:" << pop_carry_over_time_range_id;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") carry over time from:" << carryOverTimeRangeFrom.toString(Qt::ISODate);
qCritical() << "(" << __func__ << ":" << __LINE__ << ") carry over time to:" << carryOverTimeRangeTo.toString(Qt::ISODate);
int weekDay = start.date().dayOfWeek();
QTime const carryOverStart = cfg->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
QTime const carryOverEnd = cfg->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_end;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") carry over start:" << carryOverStart.toString(Qt::ISODate);
qCritical() << "(" << __func__ << ":" << __LINE__ << ") carry over end:" << carryOverEnd.toString(Qt::ISODate);
// TODO: reparieren
if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
@@ -2189,14 +2202,26 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex)
m_timeSteps[paymentOptionIndex].clear();
std::optional<QDateTime> adaptedStart = cfg->adaptStart(start, pop_prepaid_option_id);
if (adaptedStart) {
start = adaptedStart.value();
std::optional<QDateTime> prepaidStart = cfg->prepaidStart(start, pop_prepaid_option_id);
// TODO: zusaetzlicher faktor falls vorkauf-option zieht
if (prepaidStart) {
start = prepaidStart.value();
qCritical() << "(" << __func__ << ":" << __LINE__ << ") prepaid adapted start:" << start.toString(Qt::ISODate);
} else {
// TODO
qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
}
QDateTime interpolationEnd;
std::optional<QDateTime> interpolationEndDate = cfg->getInterpolationEnd(start, paymentOptionIndex);
if (interpolationEndDate) {
interpolationEnd = interpolationEndDate.value();
qCritical() << "(" << __func__ << ":" << __LINE__ << ") interpolation end:" << interpolationEnd.toString(Qt::ISODate);
} else {
qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
}
int const start_time = start.time().hour() * 60 + start.time().minute();
QDateTime nextTimeStep = start;
for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
int const durationId = itr->second.pra_payment_unit_id;
@@ -2219,9 +2244,11 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex)
if (ipolCheck) {
ATBInterpolation interpolation = ipolCheck.value();
if (duration.pun_interpolation_id == (int)ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME) {
if (duration.pun_interpolation_id == (int)ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE) {
interpolation.dynamic_start = start.time();
interpolation.dynamic_start.setHMS(start.time().hour(), start.time().minute(), 0);
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id:" << duration.pun_id;
int const end_time = interpolation.dynamic_end.hour() * 60 + interpolation.dynamic_end.minute();
//qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_duration:" << duration.pun_duration;
@@ -2234,9 +2261,12 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex)
int pop_min_time = cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
int nextTimeStep = start_time + duration.pun_duration;
int rest = end_time - nextTimeStep;
if (nextTimeStep <= end_time) {
nextTimeStep = nextTimeStep.addSecs(duration.pun_duration * 60);
// int nextTimeStep = start_time + duration.pun_duration;
//int rest = end_time - nextTimeStep;
int rest = nextTimeStep.secsTo(interpolationEnd);
if (nextTimeStep <= interpolationEnd) {
if (durationId == 1) {
@@ -2247,17 +2277,17 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex)
qCritical() << "(" << __func__ << ":" << __LINE__ << ") interpolation dynamic end:" << interpolation.dynamic_end.toString(Qt::ISODate);
#endif
int const timeStep = nextTimeStep;
int const timeStep = start.secsTo(nextTimeStep) / 60;
qCritical() << "(" << __func__ << ":" << __LINE__ << ") time step:" << timeStep;
if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
<< 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;
}
//if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
// qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
// << 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() << "(" << __func__ << ":" << __LINE__ << ") configured minimal parking time:" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
@@ -2267,7 +2297,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex)
qCritical() << "(" << __func__ << ":" << __LINE__ << ") computed minimal parking time:" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
duration.pun_duration = timeStep;
timeStepCompensation = end_time - start_time;
timeStepCompensation = start.secsTo(interpolationEnd) / 60;
if (duration.pun_duration > 0) {
m_timeSteps[paymentOptionIndex] << duration.pun_duration;
@@ -2280,7 +2310,9 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex)
qCritical() << "(" << __func__ << ":" << __LINE__ << ") time step compensation:" << timeStepCompensation;
#endif
} else {
duration.pun_duration = nextTimeStep;
// duration.pun_duration = nextTimeStep;
// HIER WEITER
#if DEBUG_GET_TIME_STEPS==1
QTime nextTime(0, 0, 0);
@@ -2338,9 +2370,11 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex)
}
} else { // if (carryOverTimeRangeFrom == carryOverTimeRangeTo) {
// TODO
qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
}
} else { // if (pop_carry_over) {
// TODO
qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
}
}
} else {