From d32dae7ffed5e215ac092f29a458e0c8bde2008b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 十月 2024 15:57:55 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/DispatcherTestController.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DispatcherTestController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DispatcherTestController.java
index 3e2db2d..cef313a 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DispatcherTestController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DispatcherTestController.java
@@ -42,13 +42,20 @@
return codeService.getById(node).getData();
}).collect(Collectors.toList()));
}
+ List<String> codeDataList = codeList.stream().map(Code::getData).collect(Collectors.toList());
+ System.out.println(codeDataList.toString());
+ System.out.println(adjacencyCodeMap.toString());
+
+
Set<String> visited = new HashSet<>();
- for (String codeData : codeList.stream().map(Code::getData).collect(Collectors.toList())) {
- if (!visited.contains(codeData)) {
- Lane lane = new Lane(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
- dfsCalc(codeData, null, lane, visited, adjacencyCodeMap);
- lanes.add(lane);
+ for (String codeData : codeDataList) {
+ if (adjacencyCodeMap.get(codeData).size() != 2) {
+ if (!visited.contains(codeData)) {
+ Lane lane = new Lane(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
+ dfsCalc(codeData, null, lane, visited, adjacencyCodeMap);
+ lanes.add(lane);
+ }
}
}
System.out.println(GsonUtils.toJson(lanes));
@@ -79,9 +86,17 @@
if (parent == null) {
return true;
}
- double direction1 = calculateDirection(codeService.selectByData(parent) , codeService.selectByData(code));
- double direction2 = calculateDirection(codeService.selectByData(code), codeService.selectByData(neighbor));
- return direction1 == direction2;
+ Code parentCode = codeService.selectByData(parent);
+ Code currentCode = codeService.selectByData(code);
+ Code neighborCode = codeService.selectByData(neighbor);
+
+ double direction1 = calculateDirection(parentCode, currentCode);
+ double direction2 = calculateDirection(currentCode, neighborCode);
+ double angleDifference = Math.abs(direction1 - direction2);
+
+ angleDifference = Math.min(angleDifference, 2 * Math.PI - angleDifference);
+
+ return angleDifference < Math.toRadians(3);
}
public double calculateDirection(Code from, Code to) {
--
Gitblit v1.9.1