Skip to content
Snippets Groups Projects
Commit 72f5e20b authored by Olivier Stasse's avatar Olivier Stasse
Browse files

[wip/sot-pattern-generator-v3] Update to 3.0.1

Fix compiling problem.
Fix pinocchio dynamics introduction.
parent 483731d0
No related branches found
No related tags found
No related merge requests found
......@@ -2,8 +2,7 @@
# Created: Olivier Stasse on Thu, 18 Apr 2013
#
VERSION= 3.0.0
PKG_REVISION= 1.0
VERSION= 3.0.1
DISTNAME= sot-pattern-generator-v3-${VERSION}
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=sot-pattern-generator-v3/}
MASTER_REPOSITORY=\
......
......@@ -2,7 +2,6 @@
include/sot-pattern-generator/config.hh
include/sot-pattern-generator/deprecated.hh
include/sot-pattern-generator/warning.hh
include/sot-pattern-generator/config.h
lib/pkgconfig/sot-pattern-generator.pc
lib/plugin/exception-pg.so.${PKGVERSION}
lib/plugin/exception-pg.so
......
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
SHA1 (sot-pattern-generator-v3-3.0.1.tar.gz) = 7ea05506b2e677ce756b109e197762a70f58772f
RMD160 (sot-pattern-generator-v3-3.0.1.tar.gz) = c45898d215fef5311e9e15c1c8a9492f3f396b69
Size (sot-pattern-generator-v3-3.0.1.tar.gz) = 829201 bytes
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])
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment