Skip to content
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.

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

Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304 #241

Merged
merged 2 commits into from
Aug 14, 2020

Conversation

Sharpe49
Copy link
Contributor

And also a bit of refactoring

@Sharpe49 Sharpe49 added bug Something isn't working refactoring Changes with minimal user-visible effects labels Jul 26, 2020
twpol pushed a commit that referenced this pull request Jul 26, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #226 at 26983e9: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at dd38ddc: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #237 at ab92942: Fixed 3D cab loading with undefined cabview control in CVF file https://bugs.launchpad.net/or/+bug/1888945
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
@YoRyan
Copy link
Member

YoRyan commented Jul 26, 2020

From your comment on the bug report,

Increasing the distance value won't solve the problem. As in the activity mode, we need to use the SignalNumClearAhead variable to know how much signals must be opened in front of our train.

But if I'm reading your diff right, your fix is to replace minCheckDistanceM with Math.Max(AllowedMaxSpeedMpS * maxTimeS, minCheckDistanceM) - ergo, increasing the distance. Can you explain how this interacts with the SignalNumClearAhead property?

@Sharpe49
Copy link
Contributor Author

Look at the date of the bug report, it says 2016. :)
I have looked at this problem again a few days ago.

I think this is happening :

  • The simulator class asks for an update of the trains
  • The train class reserves the path for 5 km only due to the way the code I just fixed is working
  • The simulator class then asks for an update of the signals
  • The signals are updated according to the SNCA parameter... but since the path is not reserved beyond 5 km, the route_set() condition is not true and the signals after 5 km are not opening.

@Sharpe49
Copy link
Contributor Author

I am also currently running some tests : I may have to increase the maxTimeS parameter to 3 minutes (only on high speed lines).

twpol pushed a commit that referenced this pull request Jul 26, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #226 at 26983e9: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 8a8bf3d: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
@Sharpe49
Copy link
Contributor Author

I have probably a better idea : instead of saying "if the allowed speed is above 250 kph, then the max time is 3 minutes, otherwise, it is 2 minutes."
These parameters can be modified... in the TCS script. I'll try this.

@YoRyan
Copy link
Member

YoRyan commented Jul 26, 2020

I would not advise this. High speed routes should just work, whether or not a TCS script is present.

What's the upper bound on the maximum check distance and time? Is it just the computation time?

twpol pushed a commit that referenced this pull request Jul 27, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at efca5a1: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #239 at 490517b: Russification/weter
- Pull request #240 at db95d71: Update ru.po
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
twpol pushed a commit that referenced this pull request Jul 27, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at be372fc: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #239 at 490517b: Russification/weter
- Pull request #240 at db95d71: Update ru.po
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
twpol pushed a commit that referenced this pull request Jul 27, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at be372fc: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #239 at 490517b: Russification/weter
- Pull request #240 at db95d71: Update ru.po
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #242 at 245f14a: docs: Rewrite readme to point people are many more useful places
twpol pushed a commit that referenced this pull request Jul 28, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at c99d903: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #239 at 490517b: Russification/weter
- Pull request #240 at db95d71: Update ru.po
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #242 at 245f14a: docs: Rewrite readme to point people are many more useful places
twpol pushed a commit that referenced this pull request Jul 28, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 767a88f: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #239 at 490517b: Russification/weter
- Pull request #240 at db95d71: Update ru.po
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #242 at 245f14a: docs: Rewrite readme to point people are many more useful places
twpol pushed a commit that referenced this pull request Jul 28, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at cee02c6: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #239 at 490517b: Russification/weter
- Pull request #240 at db95d71: Update ru.po
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #242 at 245f14a: docs: Rewrite readme to point people are many more useful places
twpol pushed a commit that referenced this pull request Jul 28, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at a6e724a: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at bbdede3: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #239 at 490517b: Russification/weter
- Pull request #240 at db95d71: Update ru.po
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
twpol pushed a commit that referenced this pull request Jul 29, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at a6e724a: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at bbdede3: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #239 at 490517b: Russification/weter
- Pull request #240 at db95d71: Update ru.po
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
@Sharpe49
Copy link
Contributor Author

What do you mean ? In real life ?

@YoRyan
Copy link
Member

YoRyan commented Jul 30, 2020

Sorry - I mean, so far as you can tell, is there any reasoning behind the 5km limit? What would happen if we increased it, so that more signals will be able to clear?

twpol pushed a commit that referenced this pull request Jul 30, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at a6e724a: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #239 at 490517b: Russification/weter
- Pull request #240 at db95d71: Update ru.po
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
@Sharpe49
Copy link
Contributor Author

I don't think there is a reasoning behind this value.
If we increase it too much, we may deadlock other routes too soon.

