diff --git a/python/meta_task_dyn_6d.py b/python/meta_task_dyn_6d.py index 070c73ba0aff554e40d38cfd5e3f083c0fd8727c..c42948553b3bbd1b373c62eef256d31f819852ea 100644 --- a/python/meta_task_dyn_6d.py +++ b/python/meta_task_dyn_6d.py @@ -11,7 +11,7 @@ class MetaTaskDyn6d(MetaTask6d): self.gain = GainAdaptive('gain'+self.name) self.gain.set(1050,45,125e3) def plugEverything(self): - self.feature.sdes.value = self.featureDes.name + self.feature.setReference(self.featureDes.name) plug(self.dyn.signal(self.opPoint),self.feature.signal('position')) plug(self.dyn.signal('J'+self.opPoint),self.feature.signal('Jq')) self.task.add(self.feature.name) diff --git a/python/meta_tasks_dyn.py b/python/meta_tasks_dyn.py index de192bafb5030102b167d99ca3e9b5fdc5877cea..0893fbd793b7558e80b2441a98ee3375f8f76c48 100644 --- a/python/meta_tasks_dyn.py +++ b/python/meta_tasks_dyn.py @@ -73,8 +73,7 @@ class MetaTaskDynPosture(object): plug(dyn.position,self.feature.errorIN) robotDim = len(dyn.position.value) self.feature.jacobianIN.value = matrixToTuple( identity(robotDim) ) -# self.feature.setReference(self.featureDes.name) - self.feature.sdes.value = self.featureDes.name + self.feature.setReference(self.featureDes.name) self.task.add(self.feature.name) plug(dyn.velocity,self.task.qdot) @@ -120,8 +119,7 @@ class MetaTaskDynCom(object): plug(dyn.com,self.feature.errorIN) plug(dyn.Jcom,self.feature.jacobianIN) -# self.feature.setReference(self.featureDes.name) - self.feature.sdes.value = self.featureDes.name + self.feature.setReference(self.featureDes.name) self.task.add(self.feature.name) plug(dyn.velocity,self.task.qdot) diff --git a/src/feature-projected-line.cpp b/src/feature-projected-line.cpp index 09f8aa521a8b28ceeb5e971a543247b14aebd12d..5bc9289c91abf47fc9c624948c2e8e96caa0a097 100644 --- a/src/feature-projected-line.cpp +++ b/src/feature-projected-line.cpp @@ -53,7 +53,6 @@ namespace dynamicgraph /* --- CLASS ----------------------------------------------------------- */ /* --------------------------------------------------------------------- */ - FeatureProjectedLine:: FeatureProjectedLine( const std::string& pointName ) : FeatureAbstract( pointName ) @@ -74,12 +73,9 @@ namespace dynamicgraph errorSOUT.addDependency( xbSIN ); errorSOUT.addDependency( xcSIN ); - activationSOUT.removeDependency( desiredValueSIN ); - signalRegistration( xaSIN << xbSIN << xcSIN << JaSIN << JbSIN ); } - /* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */ @@ -117,17 +113,6 @@ namespace dynamicgraph & dya=JA(1,i),& dyb=JB(1,i); J(0,i) = dxa*(yb-yc) - dxb*(ya-yc) - dya*(xb-xc) + dyb*(xa-xc); } - // J.resize(3,nq); - // for( int i=0;i<nq;++i ) - // { - // const double - // & dxa=JA(0,i),& dxb=JB(0,i), - // & dya=JA(1,i),& dyb=JB(1,i), - // & dza=JA(2,i),& dzb=JB(2,i); - // J(0,i) = dxa; - // J(1,i) = dya; - // J(2,i) = dza; - // } sotDEBUGOUT(15); return J; @@ -150,12 +135,6 @@ namespace dynamicgraph error.resize(1); error(0) = (xb-xa)*(yc-ya)-(yb-ya)*(xc-xa); - // error.resize(3); - // error(0) = xa-xc; - // error(1) = ya-yc; - // error(2) = A(2,3) - C(2); - //std::cout << time << " " << ya << " " << yc << std::endl; - sotDEBUGOUT(15); return error ; } diff --git a/src/feature-projected-line.h b/src/feature-projected-line.h index 2ddd9a8adf11183eb30ea131e43a3ca4a2cc7da4..f83dfa55d59f0f25506271667a4b0f999d1d0fd7 100644 --- a/src/feature-projected-line.h +++ b/src/feature-projected-line.h @@ -72,15 +72,15 @@ namespace dynamicgraph { DECLARE_SIGNAL_IN(Jb,ml::Matrix); DECLARE_SIGNAL_IN(xc,ml::Vector); + DECLARE_NO_REFERENCE; + public: FeatureProjectedLine( const std::string& name ); virtual ~FeatureProjectedLine( void ) {} virtual unsigned int& getDimension( unsigned int & dim, int time ); - virtual ml::Vector& computeError( ml::Vector& res,int time ); virtual ml::Matrix& computeJacobian( ml::Matrix& res,int time ); - virtual ml::Vector& computeActivation( ml::Vector& res,int) {return res;} virtual void display( std::ostream& os ) const;