Commit Graph

Select branches

Hide Pull Requests

bad-neuenahr-ahrweiler

fix-galtuer

fix-kirchdorf

fix-kirchdorf2

fuchs-experimental

fuchs-muehlbach

include-tariff-files

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

vorkauf-fix-2025-April-22

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

2.4.0

2.4.99

2.5.0

2.5.99

2.6.0

Neuhauser-Kirchdorf

bad-neuenahr-standard-tariff

galtuer-fix

stockerau

v1.0.0

v2

Mono Color

• f2156e4650
  
  Merge branch 'include-tariff-files' master 2.6.0 Siegfried Siegert 2025-05-09 09:25:49 +02:00
• 338a1a4ebc
  
  Merge branch 'vorkauf-fix-2025-April-22' into include-tariff-files Siegfried Siegert 2025-05-09 09:25:19 +02:00
• b4818a3918 get_minimal_parkingtime() get_maximal_parkingtime() compute_product_price() get_maximal_parkingprice() compute_price_for_parking_ticket() compute_duration_for_parking_ticket() compute_duration_for_daily_ticket() compute_price_for_daily_ticket(): include-tariff-files Gerhard Hoffmann 2025-05-08 11:15:23 +02:00
• 35294e99f0 Parse possible Includes-section in tariff-file Gerhard Hoffmann 2025-05-06 12:00:22 +02:00
• edfa5dc1b1 Minor: add case FREE_TICKET to prevent compiler warning. Gerhard Hoffmann 2025-05-06 11:59:10 +02:00
• d95741baae compute_duration_for_parking_ticket(): Switch to different tariff based on product-type/product-id. Gerhard Hoffmann 2025-05-06 11:57:36 +02:00
• e172e814e7 load and parse additional (included) tariff-files Gerhard Hoffmann 2025-05-06 11:57:14 +02:00
• 37aa10fc85 Add product FREE_TICKET. Gerhard Hoffmann 2025-05-06 11:55:35 +02:00
• 4b9edb0f47 Minor: add IncludeType to be used by json-parser Gerhard Hoffmann 2025-05-06 11:54:49 +02:00
• e70e9a8586 Add TariffIncludes: the main tariff-file will include (load) other tariff-files. Gerhard Hoffmann 2025-05-06 11:52:47 +02:00
• aec290fe26 test code Gerhard Hoffmann 2025-05-06 11:52:16 +02:00
• 78cae24389 Fix: if start-time is out-of-range (after valid time for sell), switch to next valid time, taking into account if next valid time is on next day. 2.5.99 vorkauf-fix-2025-April-22 Gerhard Hoffmann 2025-04-23 11:00:33 +02:00
• de0be1d19b Minor: added/changed debug messages. Gerhard Hoffmann 2025-04-23 10:59:39 +02:00
• 54921f0e85 If price (=key) is not found, compute the next smaller valid price (=key) and use this as maxPrice. Usage: (Innichen (508) with) direct coin input. Gerhard Hoffmann 2025-04-17 13:33:22 +02:00
• 077c2334ca Restore pop_max_price in case it has been changed (for certain settings). Gerhard Hoffmann 2025-04-17 13:09:53 +02:00
• d605af5c5a Check prepaidIf and carryOverIf for null and emptyness. Gerhard Hoffmann 2025-04-16 11:32:20 +02:00
• c5900f9f2b Minor: extend debug output Gerhard Hoffmann 2025-04-16 11:31:05 +02:00
• 9b137c2873 Fix in Calculator::GetPriceForTimeStep(): Allow some tolerance (of 3 minutes) when looking up the current time-step value in the duration-array. Otherwise, when corossing a minute-boundary, it can happen to not find the match and returning a price of 0 (which is almost always wrong). 2.5.0 2.4.99 kleipeda-experimental Gerhard Hoffmann 2025-04-03 11:53:47 +02:00
• dd249a87d5 Set cnt-limit to 20. This allows a bigger time-range for tariff, which have in principle no time-limit. Gerhard Hoffmann 2025-04-02 15:28:46 +02:00
• 575885c19e Merge branch 'master' into kleipeda-experimental Gerhard Hoffmann 2025-04-02 09:44:20 +02:00
• d82a732a8d if end of parking time equals carry-over-end, then, if configured, go back to carry-over-start. Gerhard Hoffmann 2025-04-01 14:26:21 +02:00
• 99dbd7c194 Minor: debug output. Gerhard Hoffmann 2025-04-01 14:24:42 +02:00
• ae985d25ce
  
  Merge branch 'kleipeda-experimental' 2.4.0 Siegfried Siegert 2025-02-04 14:58:58 +01:00
