Skip to content
Snippets Groups Projects
Commit 1d7350f5 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

invert condition to avoid long if clause

parent 5d03540f
No related branches found
No related tags found
No related merge requests found
...@@ -38,7 +38,7 @@ double FitSuiteChiSquaredFunction::evaluate(const std::vector<double> &pars) ...@@ -38,7 +38,7 @@ double FitSuiteChiSquaredFunction::evaluate(const std::vector<double> &pars)
// (calculations are done for all dataset when index==0, when index!=0 already // (calculations are done for all dataset when index==0, when index!=0 already
// calculated data just returned // calculated data just returned
double FitSuiteGradientFunction::evaluate( double FitSuiteGradientFunction::evaluate(
const std::vector<double> &pars, unsigned int index, std::vector<double>& gradients) const std::vector<double>& pars, unsigned int index, std::vector<double>& gradients)
{ {
assert(m_kernel != nullptr); assert(m_kernel != nullptr);
if (m_kernel->isInterrupted()) if (m_kernel->isInterrupted())
...@@ -73,17 +73,17 @@ double FitSuiteGradientFunction::evaluate( ...@@ -73,17 +73,17 @@ double FitSuiteGradientFunction::evaluate(
void FitSuiteGradientFunction::verify_arrays() void FitSuiteGradientFunction::verify_arrays()
{ {
if( m_npars != m_kernel->fitParameters()->size() || if ( m_npars == m_kernel->fitParameters()->size() &&
m_ndatasize != m_kernel->fitObjects()->getSizeOfDataSet() ) { m_ndatasize == m_kernel->fitObjects()->getSizeOfDataSet() )
m_npars = m_kernel->fitParameters()->size(); return;
m_ndatasize = m_kernel->fitObjects()->getSizeOfDataSet(); m_npars = m_kernel->fitParameters()->size();
m_residuals.clear(); m_ndatasize = m_kernel->fitObjects()->getSizeOfDataSet();
m_residuals.resize(m_ndatasize, 0.0); m_residuals.clear();
m_gradients.clear(); m_residuals.resize(m_ndatasize, 0.0);
m_gradients.resize(m_npars); m_gradients.clear();
for(size_t i_par=0; i_par<m_npars; ++i_par) m_gradients.resize(m_npars);
m_gradients[i_par].resize(m_ndatasize, 0.0); for(size_t i_par=0; i_par<m_npars; ++i_par)
} m_gradients[i_par].resize(m_ndatasize, 0.0);
} }
void FitSuiteGradientFunction::verify_minimizer_logic( void FitSuiteGradientFunction::verify_minimizer_logic(
...@@ -142,7 +142,6 @@ void FitSuiteGradientFunction::calculate_gradients(const std::vector<double>& pa ...@@ -142,7 +142,6 @@ void FitSuiteGradientFunction::calculate_gradients(const std::vector<double>& pa
// returning back old parameters // returning back old parameters
m_kernel->fitParameters()->setValues(pars); m_kernel->fitParameters()->setValues(pars);
runSimulation(pars); runSimulation(pars);
} }
void FitSuiteGradientFunction::runSimulation(const std::vector<double> &pars){ void FitSuiteGradientFunction::runSimulation(const std::vector<double> &pars){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment