Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
sot-dynamic-pinocchio
Commits
64474532
Commit
64474532
authored
Dec 21, 2016
by
Rohan Budhiraja
Browse files
[python] DynamicPinocchio is the new (plugin/module name) being generated
parent
1a7ef61b
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/dynamic_graph/sot/dynamics_pinocchio/__init__.py
View file @
64474532
from
dynamic
import
Dynamic
as
Dynamic
Old
from
dynamic
import
Dynamic
Pinocchio
as
Dynamic
Cpp
from
angle_estimator
import
AngleEstimator
from
zmp_from_forces
import
ZmpFromForces
import
numpy
as
np
...
...
@@ -6,9 +6,9 @@ from numpy import arctan2, arcsin, sin, cos, sqrt
#DynamicOld = Dynamic
class
Dynamic
(
Dynamic
Old
):
class
Dynamic
Pinocchio
(
Dynamic
Cpp
):
def
__init__
(
self
,
name
):
Dynamic
Old
.
__init__
(
self
,
name
)
Dynamic
Cpp
.
__init__
(
self
,
name
)
self
.
model
=
None
self
.
data
=
None
...
...
src/dynamic_graph/sot/dynamics_pinocchio/humanoid_robot.py
View file @
64474532
...
...
@@ -376,7 +376,7 @@ class AbstractHumanoidRobot (object):
self
.
dynamic
.
signal
(
self
.
OperationalPointsMap
[
op
]).
recompute
(
self
.
device
.
state
.
time
+
1
)
self
.
dynamic
.
signal
(
'J'
+
self
.
OperationalPointsMap
[
op
]).
recompute
(
self
.
device
.
state
.
time
+
1
)
from
dynamic_graph.sot.dynamics
import
Dynamic
from
dynamic_graph.sot.dynamics
_pinocchio
import
Dynamic
Pinocchio
class
HumanoidRobot
(
AbstractHumanoidRobot
):
def
__init__
(
self
,
name
,
pinocchio_model
,
pinocchio_data
,
initialConfig
,
OperationalPointsMap
=
None
,
tracer
=
None
):
AbstractHumanoidRobot
.
__init__
(
self
,
name
,
tracer
)
...
...
@@ -385,7 +385,7 @@ class HumanoidRobot(AbstractHumanoidRobot):
self
.
OperationalPoints
.
append
(
'chest'
)
self
.
OperationalPointsMap
=
OperationalPointsMap
self
.
dynamic
=
Dynamic
(
self
.
name
+
"_dynamic"
)
self
.
dynamic
=
Dynamic
Pinocchio
(
self
.
name
+
"_dynamic"
)
self
.
dynamic
.
setModel
(
pinocchio_model
)
self
.
dynamic
.
setData
(
pinocchio_data
)
self
.
dimension
=
self
.
dynamic
.
getDimension
()
...
...
src/dynamic_graph/sot/dynamics_pinocchio/parser.py
View file @
64474532
...
...
@@ -7,7 +7,7 @@
#
import
xml.dom.minidom
as
dom
from
dynamic_graph.sot.dynamics_pinocchio.dynamic
import
Dynamic
from
dynamic_graph.sot.dynamics_pinocchio.dynamic
import
Dynamic
Pinocchio
from
dynamic_graph.sot.tools.se3
import
SE3
,
R3
,
SO3
class
Parser
(
object
):
...
...
@@ -56,7 +56,7 @@ class Parser (object):
robotTag
=
"HPP_HUMANOID_ROBOT"
def
__init__
(
self
,
entityName
,
filename
):
self
.
entity
=
Dynamic
(
entityName
)
self
.
entity
=
Dynamic
Pinocchio
(
entityName
)
self
.
filename
=
filename
def
parse
(
self
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment