Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compilation after rename #126

Merged
merged 2 commits into from
Sep 5, 2024
Merged

Fix compilation after rename #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88316a4
Fix compilation after rename
alxbilger Sep 2, 2024
aab47ca
more fixes
alxbilger Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Cosserat/constraint/CosseratActuatorConstraint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ class CosseratActuatorConstraint : public CableModel<DataTypes>
using CableModel<DataTypes>::d_displacement ;
using CableModel<DataTypes>::d_componentState ;
using CableModel<DataTypes>::m_nbLines ;
using CableModel<DataTypes>::m_constraintIndex ;
using CableModel<DataTypes>::d_constraintIndex ;
using CableModel<DataTypes>::m_state ;
using CableModel<DataTypes>::d_indices ;
using CableModel<DataTypes>::d_pullPoint;
Expand Down
6 changes: 3 additions & 3 deletions src/Cosserat/constraint/CosseratActuatorConstraint.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ void CosseratActuatorConstraint<DataTypes>::buildConstraintMatrix(const Constrai

SOFA_UNUSED(cParams);

m_constraintIndex.setValue(cIndex);
const auto& constraintIndex = sofa::helper::getReadAccessor(m_constraintIndex);
d_constraintIndex.setValue(cIndex);
const auto& constraintIndex = sofa::helper::getReadAccessor(d_constraintIndex);

MatrixDeriv& matrix = *cMatrix.beginEdit();

Expand Down Expand Up @@ -169,7 +169,7 @@ void CosseratActuatorConstraint<DataTypes>::getConstraintViolation(const Constra


for (unsigned i=0;i<d_indices.getValue().size();i++) {
resV->set(m_constraintIndex.getValue(), dfree);
resV->set(d_constraintIndex.getValue(), dfree);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Cosserat/constraint/CosseratNeedleSlidingConstraint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ namespace sofa::component::constraintset
////////////////////////////////////////////////////////////////////////////
/// \brief internalInit
unsigned m_nbLines ;
using Constraint<DataTypes>::m_constraintIndex ;
using Constraint<DataTypes>::d_constraintIndex ;

void internalInit();
};
Expand Down
6 changes: 3 additions & 3 deletions src/Cosserat/constraint/CosseratNeedleSlidingConstraint.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ namespace sofa::component::constraintset
SOFA_UNUSED(cParams);
MatrixDeriv &matrix = *cMatrix.beginEdit();
VecCoord positions = x.getValue();
m_constraintIndex.setValue(cIndex);
d_constraintIndex.setValue(cIndex);

type::Vec<3, bool> use = d_useDirections.getValue();

Expand All @@ -131,7 +131,7 @@ namespace sofa::component::constraintset
}
}
cMatrix.endEdit();
m_nbLines = cIndex - m_constraintIndex.getValue();
m_nbLines = cIndex - d_constraintIndex.getValue();

}

Expand All @@ -151,7 +151,7 @@ namespace sofa::component::constraintset
//ReadAccessor<Data<VecCoord>> positions = this->mstate->readPositions();
const VecCoord positions = x.getValue();
type::Vec<3, bool> use = d_useDirections.getValue();
const auto& constraintIndex = sofa::helper::getReadAccessor(m_constraintIndex);
const auto& constraintIndex = sofa::helper::getReadAccessor(d_constraintIndex);

for (unsigned int i = 0; i < positions.size(); i++)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Cosserat/constraint/QPSlidingConstraint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ class QPSlidingConstraint : public softrobots::constraint::CableModel<DataTypes>
////////////////////////////////////////////////////////////////////////////
/// \brief internalInit
using softrobots::constraint::SoftRobotsConstraint<DataTypes>::m_nbLines ;
using softrobots::constraint::SoftRobotsConstraint<DataTypes>::m_constraintIndex ;
using softrobots::constraint::SoftRobotsConstraint<DataTypes>::d_constraintIndex ;

void internalInit();
};
Expand Down
6 changes: 3 additions & 3 deletions src/Cosserat/constraint/QPSlidingConstraint.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ void QPSlidingConstraint<DataTypes>::buildConstraintMatrix(const ConstraintParam
SOFA_UNUSED(cParams);
MatrixDeriv& matrix = *cMatrix.beginEdit();
VecCoord positions = x.getValue();
m_constraintIndex.setValue(cIndex);
const auto& constraintIndex = sofa::helper::getReadAccessor(m_constraintIndex);
d_constraintIndex.setValue(cIndex);
const auto& constraintIndex = sofa::helper::getReadAccessor(d_constraintIndex);

for (unsigned int i=0; i<positions.size(); i++)
{
Expand Down Expand Up @@ -156,7 +156,7 @@ void QPSlidingConstraint<DataTypes>::getConstraintViolation(const ConstraintPara

SOFA_UNUSED(cParams);
ReadAccessor<Data<VecCoord>> positions = m_state->readPositions();
const auto& constraintIndex = sofa::helper::getReadAccessor(m_constraintIndex);
const auto& constraintIndex = sofa::helper::getReadAccessor(d_constraintIndex);

if(Jdx->size()==0){
//std::cout << "Size JDX = "<< Jdx->size() << std::endl;
Expand Down
Loading