Perhaps I can try this :

  • Get SNCA value for next signal
  • Find the distance to nth signal according to SNCA value
  • Reserve track for this distance.

@YoRyan
Copy link
Member

YoRyan commented Jul 30, 2020

Yes, that sounds like a reasonable approach.

I don't know much about the signal system myself - so don't feel the need to follow my suggestions - but I hope we can find a solution that doesn't depend on increasing some arbitrary distance.

twpol pushed a commit that referenced this pull request Jul 31, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at e8f1bf4: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #239 at 490517b: Russification/weter
- Pull request #240 at db95d71: Update ru.po
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
twpol pushed a commit that referenced this pull request Jul 31, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at e8f1bf4: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #239 at 490517b: Russification/weter
- Pull request #240 at db95d71: Update ru.po
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
twpol pushed a commit that referenced this pull request Jul 31, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at e8f1bf4: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #239 at 490517b: Russification/weter
- Pull request #240 at db95d71: Update ru.po
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
twpol pushed a commit that referenced this pull request Jul 31, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at e8f1bf4: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #239 at 490517b: Russification/weter
- Pull request #240 at db95d71: Update ru.po
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #246 at 60c7f0a: Spanish manual
twpol pushed a commit that referenced this pull request Jul 31, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at e8f1bf4: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #239 at 490517b: Russification/weter
- Pull request #240 at db95d71: Update ru.po
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
twpol pushed a commit that referenced this pull request Jul 31, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at e8f1bf4: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #239 at 490517b: Russification/weter
- Pull request #240 at db95d71: Update ru.po
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
twpol pushed a commit that referenced this pull request Jul 31, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at e8f1bf4: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #239 at 9552cdd: Russification/weter
- Pull request #240 at db95d71: Update ru.po
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
twpol pushed a commit that referenced this pull request Jul 31, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at e8f1bf4: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #239 at beaf619: Russification/weter
- Pull request #240 at db95d71: Update ru.po
- Pull request #241 at 5080214: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
twpol pushed a commit that referenced this pull request Aug 2, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 73ed5d1: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #241 at 987b9d3: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #248 at 5739906: Russian translation
- Pull request #249 at f657cd5: Trackmonitor and train driving webpages in a single one.
twpol pushed a commit that referenced this pull request Aug 3, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 73ed5d1: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #241 at 987b9d3: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #248 at b95b2f8: Russian translation
- Pull request #249 at f657cd5: Trackmonitor and train driving webpages in a single one.
twpol pushed a commit that referenced this pull request Aug 4, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 6b88eb3: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #241 at 987b9d3: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #248 at b95b2f8: Russian translation
- Pull request #249 at f657cd5: Trackmonitor and train driving webpages in a single one.
twpol pushed a commit that referenced this pull request Aug 4, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at a3286e0: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #241 at 987b9d3: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #248 at b95b2f8: Russian translation
- Pull request #249 at f657cd5: Trackmonitor and train driving webpages in a single one.
twpol pushed a commit that referenced this pull request Aug 4, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 0dc0892: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #241 at 987b9d3: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #248 at b95b2f8: Russian translation
- Pull request #249 at f657cd5: Trackmonitor and train driving webpages in a single one.
@Sharpe49
Copy link
Contributor Author

Sharpe49 commented Aug 6, 2020

Finally, I managed to make it work properly on my side.
Ready to be tested and reviewed.

twpol pushed a commit that referenced this pull request Aug 6, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 0dc0892: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #241 at ddd28b1: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #248 at b95b2f8: Russian translation
twpol pushed a commit that referenced this pull request Aug 6, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 0dc0892: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #241 at ddd28b1: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #248 at b95b2f8: Russian translation
- Pull request #250 at 9dd9410: Bug fix for https://bugs.launchpad.net/or/+bug/1890585 Crash when switching from a 2D cab loco to a 3D cab only loco
twpol pushed a commit that referenced this pull request Aug 8, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 0dc0892: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #241 at ddd28b1: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #248 at b95b2f8: Russian translation
- Pull request #250 at 9dd9410: Bug fix for https://bugs.launchpad.net/or/+bug/1890585 Crash when switching from a 2D cab loco to a 3D cab only loco
- Pull request #252 at 07efa5a: Script compilation with Roslyn in order to support C# v7
Copy link
Member

@YoRyan YoRyan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks; it looks good to me. Maybe we leave it in unstable for another week or two and see if we get any reports of odd signal behavior.

twpol pushed a commit that referenced this pull request Aug 8, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 0dc0892: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #241 at ddd28b1: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #248 at 3bc190d: Russian translation
- Pull request #252 at 07efa5a: Script compilation with Roslyn in order to support C# v7
twpol pushed a commit that referenced this pull request Aug 8, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 0dc0892: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #241 at ddd28b1: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #248 at 68f2db1: Russian translation
- Pull request #252 at 07efa5a: Script compilation with Roslyn in order to support C# v7
twpol pushed a commit that referenced this pull request Aug 9, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 0dc0892: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #241 at ddd28b1: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #248 at 68f2db1: Russian translation
- Pull request #252 at 91d30aa: Script compilation with Roslyn in order to support C# v7
twpol pushed a commit that referenced this pull request Aug 10, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 0dc0892: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #241 at ddd28b1: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #248 at 68f2db1: Russian translation
- Pull request #253 at b571aee: Fix translations not displaying for the HUD Dispatcher Information tab: https://bugs.launchpad.net/or/+bug/1891066
twpol pushed a commit that referenced this pull request Aug 10, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 6db0144: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at f67b8c5: Rehabilitate unit testing suite, migrate to xUnit 2
- Pull request #241 at ddd28b1: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #243 at 9607b85: Fix lack of friction for wagons using freight animations with Davis values: https://bugs.launchpad.net/or/+bug/1889448
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #248 at 68f2db1: Russian translation
- Pull request #253 at b571aee: Fix translations not displaying for the HUD Dispatcher Information tab: https://bugs.launchpad.net/or/+bug/1891066
twpol pushed a commit that referenced this pull request Aug 10, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 6db0144: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #241 at ddd28b1: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #251 at 84823e5: Change 3D cab key behaviour + French locale updates
- Pull request #253 at b571aee: Fix translations not displaying for the HUD Dispatcher Information tab: https://bugs.launchpad.net/or/+bug/1891066
twpol pushed a commit that referenced this pull request Aug 11, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 6db0144: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #241 at ddd28b1: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #251 at 84823e5: Change 3D cab key behaviour + French locale updates
- Pull request #254 at 2f2c742: New signalling functions: Advanced callon, by roeter
twpol pushed a commit that referenced this pull request Aug 11, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 849d274: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #241 at ddd28b1: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #251 at 84823e5: Change 3D cab key behaviour + French locale updates
- Pull request #254 at 2f2c742: New signalling functions: Advanced callon, by roeter
twpol pushed a commit that referenced this pull request Aug 11, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at ee7a3e2: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #241 at ddd28b1: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #251 at 84823e5: Change 3D cab key behaviour + French locale updates
- Pull request #254 at 2f2c742: New signalling functions: Advanced callon, by roeter
twpol pushed a commit that referenced this pull request Aug 12, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at ee7a3e2: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #241 at ddd28b1: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #251 at 84823e5: Change 3D cab key behaviour + French locale updates
- Pull request #254 at eb9e5c5: New signalling functions: Advanced callon, by roeter
twpol pushed a commit that referenced this pull request Aug 12, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at ee7a3e2: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #241 at ddd28b1: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #245 at 220ba32: Manual build fixes
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #251 at 84823e5: Change 3D cab key behaviour + French locale updates
twpol pushed a commit that referenced this pull request Aug 12, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #232 at ee7a3e2: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #241 at ddd28b1: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #251 at 84823e5: Change 3D cab key behaviour + French locale updates
twpol pushed a commit that referenced this pull request Aug 12, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #232 at ee7a3e2: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #241 at ddd28b1: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #251 at 84823e5: Change 3D cab key behaviour + French locale updates
- Pull request #255 at 92d5f4d: Refactor MultiTTFilePreliminaryRead and MultiTTFileRead into a common function: https://blueprints.launchpad.net/or/+spec/separate-multitt
twpol pushed a commit that referenced this pull request Aug 14, 2020
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #232 at ee7a3e2: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #241 at ddd28b1: Fixed delayed opening of signals on high speed lines in explorer mode https://bugs.launchpad.net/or/+bug/1613304
- Pull request #244 at e7f37e9: expanded Variable Sound Triggers
- Pull request #247 at 171d288: adds Manual.pdf in Spanish
- Pull request #251 at 84823e5: Change 3D cab key behaviour + French locale updates
- Pull request #255 at 7d6ffc6: Refactor MultiTTFilePreliminaryRead and MultiTTFileRead into a common function: https://blueprints.launchpad.net/or/+spec/separate-multitt
@cjakeman
Copy link
Contributor

Thanks; it looks good to me. Maybe we leave it in unstable for another week or two and see if we get any reports of odd signal behavior.

It's had long enough now, I think.

Approved with thanks,

Chris

@cjakeman cjakeman merged commit 276885d into openrails:master Aug 14, 2020
@YoRyan
Copy link
Member

YoRyan commented Aug 14, 2020

Unfortunately, we now have a bug report related to this change.

Full traceback:

