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-03-11 10:26:55 +08:00
parent 37c306ac27
commit 9681255916
7 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/club/joylink/rtss/services/draftData/DraftMapCiDataGeneratorImpl.java
View File

@ -400,20 +400,20 @@ public class DraftMapCiDataGeneratorImpl implements DraftMapCiDataGenerator {
List<Section> tbSections = new ArrayList<>();
if (right) {
if (rightStandTrack.isTurnBackTrack()
&& !CollectionUtils.isEmpty(CalculateService.queryRoutePathsOnDirection(rightStandTrack, adjacentLeftStandTrack, false))) {
&& !CollectionUtils.isEmpty(CalculateService.queryRoutePathsOnDirection(rightStandTrack, adjacentLeftStandTrack, false, 10))) {
tbSections.add(rightStandTrack);
}
if (leftStandTrack.isTurnBackTrack()
&& !CollectionUtils.isEmpty(CalculateService.queryRoutePathsOnDirection(adjacentRightStandTrack, leftStandTrack, true))) {
&& !CollectionUtils.isEmpty(CalculateService.queryRoutePathsOnDirection(adjacentRightStandTrack, leftStandTrack, true, 10))) {
tbSections.add(leftStandTrack);
}
} else {
if (rightStandTrack.isTurnBackTrack()
&& !CollectionUtils.isEmpty(CalculateService.queryRoutePathsOnDirection(adjacentLeftStandTrack, rightStandTrack, false))) {
&& !CollectionUtils.isEmpty(CalculateService.queryRoutePathsOnDirection(adjacentLeftStandTrack, rightStandTrack, false, 10))) {
tbSections.add(rightStandTrack);
}
if (leftStandTrack.isTurnBackTrack()
&& !CollectionUtils.isEmpty(CalculateService.queryRoutePathsOnDirection(leftStandTrack, adjacentRightStandTrack, true))) {
&& !CollectionUtils.isEmpty(CalculateService.queryRoutePathsOnDirection(leftStandTrack, adjacentRightStandTrack, true, 10))) {
tbSections.add(leftStandTrack);
}
}
@ -431,7 +431,7 @@ public class DraftMapCiDataGeneratorImpl implements DraftMapCiDataGenerator {
}
Section standTrack = station.getNormalStand(right).get(0).getSection();
return turnBackList.stream().filter(section -> !section.isNormalStandTrack())
.filter(section -> !CollectionUtils.isEmpty(CalculateService.queryRoutePathsOnDirection(standTrack, section, right)))
.filter(section -> !CollectionUtils.isEmpty(CalculateService.queryRoutePathsOnDirection(standTrack, section, right, 10)))
.collect(Collectors.toList());
}
@ -1404,10 +1404,10 @@ public class DraftMapCiDataGeneratorImpl implements DraftMapCiDataGenerator {
runLevelVO.setEndSectionCode(endSection.getCode());
runLevelVO.setEndStationCode(endSection.getStation().getCode());
runLevelVO.setRight(right);
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(startSection, endSection, right);
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(startSection, endSection, right, 10);
if (CollectionUtils.isEmpty(routePaths)) {
// 未找到，反方向再找
routePaths = CalculateService.queryRoutePathsOnDirection(startSection, endSection, !right);
routePaths = CalculateService.queryRoutePathsOnDirection(startSection, endSection, !right, 10);
if (!CollectionUtils.isEmpty(routePaths)) {
log.info(String.format("站间运行等级[%s]与交路[%s]方向相反，实际为[%s]",
String.format("%s(%s(%s))->%s(%s(%s))",
@ -1463,7 +1463,7 @@ public class DraftMapCiDataGeneratorImpl implements DraftMapCiDataGenerator {
adjacentSections.forEach(endSection -> {
//验证是否是进路路径的站间
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(startSection, endSection, right);
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(startSection, endSection, right, 10);
if (CollectionUtils.isEmpty(routePaths)) {
log.warn(String.format("站间运行等级数据生成失败：没有找到[%s(%s) ——> %s(%s)]对应方向[%s]的进路路径可达的站间",
startSection.getStation().getName(), startSection.getName(), endSection.getStation().getName(), endSection.getName(), right ? "右向" : "左向"));

2
src/main/java/club/joylink/rtss/services/simulation/SimulationSupportService.java
View File

@ -40,7 +40,7 @@ public class SimulationSupportService {
VirtualRealityTrain train = simulation.getRepository().getOnlineTrainBy(groupNumber);
Section startSection = train.getHeadPosition().getSection();
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(startSection, destination, train.isRight());
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(startSection, destination, train.isRight(), 10);
return routePaths.stream()
.map(routePath -> CalculateService.selectUniqueRoutes(routePath, false)
.stream().map(MapElement::getCode).collect(Collectors.toList()))

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

@ -95,9 +95,9 @@ public class AtsRouteSettingService {
return destDefinition.queryNextRoute(headSection);
} else if (train.getEstimatedArriveStandTrack() != null) {
Section targetSection = repository.getByCode(train.getEstimatedArriveStandTrack(), Section.class);
routePaths = CalculateService.queryRoutePathsOnDirection(headSection, targetSection, true);
routePaths = CalculateService.queryRoutePathsOnDirection(headSection, targetSection, true, 10);
if (CollectionUtils.isEmpty(routePaths)) {
routePaths = CalculateService.queryRoutePathsOnDirection(headSection, targetSection, false);
routePaths = CalculateService.queryRoutePathsOnDirection(headSection, targetSection, false, 10);
}
} else {
// 目的地定义存在，根据目的地定义查询路径，办理进路

8
src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsTrainService.java
View File

@ -515,7 +515,7 @@ public class AtsTrainService {
Section tbSection = strategy.getSectionList().get(0);
switch (strategy.getType()) {
case FIRST:
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(headSection, tbSection, standRight);
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(headSection, tbSection, standRight, 10);
if (routePaths.stream().anyMatch(path -> !path.isOccupied())) {
nextTarget = tbSection;
}
@ -532,7 +532,7 @@ public class AtsTrainService {
if (section.isNormalStandTrack()) {
continue;
}
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(headSection, section, standRight);
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(headSection, section, standRight, 10);
if (routePaths.stream().anyMatch(path -> !path.isOccupied())) {
nextTarget = section;
break;
@ -563,7 +563,7 @@ public class AtsTrainService {
break;
}
nextTarget = adjacentStation.getNormalStand(!standRight).get(0).getSection();
if (CollectionUtils.isEmpty(CalculateService.queryRoutePathsOnDirection(headSection, nextTarget, standRight))) {
if (CollectionUtils.isEmpty(CalculateService.queryRoutePathsOnDirection(headSection, nextTarget, standRight, 10))) {
nextTarget = adjacentStation.getNormalStand(standRight).get(0).getSection();
}
} else {
@ -582,7 +582,7 @@ public class AtsTrainService {
if (nextTarget == null) {
nextTarget = headStation.getNormalStand(destinationRight).get(0).getSection();
if (!headSection.equals(nextTarget)) {
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(headSection, nextTarget, destinationRight);
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(headSection, nextTarget, destinationRight, 10);
if (!CollectionUtils.isEmpty(routePaths)) {
break;
}

2
src/main/java/club/joylink/rtss/simulation/cbtc/build/InterlockBuilder2.java
View File

@ -869,7 +869,7 @@ public class InterlockBuilder2 {
Section startSection = runLevel.getStartSection();
Section endSection = runLevel.getEndSection();
boolean right = runLevel.isRight();
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(startSection, endSection, right);
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(startSection, endSection, right, 10);
if (CollectionUtils.isEmpty(routePaths)) {
errMsgList.add(String.format("站间运行等级[%s]无法找到路径",
runLevel.debugStr(), startSection.debugStr(), endSection.debugStr()));

4
src/main/java/club/joylink/rtss/simulation/cbtc/build/SimulationBuilder.java
View File

@ -157,10 +157,10 @@ public class SimulationBuilder {
String key = RoutePath.buildKey(start, end);
if (!routePathMap.containsKey(key)) {
// 路径不存在，尝试构建
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(start, end, tripPlan.isRight());
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(start, end, tripPlan.isRight(), 10);
if (CollectionUtils.isEmpty(routePaths)) {
// 计划方向路径未找到，反向尝试
routePaths = CalculateService.queryRoutePathsOnDirection(start, end, !tripPlan.isRight());
routePaths = CalculateService.queryRoutePathsOnDirection(start, end, !tripPlan.isRight(), 10);
}
if (CollectionUtils.isEmpty(routePaths)) {
// 依然未找到

26
src/main/java/club/joylink/rtss/simulation/cbtc/data/CalculateService.java
View File

@ -635,11 +635,11 @@ public class CalculateService {
return false;
}
public static List<RoutePath> queryRoutePathsOnDirection(Section start, Section end, Boolean right) {
public static List<RoutePath> queryRoutePathsOnDirection(Section start, Section end, Boolean right, int iterTimes) {
List<RoutePath> list = new ArrayList<>();
List<String> warnList = new ArrayList<>();
RoutePath routePath = new RoutePath(start, end, right);
queryRoutePaths(0, start, routePath, list, warnList);
queryRoutePaths(0, iterTimes, start, routePath, list, warnList);
if (!CollectionUtils.isEmpty(list)) {
for (RoutePath path : list) {
path.calculateDistance();
@ -659,7 +659,7 @@ public class CalculateService {
* @param preferredSections 优先经过这些区段，可以为null
*/
public static RoutePath queryLeastSwitchRoutePath(Section startSection, Section endSection, Collection<Section> preferredSections, boolean toRight) {
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(startSection, endSection, toRight);
List<RoutePath> routePaths = CalculateService.queryRoutePathsOnDirection(startSection, endSection, toRight, 100);
if (CollectionUtils.isEmpty(routePaths)) {
return null;
} else {
@ -695,14 +695,14 @@ public class CalculateService {
}
}
private static void queryRoutePaths(int iter, Section section, RoutePath routePath,
private static void queryRoutePaths(int iter, int iterTimes, Section section, RoutePath routePath,
List<RoutePath> list, List<String> warnList) {
if (section == null) {
warnList.add(String.format("进路路径[%s]未找到,找到的最后区段为[%s],下一区段为null",
routePath.debugStr(), routePath.getLastSection().debugStr()));
return;
}
if (iter > 100) {
if (iter > iterTimes) {
warnList.add(String.format("进路路径[%s]未找到：迭代100次,最后区段为[%s]",
routePath.debugStr(), routePath.getLastSection().debugStr()));
return;
@ -721,20 +721,20 @@ public class CalculateService {
} else {
// 添加并进行迭代
routePath.addSection(next);
queryRoutePaths(iter + 1, next, routePath, list, warnList);
queryRoutePaths(iter + 1, iterTimes, next, routePath, list, warnList);
}
} else if (section.isSwitchTrack()) { // 道岔区段
Switch relSwitch = section.getRelSwitch();
if (relSwitch.isA(section)) {
RoutePath path1 = routePath.cloneNew();
path1.addSection(relSwitch.getB());
queryRoutePaths(iter + 1, relSwitch.getB(), path1, list, warnList);
queryRoutePaths(iter + 1, iterTimes, relSwitch.getB(), path1, list, warnList);
RoutePath path2 = routePath.cloneNew();
path2.addSection(relSwitch.getC());
queryRoutePaths(iter + 1, relSwitch.getC(), path2, list, warnList);
queryRoutePaths(iter + 1, iterTimes, relSwitch.getC(), path2, list, warnList);
} else {
routePath.addSection(relSwitch.getA());
queryRoutePaths(iter + 1, relSwitch.getA(), routePath, list, warnList);
queryRoutePaths(iter + 1, iterTimes, relSwitch.getA(), routePath, list, warnList);
}
} else {
warnList.add(String.format("区段[%s]的[%s]区段不存在",
@ -760,7 +760,7 @@ public class CalculateService {
list.add(routePath);
} else {
routePath.addSections(sectionList);
queryRoutePaths(iter + 1, route.getLastRouteSection(), routePath, list, warnList);
queryRoutePaths(iter + 1, iterTimes, route.getLastRouteSection(), routePath, list, warnList);
}
return;
}
@ -823,7 +823,7 @@ public class CalculateService {
} else {
for (RoutePath clone : iterList) {
Section next = clone.getLastSection();
queryRoutePaths(iter + 1, next, clone, list, warnList);
queryRoutePaths(iter + 1, iterTimes, next, clone, list, warnList);
}
}
} else {
@ -845,7 +845,7 @@ public class CalculateService {
for (Section next : sectionList) {
routePath.addSection(next);
if (next.getSignalOf(right) != null) {
queryRoutePaths(iter + 1, next, routePath, list, warnList);
queryRoutePaths(iter + 1, iterTimes, next, routePath, list, warnList);
break;
}
}
@ -1113,7 +1113,7 @@ public class CalculateService {
// if (distance == null) {
// return null;
// }
List<RoutePath> routePaths = queryRoutePathsOnDirection(train.getHeadPosition().getSection(), target, right);
List<RoutePath> routePaths = queryRoutePathsOnDirection(train.getHeadPosition().getSection(), target, right, 10);
if (CollectionUtils.isEmpty(routePaths)) {
return null;
}