Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
ros3rag
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JastAdd
ros3rag
Commits
d76dfd2d
Commit
d76dfd2d
authored
2 years ago
by
René Schöne
Browse files
Options
Downloads
Patches
Plain Diff
update
- fix bug after remove CanReachObjectOfInterestWrapper
parent
3bd1297d
No related branches found
No related tags found
No related merge requests found
Pipeline
#13909
failed
2 years ago
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ros3rag.scaling.b/src/main/java/de/tudresden/inf/st/scaling/b/MainScalingB.java
+4
-6
4 additions, 6 deletions
...main/java/de/tudresden/inf/st/scaling/b/MainScalingB.java
with
4 additions
and
6 deletions
ros3rag.scaling.b/src/main/java/de/tudresden/inf/st/scaling/b/MainScalingB.java
+
4
−
6
View file @
d76dfd2d
...
...
@@ -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
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment