Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
34e5f1e7
Commit
34e5f1e7
authored
Mar 23, 2017
by
Roman Tolchenov
Browse files
Re #18518. Fix compiler warnings and test.
parent
fc49d23a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Framework/API/src/CompositeFunction.cpp
View file @
34e5f1e7
...
...
@@ -408,10 +408,6 @@ void CompositeFunction::removeFunction(size_t i) {
j
++
;
}
}
// Number of parameters in functions preceding the removed one.
// Indices of those parameters won't change
size_t
nParamsBeforeRemoved
=
m_paramOffsets
[
i
];
//
// Shift down the function indeces for parameters
for
(
auto
it
=
m_IFunction
.
begin
();
it
!=
m_IFunction
.
end
();)
{
...
...
Framework/CurveFitting/src/Constraints/BoundaryConstraint.cpp
View file @
34e5f1e7
...
...
@@ -32,7 +32,7 @@ BoundaryConstraint::BoundaryConstraint()
/// @param paramName :: The parameter name
BoundaryConstraint
::
BoundaryConstraint
(
const
std
::
string
&
paramName
)
:
API
::
IConstraint
(),
m_penaltyFactor
(
1000.0
),
m_hasLowerBound
(
false
),
m_hasUpperBound
(
false
)
{}
m_hasUpperBound
(
false
)
{
UNUSED_ARG
(
paramName
);
}
/** Constructor with boundary arguments
* @param fun :: The function
...
...
Framework/CurveFitting/src/Functions/CrystalFieldSpectrum.cpp
View file @
34e5f1e7
...
...
@@ -90,7 +90,6 @@ void CrystalFieldSpectrum::updateTargetFunction() const {
m_target
->
setAttribute
(
"NumDeriv"
,
this
->
getAttribute
(
"NumDeriv"
));
auto
&
spectrum
=
dynamic_cast
<
CompositeFunction
&>
(
*
m_target
);
m_nPeaks
=
CrystalFieldUtils
::
calculateNPeaks
(
values
);
auto
maxNPeaks
=
CrystalFieldUtils
::
calculateMaxNPeaks
(
m_nPeaks
);
CrystalFieldUtils
::
updateSpectrumFunction
(
spectrum
,
peakShape
,
values
,
m_nPeaks
,
0
,
xVec
,
yVec
,
fwhmVariation
,
defaultFWHM
,
fixAllPeaks
);
...
...
Framework/CurveFitting/test/Algorithms/FitTest.h
View file @
34e5f1e7
...
...
@@ -2051,8 +2051,6 @@ public:
TS_ASSERT_DELTA
(
fun
->
getParameter
(
2
),
19.1074
,
0.1
);
TS_ASSERT_DELTA
(
fun
->
getParameter
(
3
),
-
17.8434
,
0.1
);
TS_ASSERT_DELTA
(
fun
->
getParameter
(
4
),
6.3465
,
0.1
);
std
::
string
status
=
fit
.
getProperty
(
"OutputStatus"
);
TS_ASSERT_EQUALS
(
status
,
"success"
);
}
{
API
::
IFunction_sptr
fun
=
...
...
Framework/TestHelpers/inc/MantidTestHelpers/FunctionCreationHelper.h
View file @
34e5f1e7
...
...
@@ -12,7 +12,7 @@ class FunctionChangesNParams : public Mantid::API::IFunction1D,
public
Mantid
::
API
::
ParamFunction
{
public:
FunctionChangesNParams
();
std
::
string
name
()
const
;
std
::
string
name
()
const
override
;
void
iterationStarting
()
override
;
void
iterationFinished
()
override
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment