joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

修改：头码车进路选择逻辑

Browse Source
This commit is contained in:
joylink_zhangsai 2021-07-06 09:51:26 +08:00
parent 34118c2732
commit 5bb62daef0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsRouteSettingService.java
View File

@ -397,13 +397,18 @@ public class AtsRouteSettingService {
if (this.hasSameEnd(triggerList)) { if (this.hasSameEnd(triggerList)) {
// 多延续保护进路，取延续保护是定位的那条 // 多延续保护进路，取延续保护是定位的那条
// todo 暂时逻辑定为只触发定位保护进路，后需完善为根据接下来的运行目的选择延续保护 // todo 暂时逻辑定为只触发定位保护进路，后需完善为根据接下来的运行目的选择延续保护
Route alternative = null;
for (Route route : triggerList) { for (Route route : triggerList) {
if (this.isOverlapStraight(route)) {
if (this.isAtsTrigger(simulation, train, route, false, trainList)) { if (this.isAtsTrigger(simulation, train, route, false, trainList)) {
if (this.isOverlapStraight(route)) {
return route; return route;
} else {
alternative = route;
} }
} }
} }
if (alternative != null)
return alternative;
} else { } else {
for (Route route : triggerList) { for (Route route : triggerList) {
if (this.isAtsTrigger(simulation, train, route, false, trainList)) { if (this.isAtsTrigger(simulation, train, route, false, trainList)) {