Skip to content

Commit 99e800d

Browse files
bakpaulbakpaul
committed
Change base class name according to review
1 parent ff4dc57 commit 99e800d

43 files changed

Lines changed: 98 additions & 100 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Sofa/Component/AnimationLoop/src/sofa/component/animationloop/ConstraintAnimationLoop.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ SOFA_HEADER_DEPRECATED_NOT_REPLACED("v26.06", "v26.12")
3030
#include <sofa/core/MultiVecId.h>
3131
#include <sofa/core/VecId.h>
3232
#include <sofa/core/behavior/BaseConstraintCorrection.h>
33-
#include <sofa/core/behavior/IntegrationScheme.h>
33+
#include <sofa/core/behavior/BaseIntegrationScheme.h>
3434
#include <sofa/core/ConstraintParams.h>
3535
#include <sofa/core/fwd.h>
3636

‎Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/GenericConstraintCorrection.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include <sofa/component/constraint/lagrangian/correction/GenericConstraintCorrection.h>
2525
#include <sofa/simulation/mechanicalvisitor/MechanicalIntegrateConstraintVisitor.h>
26-
#include <sofa/core/behavior/IntegrationScheme.h>
26+
#include <sofa/core/behavior/BaseIntegrationScheme.h>
2727
#include <sofa/core/ObjectFactory.h>
2828
#include <sofa/core/behavior/ConstraintSolver.h>
2929
#include <sofa/core/behavior/LinearSolver.h>
@@ -94,10 +94,10 @@ void GenericConstraintCorrection::init()
9494
{
9595
msg_info() << "Link \"ODESolver\" to the desired ODE solver should be set to ensure right behavior." << msgendl
9696
<< "First ODESolver found in current context will be used.";
97-
l_ODESolver.set( context->get<sofa::core::behavior::IntegrationScheme>(BaseContext::Local) );
97+
l_ODESolver.set( context->get< sofa::core::behavior::BaseIntegrationScheme>(BaseContext::Local) );
9898
if (l_ODESolver.get() == nullptr)
9999
{
100-
l_ODESolver.set( context->get<sofa::core::behavior::IntegrationScheme>(BaseContext::SearchRoot) );
100+
l_ODESolver.set( context->get< sofa::core::behavior::BaseIntegrationScheme>(BaseContext::SearchRoot) );
101101
}
102102
}
103103

‎Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/GenericConstraintCorrection.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_CORRECTION_API GenericConstraintCorre
111111
void resetContactForce() override;
112112

113113
SingleLink<GenericConstraintCorrection, sofa::core::behavior::LinearSolver, BaseLink::FLAG_STOREPATH | BaseLink::FLAG_STRONGLINK> l_linearSolver; ///< Link towards the linear solver used to compute the compliance matrix, requiring the inverse of the linear system matrix
114-
SingleLink<GenericConstraintCorrection, sofa::core::behavior::IntegrationScheme, BaseLink::FLAG_STOREPATH | BaseLink::FLAG_STRONGLINK> l_ODESolver; ///< Link towards the ODE solver used to recover the integration factors
114+
SingleLink<GenericConstraintCorrection, sofa::core::behavior::BaseIntegrationScheme, BaseLink::FLAG_STOREPATH | BaseLink::FLAG_STRONGLINK> l_ODESolver; ///< Link towards the ODE solver used to recover the integration factors
115115
Data< SReal > d_complianceFactor; ///< Factor applied to the position factor and velocity factor used to calculate compliance matrix
116116
Data< SReal > d_regularizationTerm; ///< add regularizationTerm*Id to W when solving for constraints
117117

‎Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/LinearSolverConstraintCorrection.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include <sofa/core/behavior/ConstraintCorrection.h>
2626

27-
#include <sofa/core/behavior/IntegrationScheme.h>
27+
#include <sofa/core/behavior/BaseIntegrationScheme.h>
2828
#include <sofa/core/behavior/LinearSolver.h>
2929

3030
#include <sofa/type/Mat.h>
@@ -95,7 +95,7 @@ class LinearSolverConstraintCorrection : public sofa::core::behavior::Constraint
9595
Data< bool > wire_optimization; ///< constraints are reordered along a wire-like topology (from tip to base)
9696
Data< SReal > d_regularizationTerm; ///< add regularization*Id to W when solving for constraints
9797
SingleLink<LinearSolverConstraintCorrection, sofa::core::behavior::LinearSolver, BaseLink::FLAG_STOREPATH | BaseLink::FLAG_STRONGLINK> l_linearSolver; ///< Link towards the linear solver used to compute the compliance matrix, requiring the inverse of the linear system matrix
98-
SingleLink<LinearSolverConstraintCorrection, sofa::core::behavior::IntegrationScheme, BaseLink::FLAG_STOREPATH | BaseLink::FLAG_STRONGLINK> l_ODESolver; ///< Link towards the ODE solver used to recover the integration factors
98+
SingleLink<LinearSolverConstraintCorrection, sofa::core::behavior::BaseIntegrationScheme, BaseLink::FLAG_STOREPATH | BaseLink::FLAG_STRONGLINK> l_ODESolver; ///< Link towards the ODE solver used to recover the integration factors
9999

