fix default diagnostics for nnls

Author: Francesco Rizzi

include/pressio/solvers_nonlinear/impl/nonlinear_least_squares.hpp

@@ -135,13 +135,13 @@ class NonLinLeastSquares : public RegistryType
     // currently we don't have the diagonostics stuff all flushed out
     // so we limit it to work for a specific case
     const auto & publicDiags = diagnostics_.publicNames();
-    assert(publicDiags.size() == 6);
-    assert(publicDiags[0] == Diagnostic::objectiveAbsolute);
-    assert(publicDiags[1] == Diagnostic::objectiveRelative);
-    assert(publicDiags[2] == Diagnostic::correctionAbsolutel2Norm);
-    assert(publicDiags[3] == Diagnostic::correctionRelativel2Norm);
-    assert(publicDiags[4] == Diagnostic::gradientAbsolutel2Norm);
-    assert(publicDiags[5] == Diagnostic::gradientRelativel2Norm);
+    // assert(publicDiags.size() == 6);
+    // assert(publicDiags[0] == Diagnostic::objectiveAbsolute);
+    // assert(publicDiags[1] == Diagnostic::objectiveRelative);
+    // assert(publicDiags[2] == Diagnostic::correctionAbsolutel2Norm);
+    // assert(publicDiags[3] == Diagnostic::correctionRelativel2Norm);
+    // assert(publicDiags[4] == Diagnostic::gradientAbsolutel2Norm);
+    // assert(publicDiags[5] == Diagnostic::gradientRelativel2Norm);
 
     // check that the stopping criterion uses a metric already
     // supported in the diagonstics, otherwise add it

include/pressio/solvers_nonlinear/solvers_create_gauss_newton.hpp

@@ -98,6 +98,8 @@ auto create_gauss_newton_solver(const SystemType & system,           /*(1)*/
   const std::vector<Diagnostic> defaultDiagnostics =
     {Diagnostic::objectiveAbsolute,
      Diagnostic::objectiveRelative,
+     Diagnostic::residualAbsolutel2Norm,
+     Diagnostic::residualRelativel2Norm,
      Diagnostic::correctionAbsolutel2Norm,
      Diagnostic::correctionRelativel2Norm,
      Diagnostic::gradientAbsolutel2Norm,
@@ -159,6 +161,8 @@ auto create_gauss_newton_solver(const SystemType & system,           /*(2)*/
   const std::vector<Diagnostic> defaultDiagnostics =
     {Diagnostic::objectiveAbsolute,
      Diagnostic::objectiveRelative,
+     Diagnostic::residualAbsolutel2Norm,
+     Diagnostic::residualRelativel2Norm,
      Diagnostic::correctionAbsolutel2Norm,
      Diagnostic::correctionRelativel2Norm,
      Diagnostic::gradientAbsolutel2Norm,
@@ -217,6 +221,8 @@ auto create_gauss_newton_qr_solver(const SystemType & system,
   const std::vector<Diagnostic> defaultDiagnostics =
     {Diagnostic::objectiveAbsolute,
      Diagnostic::objectiveRelative,
+     Diagnostic::residualAbsolutel2Norm,
+     Diagnostic::residualRelativel2Norm,
      Diagnostic::correctionAbsolutel2Norm,
      Diagnostic::correctionRelativel2Norm,
      Diagnostic::gradientAbsolutel2Norm,

include/pressio/solvers_nonlinear/solvers_create_levenberg_marquardt.hpp

@@ -100,12 +100,13 @@ auto create_levenberg_marquardt_solver(const SystemType & system,
   const std::vector<Diagnostic> defaultDiagnostics =
     {Diagnostic::objectiveAbsolute,
      Diagnostic::objectiveRelative,
+     Diagnostic::residualAbsolutel2Norm,
+     Diagnostic::residualRelativel2Norm,
      Diagnostic::correctionAbsolutel2Norm,
      Diagnostic::correctionRelativel2Norm,
      Diagnostic::gradientAbsolutel2Norm,
      Diagnostic::gradientRelativel2Norm};
 
-
   using tag      = nonlinearsolvers::impl::LevenbergMarquardtNormalEqTag;
   using state_t  = typename SystemType::state_type;
   using reg_t    = nonlinearsolvers::impl::RegistryLevMarNormalEqs<SystemType, LinearSolverType>;