Commit Graph

434 Commits

Author SHA1 Message Date
92bfdced6a
Merge branch 'neuhauser-kirchdorf' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into neuhauser-kirchdorf 2024-02-28 10:04:09 +01:00
8bbec596c9 Check for 08:00 <= currentTime <= 20:00 removed:
assumption is prepaid.
2024-02-28 09:58:00 +01:00
87b14ee3f8 Added check for NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM:
08:00 <= currentTime <= 20:00.
2024-02-28 09:26:51 +01:00
3ad2c77467 Adapted tests for NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM 2024-02-28 09:26:05 +01:00
493d94aaa1 Add re-check 2024-02-27 17:30:15 +01:00
7831329b11 kirchdorf: getDurationFromCost(): to be tested 2024-02-27 17:11:00 +01:00
abbbd06f93 GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive
(e.g. neuhauser/kirchdorf (743))
2024-02-27 12:25:13 +01:00
ac6e45a913 test cases for neuhauser-kirchdorf 2024-02-27 12:23:52 +01:00
b741d2e312 test 2024-02-26 16:57:37 +01:00
6756aa5b88 Added zone3 - zone6 to szeged 2024-02-24 11:07:04 +01:00
7845ab8077 testing: started with zone 3 for szeged 2024-02-23 14:20:16 +01:00
cc222c298a Add test case for szeged: zone 2 2024-02-23 13:54:31 +01:00
eb645273cc Add declaration for get_maximal_parkingprice() 2024-02-23 13:17:03 +01:00
bd1bdf8a8c Implement compute_procuct_price() 2024-02-22 16:38:41 +01:00
6d18ce4caa GetDailyTicketPrice(): improve for projects which have not defined a daily ticket in their tariff-files. 2024-02-22 16:37:11 +01:00
e980d8c451 Implement
std::optional<QVector<ATBTariffProduct>> getTariffProductForAllKeys() const;
    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(int id) const;
    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(PermitType permitType) const;
2024-02-22 16:34:57 +01:00
afb0e20dd2 Implement parsing of "Product" and adding into TariffProduct. 2024-02-22 16:33:19 +01:00
39ab08a5b7 Add ProductType 2024-02-22 16:32:16 +01:00
c4c0e2fd77 Added TariffProduct including necessary functions to retrieve product infos from tariff-file 2024-02-22 16:31:51 +01:00
7a5487aa41 Add compute_product_price 2024-02-22 16:27:52 +01:00
a8c1caf611 Add tariff_product.h and tariff_permit_type.h 2024-02-22 16:26:09 +01:00
a22145002c Add test case for NAZ 2024-02-22 16:25:30 +01:00
7b7dd6d103 Add representations for PERMIT_TYPE and Product 2024-02-22 16:25:09 +01:00
1c801f1053 re-tested neuhauser-linisinger-maschinenbau 2024-02-22 09:44:35 +01:00
56fc95e33c GetDurationFromCost(): reverted, as there is a new default parameter (prepaid)
in compute_price_for_parming_ticket().
2024-02-22 09:43:04 +01:00
c0f81f174a compute_price_for_parking_ticket(): added parameter bool prepaid. Set to true as default. 2024-02-22 09:42:02 +01:00
6ba3963f25 compute_price_for_parking_ticket(): added default parameter prepaid=true.
(Needed e.g. for Neuhauser/Linsinger Maschinenbau (741)
2024-02-22 09:40:27 +01:00
1a350c0aeb GetDurationFromCost(): aded section if prepaid is not set.
E.g. for Linsinger Maschinenbau (Neuhauser, 741): here, the buying
of food stamps is obviously only possible at certain times.
2024-02-22 09:31:41 +01:00
15801be88e re-tested neuhauser-naz 2024-02-22 09:30:15 +01:00
20e146d3c9 re-tested neuhauser-naz 2024-02-22 09:10:26 +01:00
30768c6931 prepared test case for neuhauser-kirchdorf 2024-02-22 08:02:55 +01:00
7933c826e6 Synced GetDurationFromCost() with GetCostFromDuration() 2024-02-21 14:53:06 +01:00
9d5ddfc328 GetCostFromDuration(): fixed moving from time range 8:00-12:00 -> 14:00-18:00. 2024-02-21 14:20:51 +01:00
102607b71f GetTimeSteps(): adapt for progressive tariff (e.g. neuhauser/kirchdorf).
Compute timesteps according to tariff01.json file.
2024-02-21 11:16:44 +01:00
81d515eb7f GetCostFromDuration(): set endtime to start in case cost==0. 2024-02-21 11:13:53 +01:00
ce61e5d3b2 compute_next_timestep(): use fpr PaymentMenthod::Progressive
same code as for PaymentMethod::Steps, as GetTimeSteps() inside
the Calculator class has been adapted accordingly.
2024-02-21 11:11:09 +01:00
b6a0f5e8af tests for neuhauser/kirchdorf 2024-02-21 11:08:49 +01:00
e0223b50f9 Added helper getTimeRangeStep() (useful for progressive tariff as for neuhauser/kirchdorf (743) 2024-02-21 09:31:13 +01:00
690267c388 get_maximal_parkingprice(): in case of progressive tariff, read maximal parking time
directly form tariff-file as there is not price per hour.
2024-02-20 15:47:02 +01:00
9c19414e5a GetDurationFromCost(): add some sanity checks for cost. Check if cost < minParkingPrice.
Cut cost internally to maxParkingPrice if cost > maxParkingPrice.
2024-02-20 13:47:45 +01:00
3ff9883647 Neuhauser Krichdorf: new test cases. 2024-02-19 12:01:36 +01:00
696ce644ab GetCostFromDuration(): take into account that (for Kirchdorf and progressive tariff)
there is no carry over.
2024-02-19 12:00:45 +01:00
9ea2037eca GetDurationFromCost(): in case of progressive tariff
-> implement analogously to GetCostFromDuration().
2024-02-19 11:59:06 +01:00
c0f0648a74 checkin for the weekend. proper commit-messages later 2024-02-16 13:37:24 +01:00
1d7779f666 GetCostFromDuration(): implement progressive tariff for Kirchdorf. 2024-02-15 16:15:28 +01:00
8470bdd574 Minor: change type of parameter 'start-parking-time' to non-const. 2024-02-15 16:14:21 +01:00
707ab1716b Add addition parsing of ATBTimeRange. 2024-02-15 16:13:28 +01:00
2ec94121f7 Add testcase for Kirchdorf 2024-02-15 16:12:10 +01:00
92c3b7c97c Add helper WorkDayId() for future use. 2024-02-15 16:11:41 +01:00
5ee978f14a Added several members to ATBTimeRange to implement
progressive tariff for Kirchdorf.
2024-02-15 16:08:22 +01:00