From fb038629f87c8d9bcdfcff86b69c124bd845a024 Mon Sep 17 00:00:00 2001
From: Paul Baksic <paul.baksic@outlook.fr>
Date: Tue, 13 May 2025 17:24:21 +0200
Subject: [PATCH] Fix compilation regarding SOFA pr

---
 .../component/mapping/MORContactMapping.h                   | 6 ++----
 .../component/mapping/MORContactMapping.inl                 | 4 ++--
 .../component/mapping/ModelOrderReductionMapping.h          | 4 ++--
 .../component/mapping/ModelOrderReductionMapping.inl        | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/ModelOrderReduction/component/mapping/MORContactMapping.h b/src/ModelOrderReduction/component/mapping/MORContactMapping.h
index 5bd3bffb..488e3da3 100644
--- a/src/ModelOrderReduction/component/mapping/MORContactMapping.h
+++ b/src/ModelOrderReduction/component/mapping/MORContactMapping.h
@@ -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;
 
@@ -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;
 
 };
 
diff --git a/src/ModelOrderReduction/component/mapping/MORContactMapping.inl b/src/ModelOrderReduction/component/mapping/MORContactMapping.inl
index 1e9db035..02cbe69b 100644
--- a/src/ModelOrderReduction/component/mapping/MORContactMapping.inl
+++ b/src/ModelOrderReduction/component/mapping/MORContactMapping.inl
@@ -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;
 }
diff --git a/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.h b/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.h
index b9dfa34d..529f1c1f 100644
--- a/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.h
+++ b/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.h
@@ -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;
@@ -167,7 +168,6 @@ class ModelOrderReductionMapping : public linear::LinearMapping<TIn, TOut>
 
 public:
 
-    const js_type* getJs() override;
 
     sofa::core::objectmodel::DataFileName d_modesPath;
 
diff --git a/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.inl b/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.inl
index bd13d350..24562b45 100644
--- a/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.inl
+++ b/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.inl
@@ -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;
 }