100100
void verify_constraints();
101101

‎Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/LinearSolverConstraintCorrection.inl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ void LinearSolverConstraintCorrection<DataTypes>::init()
104104
{
105105
msg_info() << "Link \"ODESolver\" to the desired ODE solver should be set to ensure right behavior." << msgendl
106106
<< "First ODESolver found in current context will be used.";
107-
l_ODESolver.set( context->get<sofa::core::behavior::IntegrationScheme>(sofa::core::objectmodel::BaseContext::Local) );
107+
l_ODESolver.set( context->get< sofa::core::behavior::BaseIntegrationScheme>(sofa::core::objectmodel::BaseContext::Local) );
108108
if (l_ODESolver.get() == nullptr)
109109
{
110-
l_ODESolver.set( context->get<sofa::core::behavior::IntegrationScheme>(sofa::core::objectmodel::BaseContext::SearchRoot) );
110+
l_ODESolver.set( context->get< sofa::core::behavior::BaseIntegrationScheme>(sofa::core::objectmodel::BaseContext::SearchRoot) );
111111
}
112112
}
113113

‎Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/UncoupledConstraintCorrection.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <sofa/component/constraint/lagrangian/correction/config.h>
2424

2525
#include <sofa/core/behavior/ConstraintCorrection.h>
26-
#include <sofa/core/behavior/IntegrationScheme.h>
26+
#include <sofa/core/behavior/BaseIntegrationScheme.h>
2727
#include <sofa/core/topology/TopologyData.h>
2828

2929
namespace sofa::component::constraint::lagrangian::correction
@@ -128,7 +128,7 @@ class UncoupledConstraintCorrection : public sofa::core::behavior::ConstraintCor
128128

129129
protected:
130130

131-
sofa::core::behavior::IntegrationScheme* m_pIntegrationScheme;
131+
sofa::core::behavior::BaseIntegrationScheme* m_pIntegrationScheme;
132132

133133
/**
134134
* @brief Compute dx correction from motion space force vector.

‎Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/FixedLagrangianConstraint.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <sofa/core/behavior/LagrangianConstraint.h>
2626
#include <sofa/core/behavior/ConstraintResolution.h>
2727
#include <sofa/core/behavior/MechanicalState.h>
28-
#include <sofa/core/behavior/IntegrationScheme.h>
28+
#include <sofa/core/behavior/BaseIntegrationScheme.h>
2929
#include <sofa/core/topology/TopologySubsetIndices.h>
3030

3131
namespace sofa::component::constraint::lagrangian::model

‎Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/StopperLagrangianConstraint.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <sofa/core/behavior/LagrangianConstraint.h>
2626
#include <sofa/core/behavior/ConstraintResolution.h>
2727
#include <sofa/core/behavior/MechanicalState.h>
28-
#include <sofa/core/behavior/IntegrationScheme.h>
28+
#include <sofa/core/behavior/BaseIntegrationScheme.h>
2929

3030
namespace sofa::component::constraint::lagrangian::model
3131
{

‎Sofa/Component/IntegrationSchemes/Backward/src/sofa/component/integrationschemes/backward/BDFIntegrationScheme.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
******************************************************************************/
2222
#pragma once
2323
#include <sofa/component/integrationschemes/backward/config.h>
24-
#include <sofa/core/behavior/IntegrationScheme.h>
24+
#include <sofa/core/behavior/BaseIntegrationScheme.h>
2525
#include <sofa/core/behavior/LinearSolverAccessor.h>
2626
#include <sofa/simulation/MechanicalOperations.h>
2727
#include <sofa/simulation/VectorOperations.h>

‎Sofa/Component/IntegrationSchemes/Backward/src/sofa/component/integrationschemes/backward/EulerImplicitIntegrationScheme.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include <sofa/simulation/MechanicalOperations.h>
2828
#include <sofa/simulation/VectorOperations.h>
29-
#include <sofa/core/behavior/IntegrationScheme.h>
29+
#include <sofa/core/behavior/BaseIntegrationScheme.h>
3030

3131
namespace sofa::simulation::common
3232
{

0 commit comments

Comments
 (0)