96aad6b797
Merge branch 'fuchs-muehlbach' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into fuchs-muehlbach
2024-08-19 12:41:02 +02:00
648799629a
GetTimeSteps():
...
Fix: check not only if "current" is above carryOverStart, but also
if "current" is below carryOverEnd.
2024-08-19 12:19:01 +02:00
84e2530767
Calculator::GetDurationFromCost():
...
Minor: debug output.
2024-08-19 12:18:05 +02:00
ceb78772dd
Minor: debug output
2024-08-19 12:11:47 +02:00
675ba60733
tests for schnals/muehlbach
2024-08-19 12:10:43 +02:00
d86a688836
GetTimeSteps():
...
unifiy implementation for Fuchs/Muehlbach and Fuchs/Schnals.
2024-08-18 19:29:48 +02:00
171b23eebb
added parsing for new duration fields
2024-08-18 19:27:06 +02:00
ae9a54bf02
Added:
...
pun_mutable:
duration might be changed during runtime
pun_round_to_next_24h_boundary
duration has to be aligned with next possible 24h boundary
pun_round_to_prev_24h_boundary
duration has to be aligned with previous 24h boundary
pun_align_with_timepoint
duration has to be aligned with dedicated time point
Removed:
pun_requires_change
Replaced by pu_mutable
2024-08-18 19:23:12 +02:00
84e61844ab
test case schnals
2024-08-18 19:22:07 +02:00
328f7cb712
test cases for fuchs-mue=hlbach
2024-08-15 21:45:53 +02:00
84dbfc7234
GetTimeSteps(): compute time steps and duration values.
...
For each element in the duration list (and for a given start-date-time)
check if there is a prepaid-option or an carry-over-option to compute the
correct values.
2024-08-15 21:41:09 +02:00
48cc6b1302
Minor: debug output.
...
duartionUnit as signed int (to see errors in case it becomes negative).
2024-08-15 21:39:22 +02:00
a6007ee89a
GetTimeSteps():
...
Use condition pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::RECOMPUTE_SOME
(set in tariff-file) to decide the alogorithm to compute time-steps.
2024-08-15 21:37:23 +02:00
192a37d93f
.GetTimeSteps(): pass parameters tariff, paymentOptionIndex and start_parking_time_);
2024-08-15 21:29:37 +02:00
b17f77b22a
Add setting of max-price in case of degressive-tariff.
...
+ maxPrice = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price;
2024-08-15 21:28:49 +02:00
007978a0f8
Added include/mobilisis/tariff_prepay.h.
...
OTHER_FILES removed.
2024-08-15 21:26:30 +02:00
80b21ac231
New internal representation for the prepaid option
2024-08-15 21:24:27 +02:00
0a32d60827
Added parsing for new duration members and new prepaid-option.
2024-08-15 21:23:17 +02:00
26a50fb972
Add enum constant RECOMPUTE_SOME=3: some duration values have to be recomputed
...
at runtime (to determine time steps).
2024-08-15 21:20:18 +02:00
964ee17540
add new prepaid_option_id
2024-08-15 21:19:40 +02:00
6ef57792ce
Add PrepaidOptionType.
...
PrepaidType declared as deprecated.
2024-08-15 21:16:46 +02:00
ec9f7d9262
Introduce bew memebers to control the handling of duration objects
...
(especially for GetTimeSteps() computation).
2024-08-15 21:14:57 +02:00
a2c40fa32a
re-introduce prepay-option for backward compatibility
2024-08-15 21:13:25 +02:00
25b3143d88
Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental
2024-08-02 14:37:42 +02:00
0856f10ca9
GetDurationFromCost():
...
Fix computation of end-time when pop_accumulate_durations is set
in tariff-file.
2024-08-02 14:34:44 +02:00
88c703ecc2
Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental
2024-08-02 13:21:54 +02:00
465b2274a1
compute_duration_for_parking_ticket():
...
Adapt end-time in case it is midnight: 00:00 -> 23:59
2024-08-02 13:15:11 +02:00
f946cd13e4
Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental
2024-08-02 11:55:12 +02:00
8d1cbe7337
Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental
2024-08-02 11:29:10 +02:00
62c52fd580
test case for fuchs, fane alm.
2024-08-02 11:13:50 +02:00
1023f6ede1
GetPriceForTimeStep():
...
Use "pop_accumulate_durations" setting to sum up the durations.
Otherwise time-step will not be found in time-step-list.
2024-08-02 11:12:07 +02:00
36b3e85d1b
GetCostFromDuration():
...
recompute timestep list to make sure that time step is found in it.
2024-08-02 11:11:20 +02:00
b394ed46cc
In case end-parking-time ends with 00:00, set it to 23:59.
2024-08-02 11:09:20 +02:00
3dda2d8355
Check if prepaid-option is set.
2024-08-02 11:08:52 +02:00
1152c3824e
Minor: add some debug output.
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.
2024-08-02 10:50:25 +02:00
24d9d4a0ff
test case for kleipeda and fuchs
2024-08-01 16:46:09 +02:00
4bce854d77
GetDurationFromCost():
...
Set durationInSecs in case 'pop_accumulate_prices' is not configured
in tariff file.
2024-08-01 16:44:06 +02:00
138221759b
GetDurationFromCost():
...
Minor: removed some debug ouput
2024-08-01 16:43:19 +02:00
9cb7d4aea6
compute_price_for_parking_ticket():
...
Added handling for prepaid and carry-over.
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.
Changed behaviour when current time is not found in the list of time steps:
Search for the entry with the smallest distance to 'current time'.
If the distance is smaller than 3 minutes, then use 'current time' as new
entry in the list of time steps.
2024-08-01 16:00:10 +02:00
f0677374ec
Parsing of pop_plus_steps/pop_minus_steps
2024-08-01 15:46:49 +02:00
89b05ffadc
Added GetYearPeriodActive() to get active year period.
2024-08-01 15:45:50 +02:00
260973cd09
Added pop_plus_steps/pop_minus_steps to control step sizes
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
2024-07-31 10:50:03 +02:00
7bf7108668
GetDurationFromCost():
...
Check if computed duration is below minimal parking time.
2024-07-31 10:26:47 +02:00
e5629ba4fd
GetDurationFromCost():
...
Check if given price is below minimal parking price.
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
2024-07-31 08:06:45 +02:00
e4cb992aae
GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).
2024-07-30 15:39:55 +02:00
cdeb625a15
Minor: Revode debug output.
2024-07-30 15:39:35 +02:00
