Skip to content

[algorithm] Refactor PR #4 - Proper iterator use #50

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
epernod merged 1 commit into from
Aug 7, 2025
Merged

[algorithm] Refactor PR #4 - Proper iterator use #50

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
23 changes: 9 additions & 14 deletions src/sofa/collisionAlgorithm/algorithm/InsertionAlgorithm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ class InsertionAlgorithm : public BaseAlgorithm
auto& collisionOutput = *d_collisionOutput.beginEdit();
auto& insertionOutput = *d_insertionOutput.beginEdit();

insertionOutput.clear();

if (m_couplingPts.empty())
{
const MechStateTipType::SPtr mstate = l_tipGeom->getContext()->get<MechStateTipType>();
Expand All @@ -145,8 +147,8 @@ class InsertionAlgorithm : public BaseAlgorithm
const BaseProximity::SPtr shaftProx = findClosestProxOnShaft(
dpair.second, l_shaftGeom.get(), projectOnShaft, getFilterFunc());
m_needlePts.push_back(shaftProx);
m_couplingPts.push_back(dpair.second->copy());
insertionOutput.add(shaftProx, dpair.second->copy());
m_couplingPts.push_back(dpair.second);
insertionOutput.add(shaftProx, dpair.second);
}
collisionOutput.clear();
return;
Expand All @@ -155,17 +157,16 @@ class InsertionAlgorithm : public BaseAlgorithm

collisionOutput.clear();

ElementIterator::SPtr itTip = l_tipGeom->begin();
auto createTipProximity =
Operations::CreateCenterProximity::Operation::get(itTip->getTypeInfo());
Operations::CreateCenterProximity::Operation::get(l_tipGeom->getTypeInfo());
auto findClosestProxOnSurf =
Operations::FindClosestProximity::Operation::get(l_surfGeom);
auto projectOnSurf = Operations::Project::Operation::get(l_surfGeom);
auto projectOnTip = Operations::Project::Operation::get(l_tipGeom);

for (; itTip != l_tipGeom->end(); itTip++)
for (const auto& itTip : *l_tipGeom)
{
BaseProximity::SPtr tipProx = createTipProximity(itTip->element());
BaseProximity::SPtr tipProx = createTipProximity(itTip.element());
if (!tipProx) continue;
const BaseProximity::SPtr surfProx = findClosestProxOnSurf(
tipProx, l_surfGeom.get(), projectOnSurf, getFilterFunc());
Expand All @@ -174,22 +175,16 @@ class InsertionAlgorithm : public BaseAlgorithm
surfProx->normalize();
if (d_projective.getValue())
{
tipProx = projectOnTip(surfProx->getPosition(), itTip->element()).prox;
tipProx = projectOnTip(surfProx->getPosition(), itTip.element()).prox;
if (!tipProx) continue;
tipProx->normalize();

collisionOutput.add(tipProx, surfProx);
}
else
{
collisionOutput.add(tipProx, surfProx);
}
collisionOutput.add(tipProx, surfProx);
}
}
}
else
{
insertionOutput.clear();

ElementIterator::SPtr itTip = l_tipGeom->begin();
auto createTipProximity =
Expand Down