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

praesentation-muenchen

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

• 3dda2d8355 Check if prepaid-option is set. Gerhard Hoffmann 2024-08-02 11:08:52 +02:00
• 1152c3824e Minor: add some debug output. Gerhard Hoffmann 2024-08-02 11:08:32 +02:00
• 4271c0fb31 Fixed compute_next_timestep() for degressive tariff: compute_next_timestep() was actually never called for such a tariff. Gerhard Hoffmann 2024-08-02 10:50:25 +02:00
• 24d9d4a0ff test case for kleipeda and fuchs Gerhard Hoffmann 2024-08-01 16:46:09 +02:00
• 4bce854d77 GetDurationFromCost(): Set durationInSecs in case 'pop_accumulate_prices' is not configured in tariff file. Gerhard Hoffmann 2024-08-01 16:44:06 +02:00
• 138221759b GetDurationFromCost(): Minor: removed some debug ouput Gerhard Hoffmann 2024-08-01 16:43:19 +02:00
• 9cb7d4aea6 compute_price_for_parking_ticket(): Added handling for prepaid and carry-over. Gerhard Hoffmann 2024-08-01 16:04:57 +02:00
• cde490bab2 compute_next_time_step(): Added handling with pop_plus_steps/pop_minus_steps: '+' usually takes more than one time step. '-' is usually 1. Gerhard Hoffmann 2024-08-01 16:00:10 +02:00
• f0677374ec Parsing of pop_plus_steps/pop_minus_steps Gerhard Hoffmann 2024-08-01 15:46:49 +02:00
• 89b05ffadc Added GetYearPeriodActive() to get active year period. Gerhard Hoffmann 2024-08-01 15:45:50 +02:00
• 260973cd09 Added pop_plus_steps/pop_minus_steps to control step sizes Gerhard Hoffmann 2024-08-01 15:44:06 +02:00
• 3a98a14eb0
  
  Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental 2.3.99-10 Siegfried Siegert 2024-07-31 10:50:03 +02:00
• 7bf7108668 GetDurationFromCost(): Check if computed duration is below minimal parking time. Gerhard Hoffmann 2024-07-31 10:26:47 +02:00
• e5629ba4fd GetDurationFromCost(): Check if given price is below minimal parking price. Gerhard Hoffmann 2024-07-31 10:25:03 +02:00
• 0d0d34cb87
  
  Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental Siegfried Siegert 2024-07-31 08:06:45 +02:00
• e4cb992aae GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane). Gerhard Hoffmann 2024-07-30 15:39:55 +02:00
• cdeb625a15 Minor: Revode debug output. Gerhard Hoffmann 2024-07-30 15:39:35 +02:00
• 589d89b73a Calculator::GetDurationFromCost(): Compute duration from cost for PaymentMethod::Degressive: introduced for Valser Alm (location: Fane). Gerhard Hoffmann 2024-07-30 15:37:28 +02:00
• 7536f89d75 compute_duration_for_parking_ticket(): read prepaid-setting from tariff-file, if possible. Gerhard Hoffmann 2024-07-30 15:32:58 +02:00
• 9a6b2b195d get_minimal_parking_price(): compute this price dynamically according to settings in the tariff-file. Introduced for Fuchs (500) for Valser Alm (Location: Fane) Gerhard Hoffmann 2024-07-30 15:29:47 +02:00
• 7233bc55c2 test for valser alm (fane) Gerhard Hoffmann 2024-07-30 15:24:52 +02:00
• 8fff7a76f6
  
  Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental Siegfried Siegert 2024-07-30 10:02:57 +02:00
• 52b7c2390a Minor: introduce using-typedef for Duration Gerhard Hoffmann 2024-07-29 17:33:49 +02:00
• 894e23332f compute option index using permit type. Gerhard Hoffmann 2024-07-29 17:32:15 +02:00
• fbc255a6f2 Fix: compute_next_time_step(): removed check for product ids. Gerhard Hoffmann 2024-07-29 17:31:33 +02:00
• 24ab01695d GetPriceForTimeStep(): remove default parameter. Gerhard Hoffmann 2024-07-29 17:28:27 +02:00
• 37652d3b6a Save computed pop_min_time. Gerhard Hoffmann 2024-07-29 17:27:16 +02:00
• 14fd7ddd39 Preperationf for Zone3. Gerhard Hoffmann 2024-07-29 17:26:53 +02:00
• ca3c3921d4 Minor: change debug output Gerhard Hoffmann 2024-07-29 17:26:26 +02:00
• 37620a06c1 added test case for bus Gerhard Hoffmann 2024-07-29 11:30:36 +02:00
• 9f4affca5a Minor: removed debug output Gerhard Hoffmann 2024-07-29 11:30:00 +02:00
• 4f2c33cdc2 Minor: added comments and added some debug output. Gerhard Hoffmann 2024-07-29 11:28:07 +02:00
• 3cd02296b0 compute_duration_for_parking_ticket(): Fix: pass PERMIT_TYPE explicitly to correct arity of GetDurationFromCost(). Gerhard Hoffmann 2024-07-29 11:25:12 +02:00
• f1493f417f get_maximal_parkingprice(): implement for SHORT_TERM_PARKING_BUS and SHORT_TERM_PARKING_PKW. Gerhard Hoffmann 2024-07-29 11:24:05 +02:00
• 356e3be178 Pass PERMIT_TYPE to get_minimal_parkingtime() and get_maximal_parkingtime() to override default parameter value. Gerhard Hoffmann 2024-07-29 11:22:22 +02:00
• 31b1dd1690 ResetTimeSteps(): Check paymentOptionIndex for correct value. Gerhard Hoffmann 2024-07-29 11:20:00 +02:00
• 84d807930e
  
  Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental Siegfried Siegert 2024-07-26 17:35:38 +02:00
