From 0dab5a05ed6e734a83c43f8e6e5ef1b07115f48d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 10 十二月 2024 10:50:54 +0800
Subject: [PATCH] #path similarity
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/NavigateNode.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/NavigateNode.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/NavigateNode.java
index 3770c7b..92e0c82 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/NavigateNode.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/NavigateNode.java
@@ -3,6 +3,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.util.Optional;
/**
* A*瀵昏矾绠楁硶Node鑺傜偣
@@ -15,7 +16,7 @@
private int x;//鍧愭爣x
private int y;//鍧愭爣y
private int z;//鍧愭爣z(楂樺害)
- private int nodeZ;
+ private Integer lastDistance;//姝ユ暟
private int F;//缁煎悎鑺辫垂鐨勬鏁�
private int G;//宸茬粡鑺辫垂鐨勬鏁�
private int H;//灏嗚鑺辫垂鐨勬鏁�
@@ -34,8 +35,8 @@
public void init_node(NavigateNode father, NavigateNode end) {
this.Father = father;
if (this.Father != null) {
- //璧拌繃鐨勬鏁扮瓑浜庣埗鑺傜偣璧拌繃鐨勬鏁板姞涓�
- this.G = father.G + 1;
+ //璧拌繃鐨勬鏁扮瓑浜庣埗鑺傜偣璧拌繃鐨勬鏁板姞鏈�鏂版鏁�
+ this.G = father.G + Optional.ofNullable(this.lastDistance).orElse(0);
} else { //鐖惰妭鐐逛负绌轰唬琛ㄥ畠鏄涓�涓粨鐐�
this.G = 0;
}
@@ -49,11 +50,6 @@
@Override
public int compareTo(NavigateNode o) {
return Integer.compare(this.F, o.F);
- }
-
- public void setZ(int z) {
- this.z = z;
- this.nodeZ = z;
}
@Override
--
Gitblit v1.9.1