From eee04ea3285552407601d680bbaa7231f95bccf5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 04 十一月 2023 13:22:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/NavigateSolution.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateSolution.java b/src/main/java/com/zy/common/utils/NavigateSolution.java
index 89046a8..4488b42 100644
--- a/src/main/java/com/zy/common/utils/NavigateSolution.java
+++ b/src/main/java/com/zy/common/utils/NavigateSolution.java
@@ -3,6 +3,7 @@
import com.zy.common.model.NavigateNode;
import java.util.ArrayList;
+import java.util.List;
import java.util.PriorityQueue;
/**
@@ -21,10 +22,13 @@
this.map = data;
}
- public NavigateSolution(String mapType) {
- //杞藉叆鍦板浘
- NavigateMapData mapData = new NavigateMapData();
- int[][] data = mapData.getData(mapType);
+ public NavigateSolution(Integer mapType, Integer lev, List<int[]> whitePoints, List<int[]> shuttlePoints) {
+ //杞藉叆鍦板浘鎸囧畾灞傞珮鍦板浘
+ NavigateMapData mapData = new NavigateMapData(lev);
+ int[][] data = mapData.getDataFromRedis(mapType, whitePoints, shuttlePoints);
+ if (data == null) {
+ data = mapData.getData(mapType, whitePoints, shuttlePoints);
+ }
this.map = data;
}
@@ -135,8 +139,8 @@
}
}
- if (map[x][y] == 0 || map[x][y] == 3) {
- //瀛愯建鍜屾瘝杞ㄦ墠鑳借繘琛屼笂涓嬬Щ鍔�
+ if (map[x][y] == 0 || map[x][y] == 3 || map[x][y] == 4 || map[x][y] == 5) {
+ //瀛愯建鍜屾瘝杞ㄣ�佽緭閫佺嚎銆佸厖鐢垫々鎵嶈兘杩涜涓婁笅绉诲姩
if (is_valid(x + 1, y))
{
NavigateNode node = new NavigateNode(x + 1, y);
--
Gitblit v1.9.1