| 
						
					 | 
					
						
						
							
						
						ac20a767df
	
				 
					 | 
					
						
						
							
							Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental
						
						
						
						
						
						
							
 2.3.99-2
						
					 | 
					
						2024-07-26 11:08:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b7facb9d60
					 | 
					
						
						
							
							checkin for tariff02.json
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-26 10:59:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8344b04b15
					 | 
					
						
						
							
							Use of permitType in several places
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-25 09:49:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b0ecef0361
					 | 
					
						
						
							
							Use of permitType in several places
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-25 09:48:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						003b7e8e8a
					 | 
					
						
						
							
							getPaymentOption() functions and getPaymentOptionIndex()
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-25 09:46:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7ef2d44fc4
					 | 
					
						
						
							
							Add parameter PermitType to GetCostForDuration() and GetDurationFromCost()
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-25 09:45:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8f203184b6
					 | 
					
						
						
							
							Add additional parameter (PermitType) to several functions
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-25 09:44:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0bfec6a938
					 | 
					
						
						
							
							Added getPaymentOptionIndex() and getPaymentOptionsForAllKeys()
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-25 09:43:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						070446d01a
					 | 
					
						
						
							
							Updated test cases for PermitType.
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-24 17:35:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4d7e5263ee
					 | 
					
						
						
							
							Added parsing of pop_product_id and pop_product_name.
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-24 17:34:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7d452c82b7
					 | 
					
						
						
							
							Added pop_product_id and pop_product_name
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-24 17:33:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0a08221381
					 | 
					
						
						
							
							Added conversion from QString to PermitType
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-24 17:33:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b4b2e27fe3
					 | 
					
						
						
							
							Removed some debug output for testing
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-24 12:37:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2a3ff30e66
					 | 
					
						
						
							
							Add test cases
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-24 12:34:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b19cfd693c
					 | 
					
						
						
							
							Minor: add some debug output.
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-24 12:34:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						78921c8870
					 | 
					
						
						
							
							IMPORTANT: isParkingAllowedForWeekDay(): deactivated for testing !!!
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-24 12:30:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e891bfc5de
					 | 
					
						
						
							
							Only check for prepaid == never.
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-24 12:23:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a6922976bf
					 | 
					
						
						
							
							Minor: remove some debug output.
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-24 12:22:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7f25c46d30
					 | 
					
						
						
							
							Set pun_duration_saved
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-23 12:51:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2b30e9562f
					 | 
					
						
						
							
							Recompute time step list (previously is was saved as an optimization)
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-23 12:51:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eb4ef0c3b5
					 | 
					
						
						
							
							Allow adjustment of the step list by a tolerance of 5 minutes per step
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-23 12:48:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						da05d004dd
					 | 
					
						
						
							
							Introduced 'pun_duration_saved': to be used when time steps have to be re-calculated.
						
						
						
						
						
						
							
						
					 | 
					
						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. 
						
						
							
						
					 | 
					
						2024-07-23 11:53:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						49fb860129
					 | 
					
						
						
							
							Minor: fixed printing of 'cost'.
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-23 11:47:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						69edc8e898
					 | 
					
						
						
							
							compute_product_price(): add new Products (CAR, BUS, CAMPER).
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-23 11:45:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						40440e28d3
					 | 
					
						
						
							
							Read pop_accumulate_prices and pop_accumulate_durations.
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-22 15:56:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ba8e2786fc
					 | 
					
						
						
							
							GetTimeSteps():
						
						
						
						
						
						
						
						updated as well for Schnals (505). Still to  be tested. 
						
						
							
						
					 | 
					
						2024-07-22 15:54:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b5804408f4
					 | 
					
						
						
							
							GetDurationFromCost():
						
						
						
						
						
						
						
						expanded. still to be tested. 
						
						
							
						
					 | 
					
						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. 
						
						
							
						
					 | 
					
						2024-07-22 15:50:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						45694106a7
					 | 
					
						
						
							
							GetTimeSteps():
						
						
						
						
						
						
						
						added default parameter 'start'; was set inside the funtion. 
						
						
							
						
					 | 
					
						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. 
						
						
							
						
					 | 
					
						2024-07-22 15:46:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1c86e1ac40
					 | 
					
						
						
							
							tests for schnals
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-22 15:46:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3503306637
					 | 
					
						
						
							
							save experimental
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-21 20:58:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						977356040c
					 | 
					
						
						
							
							Added changes for Schnals
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-19 14:10:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2a89f90745
					 | 
					
						
						
							
							Added parsing for Interpolation, CarryOver and Prepaid-options. Has to be formatted.w
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-19 14:09:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f2356bec55
					 | 
					
						
						
							
							Added new products
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-19 14:04:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2d6ef2d158
					 | 
					
						
						
							
							Add prepaid and carry over option
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-19 14:03:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e5d23d8022
					 | 
					
						
						
							
							Added tests for Schnals
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-19 14:03:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						02927be9c9
					 | 
					
						
						
							
							Added interpolation, carryover and prepaid types
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-19 14:02:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c6d396f34b
					 | 
					
						
						
							
							Added handling for interpolation, carry over and prepaid.
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-19 14:01:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						026c791c79
					 | 
					
						
						
							
							Add interpolation and operator<<
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-19 14:01:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						927164e23e
					 | 
					
						
						
							
							Added headers for interpolation, prepaid and carryover
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-19 13:59:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						507b5d1b9c
					 | 
					
						
						
							
							Add Interpolation, Prepaid and CarryOver structures to streamline Json-File layout.
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-19 13:58:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c153652b3d
					 | 
					
						
						
							
							compute_next_timestep(): allow some tolerance for first time-step
						
						
						
						
						
						
							
 galtuer-fix
						
					 | 
					
						2024-07-16 16:50:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d7e185006f
					 | 
					
						
						
							
							GetTimeSteps(): add sanity check
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-16 16:47:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c3c888dc04
					 | 
					
						
						
							
							GetTimeSteps(): remove list as reference so compute_next_timestep)_ can change it
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-16 16:46:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2ecaa0545f
					 | 
					
						
						
							
							Clean up. Adding SEXTEN.
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-16 16:42:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a849f953bd
					 | 
					
						
						
							
							Remove some parts used for testing
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-16 16:42:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						24df8e995a
					 | 
					
						
						
							
							remove now useless file
						
						
						
						
						
						
							
						
					 | 
					
						2024-07-16 16:41:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b5f818848a
					 | 
					
						
						
							
							just save tests
						
						
						
						
						
						
							
						
					 | 
					
						2024-06-26 16:25:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |