Core Solver - Simplify configuration of log level usage

Author: david-cattermole

src/mmSolver/adjust/adjust_base.cpp

@@ -1190,7 +1190,7 @@ MStatus solveFrames(
         addFrameListToStringStream(validFrameList, ss);
         MMSOLVER_MAYA_INFO("Valid Frames:" << ss.str());
     } else if (!out_cmdResult.printStats.doNotSolve &&
-               (logLevel >= LogLevel::kVerbose)) {
+               (logLevel >= printNormalIterationsLogLevel)) {
         MMSOLVER_MAYA_INFO(
             "------------------------------------------------------------------"
             "-------------");

src/mmSolver/adjust/adjust_data.h

@@ -102,6 +102,14 @@ enum class LogLevel {
     kNumLogLevels,
 };
 
+// The LogLevel that will print "normal" iterations to the terminal/Maya
+// Output Window.
+const LogLevel printNormalIterationsLogLevel = LogLevel::kVerbose;
+
+// The LogLevel that will print "jacobian" iterations to the terminal/Maya
+// Output Window.
+const LogLevel printJacobianIterationsLogLevel = LogLevel::kDebug;
+
 struct PrintStatOptions {
     // Do not actually solve anything, just stop after preparing to
     // solve, because we have already calculated all the data needed

src/mmSolver/adjust/adjust_solveFunc.cpp

@@ -247,7 +247,7 @@ void incrementNormalIteration(SolverData *userData) {
 
     ++userData->funcEvalNum;
     ++userData->iterNum;
-    if (userData->logLevel >= LogLevel::kVerbose) {
+    if (userData->logLevel >= printNormalIterationsLogLevel) {
         MStreamUtils::stdErrorStream() << "Iteration ";
         MStreamUtils::stdErrorStream() << std::right << std::setfill('0')
                                        << std::setw(4) << userData->iterNum;
@@ -265,7 +265,7 @@ void incrementJacobianIteration(SolverData *userData) {
 
     ++userData->funcEvalNum;
     ++userData->jacIterNum;
-    if (userData->logLevel >= LogLevel::kDebug) {
+    if (userData->logLevel >= printJacobianIterationsLogLevel) {
         MStreamUtils::stdErrorStream() << "Jacobian  ";
         MStreamUtils::stdErrorStream() << std::right << std::setfill('0')
                                        << std::setw(4) << userData->jacIterNum;
@@ -711,14 +711,14 @@ int solveFunc(const int numberOfParameters, const int numberOfErrors,
     }
 
     if (userData->isNormalCall) {
-        if (userData->logLevel >= LogLevel::kVerbose) {
+        if (userData->logLevel >= printNormalIterationsLogLevel) {
             char formatBuffer[128];
             sprintf(formatBuffer, " | error avg %8.4f   min %8.4f   max %8.4f",
                     error_avg, error_min, error_max);
             MStreamUtils::stdErrorStream() << std::string(formatBuffer) << "\n";
         }
     } else {
-        if (userData->logLevel >= LogLevel::kDebug) {
+        if (userData->logLevel >= printJacobianIterationsLogLevel) {
             if (!userData->doCalcJacobian) {
                 std::cerr << "\n";
             }