From 85392bb7db247c4596d3fbf49c9e00cfd0e76a13 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 11 九月 2025 09:15:11 +0800
Subject: [PATCH] 1
---
algo-zkd/src/main/java/com/algo/AlgorithmMain.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/algo-zkd/src/main/java/com/algo/AlgorithmMain.java b/algo-zkd/src/main/java/com/algo/AlgorithmMain.java
index e596e88..a8774ff 100644
--- a/algo-zkd/src/main/java/com/algo/AlgorithmMain.java
+++ b/algo-zkd/src/main/java/com/algo/AlgorithmMain.java
@@ -6,18 +6,24 @@
import com.algo.service.PathPlanningService;
import com.algo.service.TaskAllocationService;
import com.algo.util.AgvTaskUtils;
-import com.algo.util.JsonUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.List;
-import java.util.Map;
@SpringBootTest
@RunWith(SpringRunner.class)
public class AlgorithmMain {
+
+
+ @Autowired
+ private TaskAllocationService taskAllocationService;
+
+ @Autowired
+ private PathPlanningService pathPlanningService;
/**
@@ -25,12 +31,7 @@
*/
@Test
public void taskAllocationService() {
- Map<String, Map<String, Integer>> pathMapping = JsonUtils.loadPathMapping("path_mapping.json");
- System.out.println(pathMapping);
- Map<String, Object> environment = JsonUtils.loadEnvironment("environment.json");
- System.out.println(environment);
- TaskAllocationService taskAllocationService = new TaskAllocationService(pathMapping, environment);
List<AGVStatus> agvStatusList = AgvTaskUtils.loadAgvStatus("ctu_agv_status.json");
System.out.println(agvStatusList);
@@ -50,17 +51,13 @@
*/
@Test
public void pathPlanningService() {
- Map<String, Map<String, Integer>> pathMapping = JsonUtils.loadPathMapping("path_mapping.json");
- System.out.println(pathMapping);
- Map<String, Object> environment = JsonUtils.loadEnvironment("environment.json");
- System.out.println(environment);
+
List<TaskData> taskList = AgvTaskUtils.loadTaskList("ctu_task_data.json");
System.out.println(taskList);
- PathPlanningService pathPlanningService = new PathPlanningService(pathMapping, environment, taskList);
List<AGVStatus> agvStatusList = AgvTaskUtils.loadAgvStatus("ctu_agv_status.json");
System.out.println(agvStatusList);
- PathPlanningService.PathPlanningResult planningResult = pathPlanningService.planAllAgvPaths(agvStatusList, true, null);
+ PathPlanningService.PathPlanningResult planningResult = pathPlanningService.planAllAgvPaths(taskList, agvStatusList, true, null);
System.out.println(planningResult);
}
--
Gitblit v1.9.1