• dbf5b1f11d remove input correction Gerhard Hoffmann 2024-07-26 17:34:24 +02:00
• 18f4e74eea
  
  Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental Siegfried Siegert 2024-07-26 17:05:45 +02:00
• 29368ea850 Remove correction Gerhard Hoffmann 2024-07-26 17:04:33 +02:00
• b84f80887e Checkin for testing Gerhard Hoffmann 2024-07-26 17:01:44 +02:00
• bfd9f3b80c
  
  Fix: add missing parameter PermitType Siegfried Siegert 2024-07-26 14:11:37 +02:00
• cb69d3ca2f
  
  Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental Siegfried Siegert 2024-07-26 13:35:56 +02:00
• 4a2b15d086 Add some debug output into GetDurationForPrice(). Gerhard Hoffmann 2024-07-26 13:34:18 +02:00
• 63043931c2
  
  Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental Siegfried Siegert 2024-07-26 13:12:56 +02:00
• 8dad8f00e8 GetPriceForTimeStep(): Fix: user default payment option Gerhard Hoffmann 2024-07-26 13:11:29 +02:00
• 1ea03f522c
  
  Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental Siegfried Siegert 2024-07-26 13:01:17 +02:00
• 805a732c52 GetPriceForTimeStep(): add prices for computed timesteps. Return maximal price which is still smaller or equal then (input-)price. Gerhard Hoffmann 2024-07-26 12:53:42 +02:00
• ac20a767df
  
  Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental 2.3.99-2 Siegfried Siegert 2024-07-26 11:08:02 +02:00
