Unverified Commit 4382538f authored by Florent Lamiraux's avatar Florent Lamiraux Committed by GitHub
Browse files

Merge pull request #141 from florent-lamiraux/devel

Fix ConvexShapeContactComplement
parents a875ff2b 5bdb520c
Pipeline #14809 passed with stage
in 11 minutes and 31 seconds
......@@ -580,6 +580,14 @@ namespace Eigen {
YOU_MIXED_MATRICES_OF_DIFFERENT_SIZES);
}
MatrixBlocks& operator=(const MatrixBlocks& other)
{
m_nbRows = other.m_nbRows;
m_nbCols = other.m_nbCols;
m_rows = other.m_rows;
m_cols = other.m_cols;
return *this;
}
/// Clear rows
inline void clearRows ()
{
......
......@@ -167,7 +167,8 @@ namespace hpp {
pose_.push_back(RelativePose::create
("",robot, fs[j].joint_, os[i].joint_,
posInJoint, os[i].positionInJoint(),
6 * Equality, std::vector<bool>(6, true)));
EqualToZero << 3 * Equality << 2 * EqualToZero,
std::vector<bool>(6, true)));
}
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment