From d8f361c9d69271aaa58ba19e75f38e0fee00f3bb Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 十二月 2024 08:36:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/NavigateSolution.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateSolution.java b/src/main/java/com/zy/common/utils/NavigateSolution.java
index d377c8b..2ad8529 100644
--- a/src/main/java/com/zy/common/utils/NavigateSolution.java
+++ b/src/main/java/com/zy/common/utils/NavigateSolution.java
@@ -16,21 +16,12 @@
int[][] map = {{}};
- public NavigateSolution() {
- //杞藉叆鍦板浘
- NavigateMapData navigateMapData = SpringUtils.getBean(NavigateMapData.class);
- navigateMapData.setLev(1);
- int[][] data = navigateMapData.getData();
- this.map = data;
- }
-
public NavigateSolution(Integer mapType, Integer lev, List<int[]> whitePoints, List<int[]> shuttlePoints) {
//杞藉叆鍦板浘鎸囧畾灞傞珮鍦板浘
NavigateMapData navigateMapData = SpringUtils.getBean(NavigateMapData.class);
- navigateMapData.setLev(lev);
- int[][] data = navigateMapData.getDataFromRedis(mapType, whitePoints, shuttlePoints);
+ int[][] data = navigateMapData.getDataFromRedis(lev, mapType, whitePoints, shuttlePoints);
if (data == null) {
- data = navigateMapData.getData(mapType, whitePoints, shuttlePoints);
+ data = navigateMapData.getData(lev, mapType, whitePoints, shuttlePoints);
}
this.map = data;
}
@@ -62,7 +53,7 @@
//瀵硅繖涓粨鐐归亶鍘嗭紝鐪嬫槸鍚︽湁鐩爣缁撶偣鍑虹幇
for (NavigateNode node : neighbour_node) {
// G + H + E (瀵瑰惎鍙戝嚱鏁板鍔犲幓鎷愮偣鏂规calcNodeExtraCost)
- int gCost = calcNodeCost(current_node, node) * calcNodeExtraCost(current_node, node, end);
+ int gCost = calcNodeCost(current_node, node) + calcNodeExtraCost(current_node, node, end);
if (node.getX() == end.getX() && node.getY() == end.getY()) {//鎵惧埌鐩爣缁撶偣灏辫繑鍥�
//init_node鎿嶄綔鎶婅繖涓偦灞呯粨鐐圭殑鐖惰妭鐐硅缃负褰撳墠缁撶偣
//骞朵笖璁＄畻鍑篏锛� F锛� H绛夊��
@@ -207,7 +198,13 @@
// 鎷愬悜涓昏建閬撶殑鐐�
if (map[nextNode.getX()][nextNode.getY()] == 3) {
- return 1;
+ //------------------涓夊嚡鐙壒鍒ゆ柇------------------//
+ if (nextNode.getX() == 15) {
+ return 2;//褰卞搷绠楁硶锛屼笉瑕佸湪15鎺掕繖涓富杞ㄩ亾鎹㈠悜
+ }
+ //------------------涓夊嚡鐙壒鍒ゆ柇------------------//
+
+ return 0;
}
// 鏅�氭嫄鐐�
--
Gitblit v1.9.1