Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
db-guided-mrmp
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
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
rmoan2
db-guided-mrmp
Commits
470eedca
Commit
470eedca
authored
2 months ago
by
rachelmoan
Browse files
Options
Downloads
Patches
Plain Diff
Save the tree to the robot class object and load the radius from the settings file
parent
83558624
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
guided_mrmp/utils/control.py
+1
-0
1 addition, 0 deletions
guided_mrmp/utils/control.py
guided_mrmp/utils/robot.py
+2
-1
2 additions, 1 deletion
guided_mrmp/utils/robot.py
with
3 additions
and
1 deletion
guided_mrmp/utils/control.py
+
1
−
0
View file @
470eedca
...
@@ -41,6 +41,7 @@ class Roomba(ControlSpace):
...
@@ -41,6 +41,7 @@ class Roomba(ControlSpace):
self
.
max_d_acc
=
settings
[
'
Roomba
'
][
'
max_d_acc
'
]
self
.
max_d_acc
=
settings
[
'
Roomba
'
][
'
max_d_acc
'
]
self
.
max_steer
=
np
.
radians
(
settings
[
'
Roomba
'
][
'
max_steer
'
])
self
.
max_steer
=
np
.
radians
(
settings
[
'
Roomba
'
][
'
max_steer
'
])
self
.
max_d_steer
=
np
.
radians
(
settings
[
'
Roomba
'
][
'
max_d_steer
'
])
self
.
max_d_steer
=
np
.
radians
(
settings
[
'
Roomba
'
][
'
max_d_steer
'
])
self
.
radius
=
settings
[
'
Roomba
'
][
'
radius
'
]
def
state_dimension
(
self
):
def
state_dimension
(
self
):
# State is [x, y, theta]
# State is [x, y, theta]
...
...
This diff is collapsed.
Click to expand it.
guided_mrmp/utils/robot.py
+
2
−
1
View file @
470eedca
import
numpy
as
np
import
numpy
as
np
class
Robot
:
class
Robot
:
def
__init__
(
self
,
label
,
color
,
radius
,
start
,
goal
,
dynamics_model
,
target_v
,
rrtpath
,
waypoints
):
def
__init__
(
self
,
label
,
color
,
radius
,
start
,
goal
,
dynamics_model
,
target_v
,
rrtpath
,
waypoints
,
tree
):
self
.
label
=
label
self
.
label
=
label
self
.
color
=
color
self
.
color
=
color
self
.
radius
=
radius
self
.
radius
=
radius
...
@@ -12,6 +12,7 @@ class Robot:
...
@@ -12,6 +12,7 @@ class Robot:
self
.
rrtpath
=
rrtpath
self
.
rrtpath
=
rrtpath
self
.
dynamics_model
=
dynamics_model
self
.
dynamics_model
=
dynamics_model
self
.
waypoints
=
waypoints
self
.
waypoints
=
waypoints
self
.
tree
=
tree
self
.
last_mpc_trajectory
=
None
self
.
last_mpc_trajectory
=
None
self
.
last_mpc_controls
=
None
self
.
last_mpc_controls
=
None
...
...
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