MOBILISIS-Calculator

GerhardHoffmann/MOBILISIS-Calculator

Fork 0

Commit Graph

Select branches

Hide Pull Requests

bad-neuenahr-ahrweiler

fix-galtuer

fix-kirchdorf

fix-kirchdorf2

fuchs-experimental

fuchs-muehlbach

kleipeda

kleipeda-experimental

kleipeda-experimental-snapshot-2024-09-12

kleipeda-experimental-snapshot-2024-09-27

master

moransBranch

neuhauser-bilexa-galtuer

neuhauser-kirchdorf

neuhauser-linsinger-maschinenbau

neuhauser-nordisches-ausbildungszentrum

neuhauser_korneuburg

remotes/origin/kleipeda-experimental-snapshot-2024-10-21

schoenau

schoenau_23112023

0.0.1

0.0.2

1.0.0

2.0.0

2.0.2

2.0.3

2.1.0

2.1.1

2.1.2

2.1.3

2.1.4

2.1.5

2.2.0

2.2.1

2.3.0

2.3.1

2.3.99-10

2.3.99-11

2.3.99-12

2.3.99-13

2.3.99-14

2.3.99-15

2.3.99-16

2.3.99-17

2.3.99-18

2.3.99-19

2.3.99-2

2.3.99-20

2.3.99-21

2.3.99-23

2.3.99-24

Neuhauser-Kirchdorf

bad-neuenahr-standard-tariff

galtuer-fix

stockerau

v1.0.0

v2

