From d76dfd2d709840fb525550788c79cac0a65e08f1 Mon Sep 17 00:00:00 2001 From: rschoene <rene.schoene@tu-dresden.de> Date: Wed, 15 Jun 2022 16:56:14 +0200 Subject: [PATCH] update - fix bug after remove CanReachObjectOfInterestWrapper --- .../de/tudresden/inf/st/scaling/b/MainScalingB.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ros3rag.scaling.b/src/main/java/de/tudresden/inf/st/scaling/b/MainScalingB.java b/ros3rag.scaling.b/src/main/java/de/tudresden/inf/st/scaling/b/MainScalingB.java index bda361c..23dc37e 100644 --- a/ros3rag.scaling.b/src/main/java/de/tudresden/inf/st/scaling/b/MainScalingB.java +++ b/ros3rag.scaling.b/src/main/java/de/tudresden/inf/st/scaling/b/MainScalingB.java @@ -156,26 +156,24 @@ public class MainScalingB { Robot robot = new Robot().setName("ARM" + robotIndex); // reachability - CanReachObjectOfInterestWrapper wrapper = new CanReachObjectOfInterestWrapper(); // each robot arm can reach the location of its region (and the start region, for the first robot) if (robotIndex == 0) { for (String location : world.findRegion("Start").locationNamesAsList()) { - wrapper.addCanReachObjectOfInterest(new CanReachObjectOfInterest(location)); + robot.addCanReachObjectOfInterest(new CanReachObjectOfInterest(location)); } } for (String location : world.findRegion(regionOfRobot).locationNamesAsList()) { - wrapper.addCanReachObjectOfInterest(new CanReachObjectOfInterest(location)); + robot.addCanReachObjectOfInterest(new CanReachObjectOfInterest(location)); } // add reachability for collaboration zones if (robotIndex != 0) { // reachability to previous collaboration zone - wrapper.addCanReachObjectOfInterest(new CanReachObjectOfInterest("P-Collab" + (robotIndex - 1))); + robot.addCanReachObjectOfInterest(new CanReachObjectOfInterest("P-Collab" + (robotIndex - 1))); } if (robotIndex != config.robots - 1) { // reachability to its collaboration zone - wrapper.addCanReachObjectOfInterest(new CanReachObjectOfInterest("P-Collab" + (robotIndex))); + robot.addCanReachObjectOfInterest(new CanReachObjectOfInterest("P-Collab" + (robotIndex))); } - robot.setCanReachObjectOfInterestWrapper(wrapper); world.addRobot(robot); } -- GitLab