Skip to content

TTL wait=0 bug #1673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 12, 2022
Merged

TTL wait=0 bug #1673

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54f5e90
TTL log slider
kianzarrin Oct 8, 2022
60650cd
kianzarrin Oct 8, 2022
b693967
fixed wait=0 bug
kianzarrin Oct 10, 2022
191e203
Merge branch 'master' into TTL-wait-bug
kianzarrin Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions TLM/TLM/TrafficLight/Impl/TimedTrafficLightsStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,10 +677,6 @@ public bool StepDone(bool updateValues) {
float newFlow = CurrentFlow;
float newWait = CurrentWait;

#if DEBUG
newFlow = flow;
newWait = wait;
#else
if (ChangeMetric != StepChangeMetric.Default || Single.IsNaN(newFlow)) {
newFlow = flow;
} else {
Expand All @@ -689,7 +685,7 @@ public bool StepDone(bool updateValues) {
flow; // some smoothing
}

if (Single.IsNaN(newWait)) {
if (Single.IsNaN(newWait) && ChangeMetric != StepChangeMetric.NoWait) {
newWait = 0;
} else if (ChangeMetric != StepChangeMetric.Default) {
newWait = wait;
Expand All @@ -698,7 +694,6 @@ public bool StepDone(bool updateValues) {
(1f - GlobalConfig.Instance.TimedTrafficLights.SmoothingFactor) *
wait; // some smoothing
}
#endif

// if more cars are waiting than flowing, we change the step
bool done = ShouldGoToNextStep(newFlow, newWait, out float _);
Expand Down