Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
robotpkg-wip
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
Container Registry
Model registry
Operate
Environments
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
Gepetto
robotpkg-wip
Commits
32331d56
Commit
32331d56
authored
8 years ago
by
Rohan Budhiraja
Browse files
Options
Downloads
Patches
Plain Diff
[wip/sot-pattern-generator-v3][Patch] Change the name of the dynamics module
parent
bf934196
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
sot-pattern-generator-v3/distinfo
+1
-0
1 addition, 0 deletions
sot-pattern-generator-v3/distinfo
sot-pattern-generator-v3/patches/patch-aa
+60
-0
60 additions, 0 deletions
sot-pattern-generator-v3/patches/patch-aa
with
61 additions
and
0 deletions
sot-pattern-generator-v3/distinfo
+
1
−
0
View file @
32331d56
SHA1 (sot-pattern-generator-v3-3.0.0.tar.gz) = b0ba60be96d1d776023f4659fd9d90d26c54523c
RMD160 (sot-pattern-generator-v3-3.0.0.tar.gz) = 47219db114fccd34ea1e87048406fe5c06c7ae00
Size (sot-pattern-generator-v3-3.0.0.tar.gz) = 148498 bytes
SHA1 (patch-aa) = 5415ec570fa33d04f8e092ac09e20ce6c2989d1d
This diff is collapsed.
Click to expand it.
sot-pattern-generator-v3/patches/patch-aa
0 → 100644
+
60
−
0
View file @
32331d56
The name of the dynamics module is dynamics_pinocchio
The name of the dynamics class is DynamicPinocchio
--- src/dynamic_graph/sot/pattern_generator/meta_pg.py 2016-10-19 16:38:57.000000000 +0200
+++ src/dynamic_graph/sot/pattern_generator/meta_pg.py 2017-02-28 15:39:47.764456278 +0100
@@ -1,7 +1,7 @@
from dynamic_graph.sot.core import *
from dynamic_graph import plug
from dynamic_graph.sot.pattern_generator import PatternGenerator,Selector
-from dynamic_graph.sot.dynamics import *
+from dynamic_graph.sot.dynamics_pinocchio import *
class MetaPG:
def __init__(self,dyn):
@@ -44,7 +44,7 @@
self.pg.initState()
# --- PG INIT FRAMES ---
- self.geom = Dynamic("geom")
+ self.geom = DynamicPinocchio("geom")
self.geom.setFiles(modelDir, modelName,specificitiesPath,jointRankPath)
self.geom.parse()
self.geom.createOpPoint('rf','right-ankle')
--- src/dynamic_graph/sot/pattern_generator/walking.py 2016-10-19 16:38:57.000000000 +0200
+++ src/dynamic_graph/sot/pattern_generator/walking.py 2017-02-28 15:39:47.764456278 +0100
@@ -1,12 +1,12 @@
# --- PG ---------------------------------------------------------
from dynamic_graph import plug
from dynamic_graph.sot.core.math_small_entities import Derivator_of_Matrix, Inverse_of_matrixHomo, Multiply_of_matrixHomo, Stack_of_vector, PoseRollPitchYawToMatrixHomo, MatrixHomoToPoseRollPitchYaw, Multiply_matrixHomo_vector
-from dynamic_graph.sot.dynamics import Dynamic
+from dynamic_graph.sot.dynamics_pinocchio import DynamicPinocchio
import dynamic_graph.script_shortcuts
from dynamic_graph.script_shortcuts import optionalparentheses
from dynamic_graph.matlab import matlab
from dynamic_graph.sot.core import *
-from dynamic_graph.sot.dynamics import *
+from dynamic_graph.sot.dynamics_pinocchio import *
from dynamic_graph.sot.core.meta_task_6d import MetaTask6d,toFlags
from dynamic_graph.sot.pattern_generator import PatternGenerator,Selector
from dynamic_graph.sot.core.matrix_util import matrixToTuple
@@ -96,7 +96,7 @@
def addPgTaskToVRMLRobot(robot,solver):
# --- ROBOT.PG INIT FRAMES ---
- robot.geom = Dynamic("geom")
+ robot.geom = DynamicPinocchio("geom")
print("modelDir: ",robot.modelDir)
print("modelName:",robot.modelName)
print("specificitiesPath:",robot.specificitiesPath)
@@ -107,7 +107,7 @@
def addPgTaskToUrdfRobot(robot,solver):
# --- ROBOT.PG INIT FRAMES ---
- robot.geom = Dynamic("geom")
+ robot.geom = DynamicPinocchio("geom")
if(hasattr(robot, 'jointMap')):
for i in robot.jointMap:
robot.geom.addJointMapping(i, robot.jointMap[i])
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