Commit 7e6e5adf authored by Roman Tolchenov's avatar Roman Tolchenov
Browse files

Re #18222. Applied clang format patch.

parent f812beab
......@@ -418,7 +418,8 @@ size_t CompositeFunction::addFunction(IFunction_sptr f) {
void CompositeFunction::removeFunction(size_t i) {
if (i >= nFunctions()) {
throw std::out_of_range("Function index (" + std::to_string(i) +
") out of range (" + std::to_string(nFunctions()) + ").");
") out of range (" + std::to_string(nFunctions()) +
").");
}
IFunction_sptr fun = getFunction(i);
......@@ -481,8 +482,8 @@ void CompositeFunction::replaceFunctionPtr(const IFunction_sptr f_old,
void CompositeFunction::replaceFunction(size_t i, IFunction_sptr f) {
if (i >= nFunctions()) {
throw std::out_of_range("Function index (" + std::to_string(i) +
") out of range (" + std::to_string(nFunctions()) + ").");
") out of range (" + std::to_string(nFunctions()) +
").");
}
IFunction_sptr fun = getFunction(i);
......@@ -528,7 +529,8 @@ void CompositeFunction::replaceFunction(size_t i, IFunction_sptr f) {
IFunction_sptr CompositeFunction::getFunction(std::size_t i) const {
if (i >= nFunctions()) {
throw std::out_of_range("Function index (" + std::to_string(i) +
") out of range (" + std::to_string(nFunctions()) + ").");
") out of range (" + std::to_string(nFunctions()) +
").");
}
return m_functions[i];
}
......@@ -541,7 +543,8 @@ IFunction_sptr CompositeFunction::getFunction(std::size_t i) const {
size_t CompositeFunction::functionIndex(std::size_t i) const {
if (i >= nParams()) {
throw std::out_of_range("Function parameter index (" + std::to_string(i) +
") out of range (" + std::to_string(nParams()) + ").");
") out of range (" + std::to_string(nParams()) +
").");
}
return m_IFunction[i];
}
......
......@@ -269,7 +269,8 @@ void FunctionGenerator::addTie(API::ParameterTie *tie) {
m_source->addTie(tie);
} else {
checkTargetFunction();
tie->reset(m_target.get(), tie->getIndex() - m_nOwnParams, tie->isDefault());
tie->reset(m_target.get(), tie->getIndex() - m_nOwnParams,
tie->isDefault());
m_target->addTie(tie);
}
}
......
......@@ -379,7 +379,8 @@ public:
"Symmetry=C2v,Temperatures=(44.0,50),FWHMs=(1.1,0.9),B44=-0."
"115325956893,B40=0.0844136192563,B42=-0.459507287606,B22=4."
"36779676967;ties=(f1.IntensityScaling0=2.0*f0.IntensityScaling0,f1."
"IntensityScaling1=2.0*f0.IntensityScaling1,f0.f0.f1.FWHM=f1.f0.f1.FWHM/2)";
"IntensityScaling1=2.0*f0.IntensityScaling1,f0.f0.f1.FWHM=f1.f0.f1."
"FWHM/2)";
auto fun = FunctionFactory::Instance().createInitialized(funDef);
{
auto index = fun->parameterIndex("f1.IntensityScaling0");
......
......@@ -657,10 +657,12 @@ public:
"name=CrystalFieldSpectrum,Ion=Ce,Symmetry=C2v,Temperature=44.0,"
"ToleranceEnergy=1e-10,ToleranceIntensity=0.1,FixAllPeaks=False,"
"PeakShape=Lorentzian,FWHM=1.1,B44=-0.12544,B20=0.37737,B22=3.977,B40=-"
"0.031787,B42=-0.11611;name=CrystalFieldSpectrum,Ion=Pr,Symmetry=C2v,Temperature="
"0.031787,B42=-0.11611;name=CrystalFieldSpectrum,Ion=Pr,Symmetry=C2v,"
"Temperature="
"44.0,ToleranceEnergy=1e-10,ToleranceIntensity=0.1,FixAllPeaks=False,"
"PeakShape=Lorentzian,FWHM=1.1,B44=-0.12544,B20=0.37737,B22=3.977,B40=-"
"0.031787,B42=-0.11611;ties=(f1.IntensityScaling=2.0*f0.IntensityScaling,f0.f1.FWHM=f1.f2.FWHM/2)";
"0.031787,B42=-0.11611;ties=(f1.IntensityScaling=2.0*f0."
"IntensityScaling,f0.f1.FWHM=f1.f2.FWHM/2)";
auto fun = FunctionFactory::Instance().createInitialized(funDef);
{
auto index = fun->parameterIndex("f1.IntensityScaling");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment