Compare commits
No commits in common. "3ff9883647c8ba1e367e4dffaab1559188f6925f" and "c0f0648a745d8226a439e466b05cf3400cbe98cb" have entirely different histories.
3ff9883647
...
c0f0648a74
@ -115,7 +115,7 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
|
||||
/// <inheritdoc/>
|
||||
std::string Calculator::GetDurationFromCost(Configuration* cfg,
|
||||
uint8_t payment_option,
|
||||
char const *startDatetimePassed, // given in local time
|
||||
char const *start_datetime, // given in local time
|
||||
double cost,
|
||||
bool nextDay,
|
||||
bool prepaid)
|
||||
@ -124,7 +124,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
|
||||
Q_UNUSED(nextDay);
|
||||
|
||||
// Get input date
|
||||
QDateTime inputDate = QDateTime::fromString(startDatetimePassed,Qt::ISODate);
|
||||
QDateTime inputDate = QDateTime::fromString(start_datetime,Qt::ISODate);
|
||||
|
||||
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
|
||||
if (paymentMethodId == PaymentMethod::Steps) {
|
||||
@ -152,37 +152,44 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
|
||||
// started with Neuhauser, Kirchdorf: merge into main algo. later
|
||||
// for now try out some ideas
|
||||
|
||||
// started with Neuhauser, Kirchdorf: merge into main algo. later
|
||||
// for now try out some ideas
|
||||
|
||||
static const bool carryOverNotSet = Utilities::isCarryOverNotSet(cfg, paymentMethodId);
|
||||
static const uint minParkingPrice = Utilities::getMinimalParkingPrice(cfg, paymentMethodId);
|
||||
|
||||
Q_ASSERT_X(carryOverNotSet, __func__, "CARRYOVER SET (FOR KIRCHDORF)");
|
||||
Q_ASSERT_X(prepaid, __func__, "PREPAID NOT SET (FOR KIRCHDORF)");
|
||||
|
||||
QDateTime start_datetime = QDateTime::fromString(QString(startDatetimePassed), Qt::ISODate);
|
||||
QDateTime start = start_datetime;
|
||||
QDateTime end_datetime = QDateTime();
|
||||
QDateTime start = QDateTime::fromString(QString(start_datetime));
|
||||
QDateTime end = QDateTime();
|
||||
|
||||
int weekdayId = -1;
|
||||
int weekdayIdLast = -1;
|
||||
int durationMinutes = Utilities::getMaximalParkingTime(cfg, paymentMethodId);
|
||||
int timeRanges = 0;
|
||||
int durationMinutesBrutto = 0;
|
||||
int durationMinutes = Utilities::getMaximalParkingPrice(cfg, paymentMethodId);
|
||||
|
||||
QDateTime current = start;
|
||||
|
||||
QDateTime current = QDateTime::fromString(QString(start_datetime), Qt::ISODate);
|
||||
|
||||
#define DEBUG 1
|
||||
//#define DEBUG 0
|
||||
|
||||
#if DEBUG==1
|
||||
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
|
||||
<< "current" << current.time().toString(Qt::ISODate)
|
||||
<< "durationMinutes" << durationMinutes
|
||||
<< "durationMinutesBrutto" << durationMinutesBrutto;
|
||||
#endif
|
||||
|
||||
int days = 7;
|
||||
while (--days > 0) {
|
||||
weekdayId = current.date().dayOfWeek();
|
||||
weekdayIdLast = weekdayId; // TODO: some end condition in json-file
|
||||
|
||||
while (cfg->WeekDaysWorktime.count(weekdayId) == 0) {
|
||||
while ((timeRanges = cfg->WeekDaysWorktime.count(weekdayId)) == 0) {
|
||||
current = current.addDays(1);
|
||||
weekdayId = current.date().dayOfWeek();
|
||||
if (weekdayId == weekdayIdLast) {
|
||||
qCritical() << "ERROR: NO VALID WORKDAY-TIMES DEFINED";
|
||||
return QDateTime().toString(Qt::ISODate).toStdString();
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -198,24 +205,29 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
|
||||
}
|
||||
}
|
||||
|
||||
if (current.time() >= to) {
|
||||
if (carryOverNotSet) {
|
||||
return end_datetime.toString(Qt::ISODate).toStdString();
|
||||
} else {
|
||||
QDateTime const dt = start;
|
||||
start = start.addDays(1);
|
||||
start.setTime(QTime(0, 0, 0));
|
||||
|
||||
durationMinutesBrutto += dt.secsTo(start) / 60;
|
||||
current = start;
|
||||
}
|
||||
if (current.time() >= to) {
|
||||
QDateTime const dt = start;
|
||||
start = start.addDays(1);
|
||||
start.setTime(QTime(0, 0, 0));
|
||||
|
||||
durationMinutesBrutto += dt.secsTo(start) / 60;
|
||||
|
||||
#if DEBUG==1
|
||||
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
|
||||
<< "start" << start.time().toString(Qt::ISODate)
|
||||
<< "durationMinutes" << durationMinutes
|
||||
<< "durationMinutesBrutto" << durationMinutesBrutto;
|
||||
#endif
|
||||
|
||||
current = start;
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
int durationMinutesNetto = 0;
|
||||
uint price = 0;
|
||||
uint price = cost;
|
||||
|
||||
if (carryOverNotSet) {
|
||||
int range = 0;
|
||||
@ -247,8 +259,17 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
|
||||
uint const minutesMoved = lastCurrent.secsTo(current) / 60;
|
||||
durationMinutesBrutto += minutesMoved;
|
||||
|
||||
#if DEBUG==1
|
||||
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
|
||||
<< "lastCurrent" << lastCurrent.time().toString(Qt::ISODate)
|
||||
<< "current" << current.time().toString(Qt::ISODate)
|
||||
<< "durationMinutes" << durationMinutes
|
||||
<< "durationMinutesBrutto" << durationMinutesBrutto;
|
||||
#endif
|
||||
|
||||
if (range == 1) {
|
||||
start_datetime = current;
|
||||
// TODO
|
||||
// start_datetime = current;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -261,7 +282,15 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
|
||||
int duration = timeRange.time_range_to_in_minutes_from_start -
|
||||
timeRange.time_range_from_in_minutes_from_start;
|
||||
|
||||
#if DEBUG==1
|
||||
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
|
||||
<< "duration" << duration
|
||||
<< "durationMinutes" << durationMinutes
|
||||
<< "durationMinutesBrutto" << durationMinutesBrutto;
|
||||
#endif
|
||||
|
||||
if (current.addSecs(duration * 60).time() <= to) {
|
||||
|
||||
for(const auto &x: cfg->PaymentRate) {
|
||||
ATBPaymentRate const rate = x.second;
|
||||
if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
|
||||
@ -271,32 +300,57 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
|
||||
durationMinutesBrutto += minsToCarryOver;
|
||||
current = current.addSecs(minsToCarryOver*60);
|
||||
minsToCarryOver = 0;
|
||||
} else {
|
||||
if (price >= cost) {
|
||||
end_datetime = current;
|
||||
return end_datetime.toString(Qt::ISODate).toStdString();
|
||||
}
|
||||
|
||||
price += (uint)rate.pra_price;
|
||||
#if DEBUG==1
|
||||
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
|
||||
<< "price" << price
|
||||
<< "durationMinutes" << durationMinutes
|
||||
<< "durationMinutesBrutto" << durationMinutesBrutto;
|
||||
#endif
|
||||
} else {
|
||||
price -= (uint)rate.pra_price;
|
||||
|
||||
durationMinutes -= duration;
|
||||
durationMinutesNetto += duration;
|
||||
durationMinutesBrutto += duration;
|
||||
|
||||
#if DEBUG==1
|
||||
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
|
||||
<< "price" << price
|
||||
<< "durationMinutes" << durationMinutes
|
||||
<< "durationMinutesBrutto" << durationMinutesBrutto;
|
||||
#endif
|
||||
|
||||
current = current.addSecs(duration * 60);
|
||||
|
||||
if (price >= cost) {
|
||||
end_datetime = current;
|
||||
return end_datetime.toString(Qt::ISODate).toStdString();
|
||||
if (price <= 0) {
|
||||
|
||||
//end = start.addSecs(durationMinutesBrutto * 60);
|
||||
end = current;
|
||||
|
||||
#if DEBUG==1
|
||||
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
|
||||
<< "durationMinutesBrutto" << durationMinutesBrutto
|
||||
<< "price" << price
|
||||
<< "current" << current.toString(Qt::ISODate)
|
||||
<< "end" << end.toString(Qt::ISODate);
|
||||
#endif
|
||||
|
||||
return end.toString(Qt::ISODate).toStdString();
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
#if DEBUG==1
|
||||
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
|
||||
<< durationMinutes << durationMinutes;
|
||||
#endif
|
||||
|
||||
if (durationMinutes <= 0) {
|
||||
end_datetime = current;
|
||||
return end_datetime.toString(Qt::ISODate).toStdString();
|
||||
end = current;
|
||||
return end.toString(Qt::ISODate).toStdString();
|
||||
}
|
||||
|
||||
++timeRangeIt;
|
||||
@ -315,16 +369,33 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
|
||||
durationMinutesNetto += minsLeft;
|
||||
durationMinutesBrutto += minsLeft;
|
||||
|
||||
#if DEBUG==1
|
||||
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
|
||||
<< "lastCurrent" << lastCurrent.time().toString(Qt::ISODate)
|
||||
<< "current" << current.time().toString(Qt::ISODate)
|
||||
<< "minsLeft" << minsLeft
|
||||
<< "durationMinutes" << durationMinutes
|
||||
<< "durationMinutesBrutto" << durationMinutesBrutto;
|
||||
#endif
|
||||
|
||||
if (minsLeft > 0) {
|
||||
for(const auto &x: cfg->PaymentRate) {
|
||||
ATBPaymentRate const rate = x.second;
|
||||
if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
|
||||
price += (uint)rate.pra_price;
|
||||
if (price >= cost) {
|
||||
end_datetime = current;
|
||||
// return end_datetime.toString(Qt::ISODate).toStdString();
|
||||
}
|
||||
break;
|
||||
price -= (uint)rate.pra_price;
|
||||
if (price <= 0) {
|
||||
end = lastCurrent;
|
||||
|
||||
#if DEBUG==1
|
||||
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
|
||||
<< "lastCurrent" << lastCurrent.time().toString(Qt::ISODate)
|
||||
<< "current" << current.time().toString(Qt::ISODate)
|
||||
<< "price" << price
|
||||
<< "end" << end.toString(Qt::ISODate);
|
||||
#endif
|
||||
// return end.toString(Qt::ISODate).toStdString();
|
||||
break;
|
||||
} else break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -334,13 +405,21 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
|
||||
}
|
||||
}
|
||||
|
||||
end_datetime = start.addSecs(durationMinutesBrutto * 60);
|
||||
return end_datetime.toString(Qt::ISODate).toStdString();
|
||||
end = current;
|
||||
|
||||
#if DEBUG==1
|
||||
qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
|
||||
<< "end" << end.toString(Qt::ISODate)
|
||||
<< "durationMinutes" << durationMinutes
|
||||
<< "durationMinutesBrutto" << durationMinutesBrutto;
|
||||
#endif
|
||||
|
||||
return end.toString(Qt::ISODate).toStdString();
|
||||
}
|
||||
}
|
||||
|
||||
end_datetime = QDateTime();
|
||||
return end_datetime.toString(Qt::ISODate).toStdString();
|
||||
end = QDateTime();
|
||||
return end.toString(Qt::ISODate).toStdString();
|
||||
}
|
||||
|
||||
Ticket t = private_GetDurationFromCost(cfg, inputDate, cost, prepaid);
|
||||
@ -525,17 +604,14 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
|
||||
}
|
||||
}
|
||||
|
||||
if (current.time() >= to) {
|
||||
if (carryOverNotSet) {
|
||||
return 0;
|
||||
} else {
|
||||
QDateTime const dt = start;
|
||||
start = start.addDays(1);
|
||||
start.setTime(QTime(0, 0, 0));
|
||||
|
||||
durationMinutesBrutto += dt.secsTo(start) / 60;
|
||||
current = start;
|
||||
}
|
||||
if (current.time() >= to) {
|
||||
QDateTime const dt = start;
|
||||
start = start.addDays(1);
|
||||
start.setTime(QTime(0, 0, 0));
|
||||
|
||||
durationMinutesBrutto += dt.secsTo(start) / 60;
|
||||
current = start;
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
|
||||
@ -118,10 +118,10 @@ int main() {
|
||||
QDateTime s(QDate(2023, 11, 30), QTime());
|
||||
// QDateTime s(QDate(2023, 11, 26), QTime());
|
||||
QDateTime end;
|
||||
for (int duration = 30; duration <= 90; duration += 5) {
|
||||
for (int duration = 35; duration <= 35; duration += 5) {
|
||||
// for (int duration = 30; duration <= maxParkingTime; duration += 5) {
|
||||
qCritical() << "";
|
||||
for (int offset = 420; offset <= 1080; ++offset) {
|
||||
for (int offset = 1046; offset <= 1046; ++offset) {
|
||||
//for (int offset = 420; offset <= 1080; ++offset) {
|
||||
//if (offset > 720 && offset < 840) {
|
||||
// continue;
|
||||
@ -132,7 +132,7 @@ int main() {
|
||||
|
||||
double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 1, start, end, duration, nextDay, prePaid);
|
||||
|
||||
//#if COST_FROM_DURATION==0
|
||||
#if COST_FROM_DURATION==1
|
||||
double cost_soll = 30 + ((duration-30)/5 * 10);
|
||||
uint32_t duration_ist = start.secsTo(end) / 60;
|
||||
|
||||
@ -151,9 +151,9 @@ int main() {
|
||||
qCritical() << " cost (ist) :" << cost;
|
||||
|
||||
if (cost_soll != cost) {
|
||||
//qCritical() << "ERROR" << __func__ << ":" << __LINE__
|
||||
// << "cost_soll" << cost_soll << "cost_ist" << cost;
|
||||
//break;
|
||||
qCritical() << "ERROR" << __func__ << ":" << __LINE__
|
||||
<< "cost_soll" << cost_soll << "cost_ist" << cost;
|
||||
break;
|
||||
}
|
||||
if (duration != duration_ist) {
|
||||
//qCritical() << "ERROR" << __func__ << ":" << __LINE__
|
||||
@ -161,28 +161,15 @@ int main() {
|
||||
//break;
|
||||
}
|
||||
|
||||
//#else
|
||||
start = s.addSecs(offset * 60);
|
||||
#else
|
||||
std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg, 1,
|
||||
start.toString(Qt::ISODate).toStdString().c_str(),
|
||||
cost, false, true);
|
||||
|
||||
|
||||
if (end.toString(Qt::ISODate) != QString(duration.c_str())) {
|
||||
//qCritical() << "ERROR" << end.toString(Qt::ISODate)
|
||||
// << QString(duration.c_str());
|
||||
//break;
|
||||
|
||||
}
|
||||
|
||||
qCritical() << "start" << start.toString(Qt::ISODate)
|
||||
<< "cost" << cost
|
||||
<< "until" << duration.c_str()
|
||||
<< "end" << end.toString(Qt::ISODate)
|
||||
<< ":" << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60
|
||||
<< (end.toString(Qt::ISODate) == QString(duration.c_str()));
|
||||
<< "until" << duration.c_str() << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60;
|
||||
|
||||
//#endif // COST_FROM_DURATION
|
||||
#endif // COST_FROM_DURATION
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user