Skip to content

Fix compilation regarding SOFA PR 5466 #159

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

Open
bakpaul wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compilation regarding SOFA PR 5466 #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions src/ModelOrderReduction/component/mapping/MORContactMapping.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ class MORContactMapping : public core::Mapping<TIn, TOut>

void applyJT(const core::ConstraintParams *cparams, Data<InMatrixDeriv>& out, const Data<MatrixDeriv>& in) override;

const sofa::linearalgebra::BaseMatrix* getJ() override;

void handleTopologyChange() override;

Expand All @@ -141,9 +140,8 @@ class MORContactMapping : public core::Mapping<TIn, TOut>
Eigen::MatrixXd m_matrix;
Eigen::MatrixXi contactIndices;

public:

const js_type* getJs() override;
const sofa::linearalgebra::BaseMatrix* doGetJ() override;
const js_type* doGetJs() override;

};

Expand Down
4 changes: 2 additions & 2 deletions src/ModelOrderReduction/component/mapping/MORContactMapping.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,13 @@ void MORContactMapping<TIn, TOut>::handleTopologyChange()
}

template <class TIn, class TOut>
const sofa::linearalgebra::BaseMatrix* MORContactMapping<TIn, TOut>::getJ()
const sofa::linearalgebra::BaseMatrix* MORContactMapping<TIn, TOut>::doGetJ()
{
return &J;
}

template <class TIn, class TOut>
const typename MORContactMapping<TIn, TOut>::js_type* MORContactMapping<TIn, TOut>::getJs()
const typename MORContactMapping<TIn, TOut>::js_type* MORContactMapping<TIn, TOut>::doGetJs()
{
return &Js;
}
Expand Down
4 changes: 2 additions & 2 deletions src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,12 @@ class ModelOrderReductionMapping : public linear::LinearMapping<TIn, TOut>

void applyJT(const core::ConstraintParams *cparams, Data<InMatrixDeriv>& out, const Data<MatrixDeriv>& in) override;

const sofa::linearalgebra::BaseMatrix* getJ() override;



protected:
const sofa::linearalgebra::BaseMatrix* doGetJ() override;
const js_type* doGetJs() override;

Eigen::MatrixXd m_modesEigen;
Eigen::MatrixXi m_listActiveNodes;
Expand All @@ -167,7 +168,6 @@ class ModelOrderReductionMapping : public linear::LinearMapping<TIn, TOut>

public:

const js_type* getJs() override;

sofa::core::objectmodel::DataFileName d_modesPath;

Expand Down
4 changes: 2 additions & 2 deletions src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,13 +219,13 @@ void ModelOrderReductionMapping<TIn, TOut>::applyJT(const core::ConstraintParams


template <class TIn, class TOut>
const sofa::linearalgebra::BaseMatrix* ModelOrderReductionMapping<TIn, TOut>::getJ()
const sofa::linearalgebra::BaseMatrix* ModelOrderReductionMapping<TIn, TOut>::doGetJ()
{
return &m_J;
}

template <class TIn, class TOut>
const typename ModelOrderReductionMapping<TIn, TOut>::js_type* ModelOrderReductionMapping<TIn, TOut>::getJs()
const typename ModelOrderReductionMapping<TIn, TOut>::js_type* ModelOrderReductionMapping<TIn, TOut>::doGetJs()
{
return &m_Js;
}
Expand Down
Loading