From 36c3720a2bb1334902c54b6c77a2fd8e9573fbd4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 05 十一月 2024 03:31:40 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/RetreatNavigateService.java | 91 ++++++++++++++++++++++++---------------------
1 files changed, 48 insertions(+), 43 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/RetreatNavigateService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/RetreatNavigateService.java
index 2de4a3a..4e66ed4 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/RetreatNavigateService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/RetreatNavigateService.java
@@ -31,7 +31,7 @@
private final RedisSupport redis = RedisSupport.defaultRedisSupport;
- public static final int WEIGHT_CALC_COEFFICIENT = 1000;
+ public static final int WEIGHT_CALC_COEFFICIENT = 10000;
@Autowired
private CodeService codeService;
@@ -168,7 +168,8 @@
RetreatNavigateNode availablePointOfTurn = null;
List<String> availablePointWaveScopeOfTurn = new ArrayList<>();
- int actuallyLanesOfTurn = 0;
+ int actualLanesOfTurn = 0;
+ int filterPointOfTurnTimes = 0;
while (openQueue.size() > 0 && null == finialNode) {
@@ -176,51 +177,54 @@
List<RetreatNavigateNode> enableNodes = new ArrayList<>();
ArrayList<RetreatNavigateNode> neighborNodes = this.getNeighborNodes(currentNode, existNodes);
- boolean pointOfTurn = false;
- if (neighborNodes.size() >= 2 && !isSame(start, currentNode)) {
- pointOfTurn = true;
- }
- // 璁＄畻鏄惁涓哄彲鐢ㄨ浆寮偣
- if (pointOfTurn) {
- for (RetreatNavigateNode node : neighborNodes) {
- // lane
- Lane lane = laneService.search(node.getCodeData());
- if (null != lane) {
- Set<String> lanVehicleSet = new HashSet<>();
+ // 绗竴姝ワ細鑾峰彇鏈夋晥杞集鐐�
+ if (null == availablePointOfTurn) {
+ // 璁＄畻鏄惁涓哄彲鐢ㄨ浆寮偣
+ if (neighborNodes.size() >= 2 && !isSame(start, currentNode)) {
+ filterPointOfTurnTimes ++;
+ if (filterPointOfTurnTimes > 2) { break; }
- List<String> laneCodes = lane.getCodes();
- for (String laneCodeData : laneCodes) {
- int[] laneCodeMatrixIdx = mapDataDispatcher.getCodeMatrixIdx(null, laneCodeData);
- // scan dynamicMatrix or WaveMatrix
- DynamicNode laneDynamicNode = dynamicMatrix[laneCodeMatrixIdx[0]][laneCodeMatrixIdx[1]];
- String laneVehicle = laneDynamicNode.getVehicle();
- assert !laneVehicle.equals(DynamicNodeType.BLOCK.val);
- if (!laneVehicle.equals(DynamicNodeType.ACCESS.val)) {
- if (!laneVehicle.equals(agvNo)) {
- lanVehicleSet.add(laneVehicle);
-// redis.setObject(RedisConstant.AGV_TO_STANDBY_FLAG, laneVehicle, true, 30);
+ for (RetreatNavigateNode node : neighborNodes) {
+ // lane
+ Lane lane = laneService.search(node.getCodeData());
+ if (null != lane) {
+ Set<String> lanVehicleSet = new HashSet<>();
+
+ for (String laneCodeData : lane.getCodes()) {
+ int[] laneCodeMatrixIdx = mapDataDispatcher.getCodeMatrixIdx(null, laneCodeData);
+ // scan dynamicMatrix or WaveMatrix
+ DynamicNode laneDynamicNode = dynamicMatrix[laneCodeMatrixIdx[0]][laneCodeMatrixIdx[1]];
+ String laneVehicle = laneDynamicNode.getVehicle();
+ assert !laneVehicle.equals(DynamicNodeType.BLOCK.val);
+ if (!laneVehicle.equals(DynamicNodeType.ACCESS.val)) {
+ if (!laneVehicle.equals(agvNo)) {
+ lanVehicleSet.add(laneVehicle);
+// redis.setObject(RedisConstant.AGV_TO_STANDBY_FLAG, laneVehicle, true, 30);
+ }
}
+ }
+
+ if (lanVehicleSet.size() + 1 > maxAgvCountInLane) {
+ continue;
}
}
- if (lanVehicleSet.size() + 1 > maxAgvCountInLane) {
- continue;
- }
+ actualLanesOfTurn ++;
}
- actuallyLanesOfTurn ++;
+ // 鏈変袱鏉′互涓婂彲璧板贩閬擄紝鍒欒涓烘湁鏁堣浆寮偣
+ if (actualLanesOfTurn >= 2) {
+ availablePointOfTurn = currentNode;
+ availablePointWaveScopeOfTurn = mapService.getWaveScopeByCode(lev, availablePointOfTurn.getCodeData(), avoidDistance)
+ .stream().map(NavigateNode::getCodeData).distinct().collect(Collectors.toList());
+ } else {
+ actualLanesOfTurn = 0;
+ }
}
-
- if (actuallyLanesOfTurn >= 2) {
- availablePointOfTurn = currentNode;
- availablePointWaveScopeOfTurn = mapService.getWaveScopeByCode(lev, availablePointOfTurn.getCodeData(), avoidDistance)
- .stream().map(NavigateNode::getCodeData).distinct().collect(Collectors.toList());
- }
-
}
-
+ // 寤朵几杞集鐐瑰贩閬�
label: for (RetreatNavigateNode node : neighborNodes) {
int weight = 0;
@@ -236,10 +240,9 @@
}
if (1 < mapDataDispatcher.queryCodeListFromDynamicNode(lev, otherWave).size()) {
- if (null != availablePointOfTurn && actuallyLanesOfTurn > 0) {
- actuallyLanesOfTurn --;
+ if (null != availablePointOfTurn && actualLanesOfTurn > 0) {
+ actualLanesOfTurn --;
}
-
continue label;
} else {
weight += WEIGHT_CALC_COEFFICIENT;
@@ -260,10 +263,12 @@
existNodes.add(node);
}
-
- if (!Cools.isEmpty(enableNodes)) {
-
- if (actuallyLanesOfTurn >= 2) {
+ if (actualLanesOfTurn < 2) {
+ availablePointOfTurn = null;
+ availablePointWaveScopeOfTurn = new ArrayList<>();
+ actualLanesOfTurn = 0;
+ } else {
+ if (!Cools.isEmpty(enableNodes)) {
Collections.sort(enableNodes);
finialNode = enableNodes.stream().findFirst().orElse(null);
jam.setCycleAvo(1);
--
Gitblit v1.9.1