Skip to content

Commit fd94223

Browse files
committed
Remove change to BSpline
1 parent bf703e8 commit fd94223

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Framework/CurveFitting/src/Functions/BSpline.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,13 @@ size_t BSpline::evaluateBasisFunctions(EigenVector &B, const double x, size_t cu
141141
*/
142142
size_t BSpline::getSpanIndex(const double x, const size_t currentBBase, const bool clamped) const {
143143
const size_t clampedKnots = clamped ? static_cast<size_t>(getClampedKnots()) : 1u;
144-
const auto it = std::find_if(m_knots.begin() + currentBBase + clampedKnots, m_knots.cend(),
145-
[&x](const size_t knot) { return x < knot; });
146-
if (it != m_knots.cend()) {
147-
return std::distance(m_knots.cbegin(), it) - clampedKnots;
144+
size_t nKnots = m_knots.size();
145+
for (size_t i = currentBBase + clampedKnots; i < nKnots; i++) {
146+
if (x < m_knots[i]) {
147+
return i - clampedKnots;
148+
}
148149
}
149-
return m_knots.size() - clampedKnots * 2;
150+
return nKnots - clampedKnots * 2;
150151
}
151152

152153
/** Calculate the derivatives for a set of points on the spline

buildconfig/CMake/CppCheck_Suppressions.txt.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ constParameterReference:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/src/FuncMinim
188188
constParameterReference:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp:852
189189
constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/src/FuncMinimizers/FABADAMinimizer.cpp:1004
190190
constParameterReference:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/src/FuncMinimizers/TrustRegionMinimizer.cpp:814
191+
useStlAlgorithm:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/src/Functions/BSpline.cpp:146
191192
constParameterReference:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/src/Functions/ChebfunBase.cpp:601
192193
constParameterReference:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/src/Functions/ChebfunBase.cpp:625
193194
shadowFunction:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/src/Functions/ChebfunBase.cpp:687

0 commit comments

Comments
 (0)