Merge pull request #493 from dartsim/command

Fix testJoint test
dartsim · Aug 17, 2015 · a139ad5 · a139ad5
2 parents 147420d + 7de0f8f
commit a139ad5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/dart/dynamics/SingleDofJoint.cpp b/dart/dynamics/SingleDofJoint.cpp
@@ -555,7 +555,7 @@ void SingleDofJoint::setVelocity(size_t _index, double _velocity)
 
   setVelocityStatic(_velocity);
 
-#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,0)
+#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,1)
   if (mJointP.mActuatorType == VELOCITY)
     mCommand = getVelocityStatic();
   // TODO: Remove at DART 5.1.
@@ -585,7 +585,7 @@ void SingleDofJoint::setVelocities(const Eigen::VectorXd& _velocities)
 
   setVelocityStatic(_velocities[0]);
 
-#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,0)
+#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,1)
   if (mJointP.mActuatorType == VELOCITY)
     mCommand = getVelocityStatic();
   // TODO: Remove at DART 5.1.
@@ -717,7 +717,7 @@ void SingleDofJoint::setAcceleration(size_t _index, double _acceleration)
 
   setAccelerationStatic(_acceleration);
 
-#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,0)
+#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,1)
   if (mJointP.mActuatorType == ACCELERATION)
     mCommand = getAccelerationStatic();
   // TODO: Remove at DART 5.1.
@@ -747,7 +747,7 @@ void SingleDofJoint::setAccelerations(const Eigen::VectorXd& _accelerations)
 
   setAccelerationStatic(_accelerations[0]);
 
-#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,0)
+#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,1)
   if (mJointP.mActuatorType == ACCELERATION)
     mCommand = getAccelerationStatic();
   // TODO: Remove at DART 5.1.
@@ -866,7 +866,7 @@ void SingleDofJoint::setForce(size_t _index, double _force)
 
   mForce = _force;
 
-#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,0)
+#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,1)
   if (mJointP.mActuatorType == FORCE)
     mCommand = mForce;
   // TODO: Remove at DART 5.1.
@@ -896,7 +896,7 @@ void SingleDofJoint::setForces(const Eigen::VectorXd& _forces)
 
   mForce = _forces[0];
 
-#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,0)
+#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,1)
   if (mJointP.mActuatorType == FORCE)
     mCommand = mForce;
   // TODO: Remove at DART 5.1.
@@ -914,7 +914,7 @@ void SingleDofJoint::resetForces()
 {
   mForce = 0.0;
 
-#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,0)
+#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,1)
   if (mJointP.mActuatorType == FORCE)
     mCommand = mForce;
   // TODO: Remove at DART 5.1.

diff --git a/dart/dynamics/detail/MultiDofJoint.h b/dart/dynamics/detail/MultiDofJoint.h
@@ -679,7 +679,7 @@ void MultiDofJoint<DOF>::setVelocity(size_t _index, double _velocity)
   mVelocities[_index] = _velocity;
   notifyVelocityUpdate();
 
-#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,0)
+#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,1)
   if (mJointP.mActuatorType == VELOCITY)
     mCommands[_index] = getVelocitiesStatic()[_index];
   // TODO: Remove at DART 5.1.
@@ -711,7 +711,7 @@ void MultiDofJoint<DOF>::setVelocities(const Eigen::VectorXd& _velocities)
 
   setVelocitiesStatic(_velocities);
 
-#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,0)
+#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,1)
   if (mJointP.mActuatorType == VELOCITY)
     mCommands = getVelocitiesStatic();
   // TODO: Remove at DART 5.1.
@@ -857,7 +857,7 @@ void MultiDofJoint<DOF>::setAcceleration(size_t _index, double _acceleration)
   mAccelerations[_index] = _acceleration;
   notifyAccelerationUpdate();
 
-#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,0)
+#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,1)
   if (mJointP.mActuatorType == ACCELERATION)
     mCommands[_index] = getAccelerationsStatic()[_index];
   // TODO: Remove at DART 5.1.
@@ -889,7 +889,7 @@ void MultiDofJoint<DOF>::setAccelerations(const Eigen::VectorXd& _accelerations)
 
   setAccelerationsStatic(_accelerations);
 
-#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,0)
+#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,1)
   if (mJointP.mActuatorType == ACCELERATION)
     mCommands = getAccelerationsStatic();
   // TODO: Remove at DART 5.1.
@@ -1024,7 +1024,7 @@ void MultiDofJoint<DOF>::setForce(size_t _index, double _force)
 
   mForces[_index] = _force;
 
-#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,0)
+#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,1)
   if (mJointP.mActuatorType == FORCE)
     mCommands[_index] = mForces[_index];
   // TODO: Remove at DART 5.1.
@@ -1056,7 +1056,7 @@ void MultiDofJoint<DOF>::setForces(const Eigen::VectorXd& _forces)
 
   mForces = _forces;
 
-#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,0)
+#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,1)
   if (mJointP.mActuatorType == FORCE)
     mCommands = mForces;
   // TODO: Remove at DART 5.1.
@@ -1076,7 +1076,7 @@ void MultiDofJoint<DOF>::resetForces()
 {
   mForces.setZero();
 
-#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,0)
+#if DART_MAJOR_MINOR_VERSION_AT_MOST(5,1)
   if (mJointP.mActuatorType == FORCE)
     mCommands = mForces;
   // TODO: Remove at DART 5.1.