Merge pull request #22417 from savuor:levmarq_log_level_fix

This commit is contained in:
Alexander Smorkalov 2022-08-24 07:17:22 +00:00
commit 3a02561c40

View File

@ -343,17 +343,29 @@ LevMarq::Report detail::LevMarqBase::optimize()
CV_LOG_DEBUG(NULL, "Finished: " << (found ? "" : "not ") << "found"); CV_LOG_DEBUG(NULL, "Finished: " << (found ? "" : "not ") << "found");
std::string fr = "Finish reason: "; std::string fr = "Finish reason: ";
if (settings.checkMinGradient && smallGradient) if (settings.checkMinGradient && smallGradient)
{
CV_LOG_DEBUG(NULL, fr + "gradient max val dropped below threshold"); CV_LOG_DEBUG(NULL, fr + "gradient max val dropped below threshold");
}
if (settings.checkStepNorm && smallStep) if (settings.checkStepNorm && smallStep)
{
CV_LOG_DEBUG(NULL, fr + "step size dropped below threshold"); CV_LOG_DEBUG(NULL, fr + "step size dropped below threshold");
}
if (settings.checkRelEnergyChange && smallEnergyDelta) if (settings.checkRelEnergyChange && smallEnergyDelta)
{
CV_LOG_DEBUG(NULL, fr + "relative energy change between iterations dropped below threshold"); CV_LOG_DEBUG(NULL, fr + "relative energy change between iterations dropped below threshold");
}
if (smallEnergy) if (smallEnergy)
{
CV_LOG_DEBUG(NULL, fr + "energy dropped below threshold"); CV_LOG_DEBUG(NULL, fr + "energy dropped below threshold");
}
if (tooLong) if (tooLong)
{
CV_LOG_DEBUG(NULL, fr + "max number of iterations reached"); CV_LOG_DEBUG(NULL, fr + "max number of iterations reached");
}
if (bigLambda) if (bigLambda)
{
CV_LOG_DEBUG(NULL, fr + "lambda has grown above the threshold, the trust region is too small"); CV_LOG_DEBUG(NULL, fr + "lambda has grown above the threshold, the trust region is too small");
}
return LevMarq::Report(found, iter, oldEnergy); return LevMarq::Report(found, iter, oldEnergy);
} }