Error: System.ArgumentOutOfRangeException: Index was out of range. Must be non-negative and less than the size of the collection.
Parameter name: index
   at System.ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument argument, ExceptionResource resource)
   at System.Collections.Generic.List`1.get_Item(Int32 index)
   at Orts.Simulation.Signalling.Signals.ScanRoute(Train thisTrain, Int32 firstSectionIndex, Single firstOffset, Int32 firstDirection, Boolean forward, Single routeLength, Boolean honourManualSwitch, Boolean autoAlign, Boolean stopAtFacingSignal, Boolean reservedOnly, Boolean returnSections, Boolean searchFacingSignal, Boolean searchBackwardSignal, Boolean searchFacingSpeedpost, Boolean searchBackwardSpeedpost, Boolean isFreight, Boolean considerSpeedReset, Boolean checkReenterOriginalRoute) in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\Orts.Simulation\Simulation\Signalling\Signals.cs:line 3941
   at Orts.Simulation.Physics.Train.get_CheckDistanceM() in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\Orts.Simulation\Simulation\Physics\Train.cs:line 285
   at Orts.Simulation.Physics.Train.CheckRealDeadlock_locationBased(TCSubpathRoute thisRoute, TCSubpathRoute otherRoute, Int32& elementIndex) in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\Orts.Simulation\Simulation\Physics\Train.cs:line 12419
   at Orts.Simulation.Physics.Train.CheckDeadlock_locationBased(TCSubpathRoute thisRoute, Int32 thisNumber) in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\Orts.Simulation\Simulation\Physics\Train.cs:line 11973
   at Orts.Simulation.Physics.Train.CheckDeadlock(TCSubpathRoute thisRoute, Int32 thisNumber) in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\Orts.Simulation\Simulation\Physics\Train.cs:line 11727
   at Orts.Simulation.AIs.AITrain.PostInit() in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\Orts.Simulation\Simulation\AIs\AITrain.cs:line 411
   at Orts.Simulation.AIs.AI.AddToWorld(AITrain thisTrain) in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\Orts.Simulation\Simulation\AIs\AI.cs:line 977
   at Orts.Simulation.AIs.AI.AIUpdate(Single elapsedClockSeconds, Boolean preUpdate) in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\Orts.Simulation\Simulation\AIs\AI.cs:line 663
   at Orts.Simulation.AIs.AI.PrerunAI(CancellationToken cancellation) in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\Orts.Simulation\Simulation\AIs\AI.cs:line 353
   at Orts.Simulation.AIs.AI..ctor(Simulator simulator, CancellationToken cancellation, Double activityStartTime) in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\Orts.Simulation\Simulation\AIs\AI.cs:line 94
   at Orts.Simulation.Simulator.InitializeAPTrains(CancellationToken cancellation) in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\Orts.Simulation\Simulation\Simulator.cs:line 600
   at Orts.Simulation.Simulator.Start(CancellationToken cancellation) in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\Orts.Simulation\Simulation\Simulator.cs:line 465
   at Orts.Viewer3D.Processes.GameStateRunActivity.Start(UserSettings settings, String acttype, String[] options, String[] args) in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\RunActivity\Viewer3D\Processes\GameStateRunActivity.cs:line 300
   at Orts.Viewer3D.Processes.GameStateRunActivity.<>c__DisplayClass35_0.<Load>b__3() in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\RunActivity\Viewer3D\Processes\GameStateRunActivity.cs:line 162
   at Orts.Viewer3D.Processes.GameStateRunActivity.Load() in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\RunActivity\Viewer3D\Processes\GameStateRunActivity.cs:line 203
   at Orts.Viewer3D.Processes.LoaderProcess.Load() in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\RunActivity\Viewer3D\Processes\LoaderProcess.cs:line 159
   at Orts.Viewer3D.Processes.LoaderProcess.DoLoad() in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\RunActivity\Viewer3D\Processes\LoaderProcess.cs:line 138
   at Orts.Viewer3D.Processes.LoaderProcess.LoaderThread() in F:\ADRIANA\Carlo\OR_Work\Git_ORTS_source_mio\Source\RunActivity\Viewer3D\Processes\LoaderProcess.cs:line 109
   at System.Threading.ExecutionContext.RunInternal(ExecutionContext executionContext, ContextCallback callback, Object state, Boolean preserveSyncCtx)
   at System.Threading.ExecutionContext.Run(ExecutionContext executionContext, ContextCallback callback, Object state, Boolean preserveSyncCtx)
   at System.Threading.ExecutionContext.Run(ExecutionContext executionContext, ContextCallback callback, Object state)
   at System.Threading.ThreadHelper.ThreadStart()

Sharpe49 added a commit to Sharpe49/openrails that referenced this pull request Sep 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working refactoring Changes with minimal user-visible effects
3 participants