• 6a215d4cf9
  
  Allow zone_nr > 999 Siegfried Siegert 2025-02-04 14:47:07 +01:00
• a3f4a742ce
  
  Read zone_nr from system_data Siegfried Siegert 2025-02-04 14:44:28 +01:00
• e6d8c04076 Fix: for time change summer -> winter term. Compute minutes until midnight manually. Gerhard Hoffmann 2024-10-30 15:56:58 +01:00
• 49f016cc98 added new files remotes/origin/kleipeda-experimental-snapshot-2024-10-21 Gerhard Hoffmann 2024-10-21 14:31:42 +02:00
• 41a09d882d brainstorming ... Gerhard Hoffmann 2024-10-21 14:31:08 +02:00
• 5cfca87f3e minor: add some utility lines Gerhard Hoffmann 2024-10-21 13:06:22 +02:00
• 1f6606f382 Add some tests for Forchach (749) 2.3.99-24 Gerhard Hoffmann 2024-10-10 11:40:29 +02:00
• 4b9a4319b3 ComputeDurationFromCost(): Fix: take into account that there may be more than just two carry-over-ranges. For instance, in Korneuburg (714), there are three as they have a break from 12:00-14:00. Gerhard Hoffmann 2024-10-10 11:38:14 +02:00
• 5e673788b4 ComputeDurationFromCost(): Use helper function computeMinutesUntilCarryOverEnd() to compute the offset until the end of the carry-over-range. Gerhard Hoffmann 2024-10-10 11:36:14 +02:00
• 7e2f40a7b5 Add assigment-operator (otherwise compilation error). Gerhard Hoffmann 2024-10-10 11:33:33 +02:00
• 44e2ce24a3 Add helper computeMinutesUntilCarryOverEnd(). Used in new tariff-calculator. Replace of previous wrong approach of using m_range.duration. Gerhard Hoffmann 2024-10-10 11:30:53 +02:00
• 5a55ad6ef0 ComputeDurationFromCost(): 2.3.99-23 Gerhard Hoffmann 2024-10-02 15:21:21 +02:00
• 5a77958e8d getOutOfService(): Gerhard Hoffmann 2024-10-02 15:19:32 +02:00
• a1e7f4629a getService(): Gerhard Hoffmann 2024-10-02 15:18:16 +02:00
• efc2582c36 getCarryOver(): Gerhard Hoffmann 2024-10-02 15:17:00 +02:00
• a72f5a5019 getPrepaid(): Gerhard Hoffmann 2024-10-02 15:15:19 +02:00
• 28f0ea9fce Merge from kleipeda-experimental-snapshot-2024-09-27: started new implementation of tariff-calculator. Gerhard Hoffmann 2024-10-01 09:25:53 +02:00
• 3109e82ef8 If out-of-service, use start of out-of-service action as output-date. kleipeda-experimental-snapshot-2024-09-27 Gerhard Hoffmann 2024-10-01 09:23:15 +02:00
• 03dd6c44da Always reset pop_max_price to configured value. Gerhard Hoffmann 2024-09-30 16:58:23 +02:00
• 212c792b77 compute_price_for_parking_ticket(): Gerhard Hoffmann 2024-09-30 16:57:18 +02:00
• ab3cdb32ae compute_next_timestep(): Gerhard Hoffmann 2024-09-30 16:55:25 +02:00
• 4f23ab3d68 ComputeCostFromDuration(): Gerhard Hoffmann 2024-09-30 16:53:25 +02:00
• acbc27cfb2 ComputeDurationFromCost(): Gerhard Hoffmann 2024-09-30 16:51:51 +02:00
• bcbe95d483 Add hard-coded trauncate flag. Gerhard Hoffmann 2024-09-30 16:51:02 +02:00
• e3bbca86d5 Minor: changed parameter type to non-const. Gerhard Hoffmann 2024-09-30 16:50:21 +02:00
• 5868d3b510 Introduce computational state Gerhard Hoffmann 2024-09-30 16:46:36 +02:00
• d4363e71cd Keep bacjward compatibility before using payment-method Unified. Gerhard Hoffmann 2024-09-27 14:24:10 +02:00
• fd99c20bd9 Take into account new payment method 'Unified' to call new tariff-calculator. Gerhard Hoffmann 2024-09-27 14:20:20 +02:00
• dbccdba9fe isParkingAllowedForWeekDay(): Minor: adapt function call to changes parameter arity. Gerhard Hoffmann 2024-09-27 14:18:31 +02:00
• b035f4f887 Calculator::GetDurationFromCost(): Minor: move scope of some variables upward. Gerhard Hoffmann 2024-09-27 14:17:35 +02:00
• 18f09fccb9 GetDurationFromCost(): Call ComputeDurationFromCost() of new tariff calculator for payment-method Unified. Gerhard Hoffmann 2024-09-27 14:10:02 +02:00
• 1086e360e5 Start of implementing new tariff calculator: Gerhard Hoffmann 2024-09-27 14:04:39 +02:00
• ada7bebd90 Minor: Add headers. Gerhard Hoffmann 2024-09-27 13:57:30 +02:00
• 2b9ea67ef5 Added function to implement new tariff-calculator: Gerhard Hoffmann 2024-09-27 13:48:30 +02:00
• d117328bed Minor: removed default parameter in constructor Gerhard Hoffmann 2024-09-27 13:47:26 +02:00
• fd04531474 Added payment <unified> payment-methode Gerhard Hoffmann 2024-09-27 13:45:45 +02:00
• 5749fa422e Added structures for parsing of tariff05 in bad neuenahr Gerhard Hoffmann 2024-09-27 13:45:04 +02:00
• 1347f1f208 Added parsing for tariff05.json (bad neuenarh (249)) Gerhard Hoffmann 2024-09-27 13:44:01 +02:00
• 576c3fefdd Added PaymentMethod::Unified Gerhard Hoffmann 2024-09-27 13:42:44 +02:00
• 9ca7018fc1 tests for bad neuenahr Gerhard Hoffmann 2024-09-27 13:42:04 +02:00
• 515dfaf35c reprogrammed to use ATBTime class Gerhard Hoffmann 2024-09-27 13:41:30 +02:00
• 0ab833709c Added struct ATBTariffCarryOver Gerhard Hoffmann 2024-09-27 13:40:18 +02:00
• 8e4f47c7b6 Added struct ATBTariffPrepaid Gerhard Hoffmann 2024-09-27 13:39:35 +02:00
• bc9645f1fa Minor: removed "pragma once" compiler flag Gerhard Hoffmann 2024-09-27 13:38:39 +02:00
• 713b483918 Added/fixed several functions. final testing needed. Gerhard Hoffmann 2024-09-27 13:37:54 +02:00
• 3c7af1cb32 Minor: Added tariff_service and tariff_out_of_service Gerhard Hoffmann 2024-09-27 13:35:54 +02:00
• 356e451839 Add structures to encode service and out-of-service times Gerhard Hoffmann 2024-09-27 13:35:03 +02:00
• c4e1d412a5 Add some assinment operators to support assignment of tariff-time-ranges. Gerhard Hoffmann 2024-09-27 13:31:01 +02:00
• 1b716c48d2
  
  Fix: copy header files 2.3.99-21 Siegfried Siegert 2024-09-19 14:10:05 +02:00