eb20410849 Use paymentOptionIndex in getPaymentOptions() Gerhard Hoffmann 2024-05-08 16:34:07 +0200
2a492475e3 Bad Neuenahr: Zone5 tests Gerhard Hoffmann 2024-05-07 16:21:36 +0200
6a5272da7a Fix: Check if endTime is still on the same day. Gerhard Hoffmann 2024-05-07 15:01:16 +0200
4d5583df2d Handling for pop_carry_over_traget. Gerhard Hoffmann 2024-05-07 14:59:00 +0200
de6f263817 Add FRI/SAT/SUN with restricted hours. Gerhard Hoffmann 2024-05-07 14:57:41 +0200
e4ce14da3f updated some tests Gerhard Hoffmann 2024-05-06 11:38:37 +0200
b71c979a91 Fix: getPaymentOptionIndex() -> return 0 instead of -1 Removed exit(0)-call which was used for testing. Gerhard Hoffmann 2024-05-06 11:36:12 +0200
33f43fb83d Start parsing of pop_min_date_time and pop_max_date_time Gerhard Hoffmann 2024-05-03 13:50:10 +0200
1606a784a4 Add macro _WEEKEND_WITH_RESTRICTED_HOURS_. Gerhard Hoffmann 2024-05-03 13:49:15 +0200
9f2cf613e1 Add struct ATBMaxDateTime. Gerhard Hoffmann 2024-05-03 13:48:27 +0200
dbd9644047 Add ATBPaymentOptionType = std::multimap<int, ATBPaymentOption> Gerhard Hoffmann 2024-05-03 13:47:28 +0200
f8fef12b55 Zone6 for Bad neuenahr Gerhard Hoffmann 2024-04-30 14:09:48 +0200
1dd81d4a56 get_minimal_parkingtime(): const Configuration parameter. Cast of const pointer necessary. Gerhard Hoffmann 2024-04-30 14:08:08 +0200
f93cf11d23 get_minimal_parkingtime() get_maximal_parkingtime(): made configuration parameter const. Gerhard Hoffmann 2024-04-30 14:06:04 +0200
9d0ac4f8ce Add TWENTY_FOUR_HOURS_TICKET. Add toString() and implement conversion operators in therm of toString(). Gerhard Hoffmann 2024-04-30 13:51:31 +0200
4ec5589f30 Implement getTariffProductForProductId() in terms of getTariffProductForProductTypeName(). Gerhard Hoffmann 2024-04-30 13:49:49 +0200
c1d5ffcf3c Implement getTariffProductForProductTypeName(). Use the type names of PERMIT_TYPE, not real indices as they can change. Gerhard Hoffmann 2024-04-30 13:48:03 +0200
7aded2b7fb Explicit cast due to compiler warning. Gerhard Hoffmann 2024-04-30 13:46:59 +0200
ed9e60a972 Declaration for getTariffProductForProductTypeName(). Gerhard Hoffmann 2024-04-30 13:45:22 +0200
5d35331c83 Minor: introduced TariffProductType. Gerhard Hoffmann 2024-04-30 13:44:53 +0200
c7623429d9 Compute end_parking_time using "netto_parking_time", which is the current timestep. Gerhard Hoffmann 2024-04-25 15:41:52 +0200
b596086245 Pass paymentOptionIndex to cfg->getPaymentOptions(), which has a default parameter of paymentOptionIndex=0. Gerhard Hoffmann 2024-04-24 13:20:02 +0200
24ca857b6f Fix: init m_timeSteps-vector in case its size is 0: m_timeSteps.push_back(QList<int>()). Detected during testing. Gerhard Hoffmann 2024-04-24 13:18:23 +0200
ea0bcde413 Check iterator for it != cfg->TimeRange.cend(). Gerhard Hoffmann 2024-04-24 13:16:22 +0200
e93b08505a Minor: introduce TimeRangeType as typedef for std::multimap<int, ATBTimeRange>. Gerhard Hoffmann 2024-04-24 13:14:04 +0200
44efd44ede Check paymentOptionIndex for test of GALTUER. Gerhard Hoffmann 2024-04-24 13:11:28 +0200
9d72574106 Minor: additional loop for test of NAZ Gerhard Hoffmann 2024-04-24 12:01:24 +0200
d8ec41ebfc Repeated tests for KIRCHDORF. Re-added utility test_neuhauser_kirchdorf(). Found bug during testing, accessing vector of size 0. Gerhard Hoffmann 2024-04-24 11:56:50 +0200
f17c4f240b Minor: add tests for special days in KORNEUBURG Gerhard Hoffmann 2024-04-24 10:52:18 +0200
76bb1eb56a Minor: small changes for tests of SCHOENAU Gerhard Hoffmann 2024-04-24 09:54:29 +0200
3b813e5eff Minor: small changes for tests of PERNEGG-AN-DER-MUR Gerhard Hoffmann 2024-04-24 09:33:57 +0200
436f5a109b Minor: add small changes to Christoph-Reisen Gerhard Hoffmann 2024-04-24 09:17:26 +0200
e17e54b315 Minor: add define: _ALL_DAYS_WITH_RESTRICTED_HOURS_ Gerhard Hoffmann 2024-04-19 14:10:47 +0200
d07fdd8540 GetPriceForTimeStep(): use parameter paymentOptionIndex. v2 Gerhard Hoffmann 2024-04-19 13:33:54 +0200
1fab458de3 Implement isParkingAllowedForWeekDay(), isParkingAllowedForSpecialDay() and isParkingAllowed() (4 parameters) using the 2 functions. Gerhard Hoffmann 2024-04-19 13:32:24 +0200
1ac2ca91c5 GetCostFromDuration(): use new parameter paymentOptionIndex. Gerhard Hoffmann 2024-04-19 13:31:01 +0200
1852f552a3 compute_price_for_parking_ticket(): compute paymentOptionIndex. (a tariff-file can conatin more than one payment options). Gerhard Hoffmann 2024-04-19 13:28:35 +0200
e2c02420f0 Add parsing for new values in helper-structures. NOTE: unfortunately switched to Unix-File-Format. Gerhard Hoffmann 2024-04-19 13:26:33 +0200
1240abbbec Add test cases BAD_NEUENAHR_AHRWEILER, zone2. Gerhard Hoffmann 2024-04-19 13:24:10 +0200
e20eb93abf Implement SpecialDaysWorkTimeFrom() and SpecialDaysWorkTimeUntil(). Extend getBusinessHours() to include new enum-values. Implement isDayIncluded() as switch-case on dayOfWeek. Implement dumpBusinessHours(). Gerhard Hoffmann 2024-04-19 13:21:38 +0200
b0e7bd91b4 Add ariff_global_defines.h. Gerhard Hoffmann 2024-04-19 13:20:44 +0200
0cd4424434 Add utilities isDayIncluded(), SpecialDaysWorkTimeFrom() and specialDaysWorkTimeUntil(). Gerhard Hoffmann 2024-04-19 13:19:26 +0200
1991853b66 Add new enum-values for business_hours. Keep the old ones for backward-compatibility. Gerhard Hoffmann 2024-04-19 13:18:02 +0200
b31fcc5f4f Minor: add explicit default constructor. Gerhard Hoffmann 2024-04-19 13:17:00 +0200
dbe649d0e4 Add member variables pop_carry_over_start_time_range pop_carry_over_end_time_range: Gerhard Hoffmann 2024-04-19 13:12:46 +0200
dfd74a455a Add getPaymentOptionIndexIfSpecialDay(). Add isSpecialDay(), isSpecialDay((), specialDayId(), specialDay(), isSpecialDay(), specialDayId(), specialDay(), isDayIncluded(), isDayIncludedAsSpecialDay() and isDayIncludedAsSpecialDay(). Gerhard Hoffmann 2024-04-19 13:09:53 +0200
10828e0708 Add private mathods isParkingAllowedForWeekDay() and isParkingAllowedForSpecialDay(). Overload isParkingAllowed(). GetCostFromDuration(): add default parameter "int paymentOptionIndex=0" Gerhard Hoffmann 2024-04-19 13:06:37 +0200
2dbcc7018c start header for global defines Gerhard Hoffmann 2024-04-19 13:04:36 +0200
18ed85430d Minor: first commit Gerhard Hoffmann 2024-04-18 08:52:15 +0200
b70094abb5 Extend compute_product_price() for use of PERMIT_TYPE::DAY_TICKET. First time used for Neuhauder-Pernegg-an-der-Mur. Gerhard Hoffmann 2024-04-16 12:10:34 +0200
aa15d1c126 Add default-parameters to compute_product_price(): start [in]: currentDateTime(): start date-time for daily-ticket-price computation. startProduct, endProduct: real start- and end-date/time for daily-ticket. Used first time for Neuhauser-Pernegg-an-der-Mur (747). Gerhard Hoffmann 2024-04-16 12:07:18 +0200
cd159f2bbd Add case for BusinessHours::NoRestriction_24_7: used for Neuhauder-Christoph-Reisen Gerhard Hoffmann 2024-04-16 12:05:55 +0200
475487c2ce Minor: add utility getProductPrice() Gerhard Hoffmann 2024-04-16 12:03:42 +0200
8ff5b8e2b5 Added test-cases for Neuhauser-Christoph-Reisen (746) and Neuhauser-Pernegg-an-der-Mur (747) Gerhard Hoffmann 2024-04-16 12:01:36 +0200
b0c4ad0e2e getCurrentPaymentOptionIndex(): start implementation. getPaymentOptions(): use new parameter paymentOptionIndex. Gerhard Hoffmann 2024-04-12 14:31:02 +0200
7e3347b043 GetTimeSteps(): use new parameter paymentOptionIndex Gerhard Hoffmann 2024-04-12 14:30:04 +0200
4e7fa83507 get_minimal_parkingtime() get_maximal_parkingtime() get_minimal_parkingprice() get_maximal_parkingprice(): use new parameter paymentOptionIndex. Gerhard Hoffmann 2024-04-12 14:27:08 +0200
ac76f194e1 Added new constants Gerhard Hoffmann 2024-04-12 14:26:03 +0200
fe485b7b39 pop_business_hours as uint64_t. Gerhard Hoffmann 2024-04-12 14:24:32 +0200
e210224340 getPaymentOptions(): added default-parameter 'paymentOptionsIndex' Added getCurrentPaymentOptionIndex() and isHoliday(). Gerhard Hoffmann 2024-04-12 14:22:20 +0200
afa62183fd ResetTimeSteps(), GetTimeSteps(), GetSteps(): add parameter paymentOptionIndex (default=0) Gerhard Hoffmann 2024-04-12 14:20:05 +0200
f241a87dc1 get_minimal_parking_price() get_maximal_parking_price() get_maximal_parking_time() get_minimal_parking_time(): adden perameter paymentOptionIndex Gerhard Hoffmann 2024-04-12 14:17:43 +0200
9b1cc49d34 Minor: remove some debug output Gerhard Hoffmann 2024-04-12 14:16:18 +0200
449e618417 Add test-cases Gerhard Hoffmann 2024-04-12 14:14:40 +0200
aba38d2614 compute_price_for_parking_ticket(): add handling for PaymentMethod::Steps. bad-neuenahr-standard-tariff Gerhard Hoffmann 2024-04-08 13:58:24 +0200
57d6b85f52 get_maximal_parking_price(): add handling for PaymentMethod::Steps. Gerhard Hoffmann 2024-04-08 13:57:40 +0200
4f9c0422fc Start test case for Bad Neuenahr Gerhard Hoffmann 2024-04-08 13:53:29 +0200
a5b95d71b8 CalcState: Add setStatus()/getStatus() Gerhard Hoffmann 2024-04-08 13:52:53 +0200
16ccb706da

Merge branch 'neuhauser-kirchdorf' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into neuhauser-kirchdorf 2.1.4 neuhauser-kirchdorf Siegfried Siegert 2024-03-08 10:10:37 +0100
fcbc8dcdc3 Merge branch 'neuhauser-kirchdorf' of https://git.mimbach49.de/GerhardHoffmann/MOBILISIS-Calculator into neuhauser-kirchdorf Gerhard Hoffmann 2024-03-07 08:19:26 +0100
ed99bae725 Use Calculator::getInstance() Gerhard Hoffmann 2024-03-07 08:18:40 +0100
627d14204d Use paymentRate.last() instead of aymentRate.at(0) so we can enter new entries in tariff-files to provide the prices for an hour. Gerhard Hoffmann 2024-03-07 08:17:32 +0100
d8a4c4eaa7

Merge branch 'neuhauser-kirchdorf' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into neuhauser-kirchdorf 2.1.3 Siegfried Siegert 2024-02-29 09:30:22 +0100
4f45db4fde revised tests for Neuhauser/Linsinger Maschinenbau (744) Gerhard Hoffmann 2024-02-28 12:06:43 +0100
a744a1ebb3 compute_product_price(): add handling for FOOD_STAMP Gerhard Hoffmann 2024-02-28 12:06:02 +0100
df16bd7f9c GetDailyTicketPrice(): add case for FOOD_STAMP (not implemented) Gerhard Hoffmann 2024-02-28 12:05:14 +0100
b751ba339e Add permit type FOOD_STAMP Gerhard Hoffmann 2024-02-28 12:03:13 +0100
588a88455b

CalcState: add toString() method 2.1.2 Siegfried Siegert 2024-02-28 11:31:28 +0100
92bfdced6a

Merge branch 'neuhauser-kirchdorf' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into neuhauser-kirchdorf Siegfried Siegert 2024-02-28 10:04:09 +0100
8bbec596c9 Check for 08:00 <= currentTime <= 20:00 removed: assumption is prepaid. Gerhard Hoffmann 2024-02-28 09:58:00 +0100
87b14ee3f8 Added check for NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM: 08:00 <= currentTime <= 20:00. Gerhard Hoffmann 2024-02-28 09:26:51 +0100
3ad2c77467 Adapted tests for NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM Gerhard Hoffmann 2024-02-28 09:26:05 +0100
493d94aaa1 Add re-check 2.1.1 fix-kirchdorf2 Gerhard Hoffmann 2024-02-27 17:30:15 +0100
7831329b11 kirchdorf: getDurationFromCost(): to be tested Gerhard Hoffmann 2024-02-27 17:11:00 +0100
abbbd06f93 GetCostFromDuration(): re-implement cpmputation for paymentMethod==progressive (e.g. neuhauser/kirchdorf (743)) Gerhard Hoffmann 2024-02-27 12:25:13 +0100
ac6e45a913 test cases for neuhauser-kirchdorf Gerhard Hoffmann 2024-02-27 12:23:52 +0100
b741d2e312 test fix-kirchdorf Gerhard Hoffmann 2024-02-26 16:57:37 +0100
6756aa5b88 Added zone3 - zone6 to szeged Gerhard Hoffmann 2024-02-24 11:07:04 +0100
7845ab8077 testing: started with zone 3 for szeged Gerhard Hoffmann 2024-02-23 14:20:16 +0100
cc222c298a Add test case for szeged: zone 2 Gerhard Hoffmann 2024-02-23 13:54:31 +0100
eb645273cc Add declaration for get_maximal_parkingprice() Gerhard Hoffmann 2024-02-23 13:17:03 +0100
bd1bdf8a8c Implement compute_procuct_price() Gerhard Hoffmann 2024-02-22 16:38:41 +0100
6d18ce4caa GetDailyTicketPrice(): improve for projects which have not defined a daily ticket in their tariff-files. Gerhard Hoffmann 2024-02-22 16:37:11 +0100
e980d8c451 Implement std::optional<QVector<ATBTariffProduct>> getTariffProductForAllKeys() const; std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(int id) const; std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(PermitType permitType) const; Gerhard Hoffmann 2024-02-22 16:34:57 +0100
afb0e20dd2 Implement parsing of "Product" and adding into TariffProduct. Gerhard Hoffmann 2024-02-22 16:33:19 +0100
39ab08a5b7 Add ProductType Gerhard Hoffmann 2024-02-22 16:32:16 +0100
c4c0e2fd77 Added TariffProduct including necessary functions to retrieve product infos from tariff-file Gerhard Hoffmann 2024-02-22 16:31:51 +0100
7a5487aa41 Add compute_product_price Gerhard Hoffmann 2024-02-22 16:27:52 +0100
a8c1caf611 Add tariff_product.h and tariff_permit_type.h Gerhard Hoffmann 2024-02-22 16:26:09 +0100
a22145002c Add test case for NAZ Gerhard Hoffmann 2024-02-22 16:25:30 +0100