Skip to content

Commit

Permalink
Fine tuning of the bike vdfs
Browse files Browse the repository at this point in the history
  • Loading branch information
s-hiitola committed May 16, 2024
1 parent 154f186 commit 425981f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Scripts/parameters/assignment.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@
+" (el1.gt.0) * (1.3 * el1))).min.35))")
vdf_bikes_mixed_lane = "(length * (60/((3.max.({flat} + (el1.lt.0) * (1.56 * el1) + (el1.gt.0) * (1.3 * el1)) + {vol}).min.({flat}*1.5))))"

b_volume_mixed = "(-1.962 * ln(4*(volau+volad+1)/1000) * 0.689)"
b_volume_lane = "(-1.962 * ln(4*(volau+volad+1)/1000) * 0.807)"
b_volume_mixed = "(-1.962 * ln(4*(volau+volad+10)/1000) * 0.689)"
b_volume_lane = "(-1.962 * ln(4*(volau+volad+10)/1000) * 0.807)"
volume_delay_funcs = {
# Car functions
"fd1": vdf_temp.format(0.02, "lanes", 0.975, 1.78, 0.0075),
Expand All @@ -125,10 +125,10 @@
"fd72": vdf_bikes.format(17, 17),
"fd73": vdf_bikes.format(16, 16),
"fd74": vdf_bikes.format(15, 15),
"fd75": vdf_bikes_mixed_lane.format(flat=15, vol=b_volume_lane),
"fd75": vdf_bikes_mixed_lane.format(flat=12, vol=b_volume_lane),
"fd76": vdf_bikes_mixed_lane.format(flat=12, vol=b_volume_mixed),
"fd77": vdf_bikes_mixed_lane.format(flat=10, vol=b_volume_mixed),
"fd78": vdf_bikes_mixed_lane.format(flat=12, vol=b_volume_mixed),
"fd78": vdf_bikes_mixed_lane.format(flat=10, vol=b_volume_mixed),
"fd98": vdf_bikes.format(12, 12),
# Transit functions
## Bus, no bus lane
Expand Down

0 comments on commit 425981f

Please sign in to comment.