• 77e1414c13 compute_duration_for_parking_ticket(): Gerhard Hoffmann 2024-09-17 17:05:23 +02:00
• d95275a72d Compute real netto_parking_time. This time will be used to find the real time-step, and from here the actual price to pay. Gerhard Hoffmann 2024-09-17 17:04:27 +02:00
• 577a17dc6a Set seconds of serveral date-times to 0. Compute netto_parking_time (which includes carry-over duration). Gerhard Hoffmann 2024-09-17 17:03:29 +02:00
• d8d32820a3 compute_price_for_parking_ticket(): Gerhard Hoffmann 2024-09-17 17:01:32 +02:00
• 2ce0aeef1d Minor: include atb_time.h Gerhard Hoffmann 2024-09-17 16:59:07 +02:00
• 0cba85eafb Set pop_max_price_saved Gerhard Hoffmann 2024-09-17 16:58:20 +02:00
• 4030a4b165 Add pop_max_price_save in case pop_max_price has to be re-computed dynamically, so it can be reset Gerhard Hoffmann 2024-09-17 16:57:34 +02:00
• 8c7afdfcb1 Add additional constructor. Gerhard Hoffmann 2024-09-17 16:53:45 +02:00
• 932d4e8cb9 check it ticket-end-time hits carry-over-start. if configured, move to end of carry-over. Gerhard Hoffmann 2024-09-16 16:56:48 +02:00
• 38abc65425 compute_price_for_parking_ticket(): Check if minutesUntilCarryOver is positive (usually must be). Gerhard Hoffmann 2024-09-16 16:54:25 +02:00
• 205896903b Handle SUCCESS_MAXPRICE (calc-state). Gerhard Hoffmann 2024-09-16 16:53:44 +02:00
• dbedfd094f Add some OTHER files Gerhard Hoffmann 2024-09-16 16:52:00 +02:00
• 57b9d16abc GetDurationFromCost(): Gerhard Hoffmann 2024-09-16 16:50:16 +02:00
• 48afbc071c Added new calc-state: SUCCESS_MAXPRICE. Gerhard Hoffmann 2024-09-16 16:49:00 +02:00
• 7a7b10260a Add untracked(!) files Gerhard Hoffmann 2024-09-16 16:47:01 +02:00
• 0b42406b0f Cimmit to compile and test. 2.3.99-20 Gerhard Hoffmann 2024-09-16 13:23:59 +02:00
• 1874b08210 Merge branch 'kleipeda-experimental-snapshot-2024-09-12' into kleipeda-experimental Gerhard Hoffmann 2024-09-16 10:49:23 +02:00
• 88a0ebb688 Add atb-time. Gerhard Hoffmann 2024-09-16 10:42:56 +02:00
• a8ae9fc602 Add own Time class (similar QTime) Gerhard Hoffmann 2024-09-16 10:42:08 +02:00
• 7c0514e241 save current state kleipeda-experimental-snapshot-2024-09-12 Gerhard Hoffmann 2024-09-13 10:42:45 +02:00
• 1d8dfcfa22 get_minimal_parkingtime(): 2.3.1 bad-neuenahr-ahrweiler Gerhard Hoffmann 2024-09-12 11:11:25 +02:00
• f53e9ceaae Some testing added Gerhard Hoffmann 2024-09-11 12:11:49 +02:00
• dffc6e2a03 Minor: removed some debug output. Gerhard Hoffmann 2024-09-11 11:56:06 +02:00
• f9cc3af473 ParseJson(): Add parsing of "pop_apply_carry_over_to_ticket_endtime". Gerhard Hoffmann 2024-09-11 11:55:03 +02:00
• 9dd0108731 ParseJson(): Gerhard Hoffmann 2024-09-11 11:54:16 +02:00
• fa10ea4b89 compute_price_for_parking_ticket(): Gerhard Hoffmann 2024-09-11 11:49:31 +02:00
• 05f03a623b compute_price_for_parking_ticket(): Gerhard Hoffmann 2024-09-11 11:47:50 +02:00
• 03e9076962 compute_price_for_parking_ticket(): Gerhard Hoffmann 2024-09-11 11:46:36 +02:00