• b7facb9d60 checkin for tariff02.json Gerhard Hoffmann 2024-07-26 10:59:45 +02:00
• 8344b04b15 Use of permitType in several places Gerhard Hoffmann 2024-07-25 09:49:16 +02:00
• b0ecef0361 Use of permitType in several places Gerhard Hoffmann 2024-07-25 09:48:12 +02:00
• 003b7e8e8a getPaymentOption() functions and getPaymentOptionIndex() Gerhard Hoffmann 2024-07-25 09:46:46 +02:00
• 7ef2d44fc4 Add parameter PermitType to GetCostForDuration() and GetDurationFromCost() Gerhard Hoffmann 2024-07-25 09:45:36 +02:00
• 8f203184b6 Add additional parameter (PermitType) to several functions Gerhard Hoffmann 2024-07-25 09:44:24 +02:00
• 0bfec6a938 Added getPaymentOptionIndex() and getPaymentOptionsForAllKeys() Gerhard Hoffmann 2024-07-25 09:43:16 +02:00
• 070446d01a Updated test cases for PermitType. Gerhard Hoffmann 2024-07-24 17:35:46 +02:00
• 4d7e5263ee Added parsing of pop_product_id and pop_product_name. Gerhard Hoffmann 2024-07-24 17:34:28 +02:00
• 7d452c82b7 Added pop_product_id and pop_product_name Gerhard Hoffmann 2024-07-24 17:33:53 +02:00
• 0a08221381 Added conversion from QString to PermitType Gerhard Hoffmann 2024-07-24 17:33:06 +02:00
• b4b2e27fe3 Removed some debug output for testing Gerhard Hoffmann 2024-07-24 12:37:29 +02:00
• 2a3ff30e66 Add test cases Gerhard Hoffmann 2024-07-24 12:34:28 +02:00
• b19cfd693c Minor: add some debug output. Gerhard Hoffmann 2024-07-24 12:34:05 +02:00
• 78921c8870 IMPORTANT: isParkingAllowedForWeekDay(): deactivated for testing !!! Gerhard Hoffmann 2024-07-24 12:30:46 +02:00
• e891bfc5de Only check for prepaid == never. Gerhard Hoffmann 2024-07-24 12:23:15 +02:00
• a6922976bf Minor: remove some debug output. Gerhard Hoffmann 2024-07-24 12:22:47 +02:00
• 7f25c46d30 Set pun_duration_saved Gerhard Hoffmann 2024-07-23 12:51:51 +02:00
• 2b30e9562f Recompute time step list (previously is was saved as an optimization) Gerhard Hoffmann 2024-07-23 12:51:08 +02:00
• eb4ef0c3b5 Allow adjustment of the step list by a tolerance of 5 minutes per step Gerhard Hoffmann 2024-07-23 12:48:50 +02:00
• da05d004dd Introduced 'pun_duration_saved': to be used when time steps have to be re-calculated. Gerhard Hoffmann 2024-07-23 12:46:44 +02:00
• abf4ef0b00 GetPriceForTimeStep(): Use special flag 'pop_accumulate_prices' to add up prices given in the tariff json file. Gerhard Hoffmann 2024-07-23 11:53:22 +02:00
• 49fb860129 Minor: fixed printing of 'cost'. Gerhard Hoffmann 2024-07-23 11:47:48 +02:00
• 69edc8e898 compute_product_price(): add new Products (CAR, BUS, CAMPER). Gerhard Hoffmann 2024-07-23 11:45:34 +02:00
• 40440e28d3 Read pop_accumulate_prices and pop_accumulate_durations. Gerhard Hoffmann 2024-07-22 15:56:04 +02:00
• ba8e2786fc GetTimeSteps(): updated as well for Schnals (505). Still to be tested. Gerhard Hoffmann 2024-07-22 15:54:36 +02:00
• b5804408f4 GetDurationFromCost(): expanded. still to be tested. Gerhard Hoffmann 2024-07-22 15:53:27 +02:00
• f7be0e471a getDurationFromCost(): call Calculator::GetInstance().GetTimeSteps(cfg, 0, inputDate); for its side-effects. Timesteps will be used in the following calculation. Gerhard Hoffmann 2024-07-22 15:50:36 +02:00
• 45694106a7 GetTimeSteps(): added default parameter 'start'; was set inside the funtion. Gerhard Hoffmann 2024-07-22 15:48:21 +02:00
• 6d125c65fe Added flags pop_accumulate_prices pop_accumulate_durations to decide if values in json files should be accumulated or not. Gerhard Hoffmann 2024-07-22 15:46:45 +02:00
• 1c86e1ac40 tests for schnals Gerhard Hoffmann 2024-07-22 15:46:13 +02:00
• 3503306637 save experimental Gerhard Hoffmann 2024-07-21 20:58:12 +02:00
• 977356040c Added changes for Schnals Gerhard Hoffmann 2024-07-19 14:10:07 +02:00
• 2a89f90745 Added parsing for Interpolation, CarryOver and Prepaid-options. Has to be formatted.w Gerhard Hoffmann 2024-07-19 14:09:04 +02:00
• f2356bec55 Added new products Gerhard Hoffmann 2024-07-19 14:04:20 +02:00
• 2d6ef2d158 Add prepaid and carry over option Gerhard Hoffmann 2024-07-19 14:03:46 +02:00
• e5d23d8022 Added tests for Schnals Gerhard Hoffmann 2024-07-19 14:03:06 +02:00
• 02927be9c9 Added interpolation, carryover and prepaid types Gerhard Hoffmann 2024-07-19 14:02:41 +02:00
• c6d396f34b Added handling for interpolation, carry over and prepaid. Gerhard Hoffmann 2024-07-19 14:01:27 +02:00
• 026c791c79 Add interpolation and operator<< Gerhard Hoffmann 2024-07-19 14:01:00 +02:00
• 927164e23e Added headers for interpolation, prepaid and carryover Gerhard Hoffmann 2024-07-19 13:59:56 +02:00
• 507b5d1b9c Add Interpolation, Prepaid and CarryOver structures to streamline Json-File layout. Gerhard Hoffmann 2024-07-19 13:58:22 +02:00
• c153652b3d compute_next_timestep(): allow some tolerance for first time-step galtuer-fix kleipeda Gerhard Hoffmann 2024-07-16 16:50:11 +02:00
• d7e185006f GetTimeSteps(): add sanity check Gerhard Hoffmann 2024-07-16 16:47:26 +02:00
• c3c888dc04 GetTimeSteps(): remove list as reference so compute_next_timestep)_ can change it Gerhard Hoffmann 2024-07-16 16:46:43 +02:00
• 2ecaa0545f Clean up. Adding SEXTEN. Gerhard Hoffmann 2024-07-16 16:42:39 +02:00
• a849f953bd Remove some parts used for testing Gerhard Hoffmann 2024-07-16 16:42:11 +02:00
• 24df8e995a remove now useless file Gerhard Hoffmann 2024-07-16 16:41:18 +02:00
• 861a405ec0 tests for galtuer fix-galtuer Gerhard Hoffmann 2024-07-13 13:57:32 +02:00
• 6b88213644 GetTimeSteps(): return step-list as reference; return only a non-empty step-list. Gerhard Hoffmann 2024-07-13 13:57:07 +02:00
• dda04434fc Allow some tolerance when looking for a match for the first time-step Gerhard Hoffmann 2024-07-13 13:55:24 +02:00