Skip to content

[Lagrangian.Solver] Replace raw pointers by unique_ptr for GenericConstraintProblem #5843

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

Merged
bakpaul merged 2 commits into from
Jan 5, 2026
Merged

[Lagrangian.Solver] Replace raw pointers by unique_ptr for GenericConstraintProblem #5843

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
d975b75
[Lagrangian.Solver] Replace raw pointers by unique_ptr for GenericCon…
alxbilger Dec 24, 2025
96fa944
Merge branch 'master' into safedelete
bakpaul Jan 5, 2026
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
16 changes: 3 additions & 13 deletions ...angian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,6 @@ GenericConstraintSolver::GenericConstraintSolver()
d_tolerance.setRequired(true);
}

GenericConstraintSolver::~GenericConstraintSolver()
{
for (unsigned i=0; i< CP_BUFFER_SIZE; ++i)
{
delete m_cpBuffer[i];
}
}



void GenericConstraintSolver:: init()
{
this->initializeConstraintProblems();
Expand All @@ -144,9 +134,9 @@ void GenericConstraintSolver::initializeConstraintProblems()
{
for (unsigned i=0; i< CP_BUFFER_SIZE; ++i)
{
m_cpBuffer[i] = new GenericConstraintProblem(this);
m_cpBuffer[i] = std::make_unique<GenericConstraintProblem>(this);
}
current_cp = m_cpBuffer[0];
current_cp = m_cpBuffer[0].get();
}

void GenericConstraintSolver::cleanup()
Expand Down Expand Up @@ -414,7 +404,7 @@ void GenericConstraintSolver::lockConstraintProblem(sofa::core::objectmodel::Bas

for (unsigned int i = 0; i < CP_BUFFER_SIZE; ++i)
{
GenericConstraintProblem* p = m_cpBuffer[i];
GenericConstraintProblem* p = m_cpBuffer[i].get();
if (p == p1 || p == p2)
{
m_cpIsLocked[i] = true;
Expand Down
5 changes: 2 additions & 3 deletions ...grangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ class SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER_API GenericConstraintSolver :
SOFA_CLASS(GenericConstraintSolver, ConstraintSolverImpl);
protected:
GenericConstraintSolver();
~GenericConstraintSolver() override;
public:
void init() override;

Expand Down Expand Up @@ -89,8 +88,8 @@ class SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER_API GenericConstraintSolver :
void clearConstraintProblemLocks();

static constexpr auto CP_BUFFER_SIZE = 10;
sofa::type::fixed_array<GenericConstraintProblem * , CP_BUFFER_SIZE> m_cpBuffer;
sofa::type::fixed_array<bool, CP_BUFFER_SIZE> m_cpIsLocked;
sofa::type::fixed_array<std::unique_ptr<GenericConstraintProblem>, CP_BUFFER_SIZE> m_cpBuffer;
sofa::type::fixed_array<bool, CP_BUFFER_SIZE> m_cpIsLocked = sofa::type::makeHomogeneousArray<bool, CP_BUFFER_SIZE>(false);
GenericConstraintProblem *current_cp, *last_cp;

sofa::core::MultiVecDerivId m_lambdaId;
Expand Down
6 changes: 3 additions & 3 deletions ...angian/Solver/src/sofa/component/constraint/lagrangian/solver/UnbuiltConstraintSolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ void UnbuiltConstraintSolver::initializeConstraintProblems()
{
for (unsigned i=0; i< CP_BUFFER_SIZE; ++i)
{
m_cpBuffer[i] = new UnbuiltConstraintProblem(this);
m_cpBuffer[i] = std::make_unique<UnbuiltConstraintProblem>(this);
}
current_cp = m_cpBuffer[0];
current_cp = m_cpBuffer[0].get();
}


}
}