1. Changes the tutorial to refer to BriefReport. 2. Some of the enums have commas at the end. 3. Fix a bug in the default value of circle_fit.cc in the examples.
diff --git a/docs/tutorial.tex b/docs/tutorial.tex index e489673..da9c29e 100644 --- a/docs/tutorial.tex +++ b/docs/tutorial.tex
@@ -84,7 +84,7 @@ ceres::Solver::Summary summary; ceres::Solve(options, &problem, &summary); - std::cout << summary.BriefSummary() << "\n"; + std::cout << summary.BriefReport() << "\n"; std::cout << "x : 5.0 -> " << x << "\n"; return 0; }
diff --git a/examples/circle_fit.cc b/examples/circle_fit.cc index a044134..07d690e 100644 --- a/examples/circle_fit.cc +++ b/examples/circle_fit.cc
@@ -64,7 +64,7 @@ using ceres::Solve; using ceres::Solver; -DEFINE_double(robust_threshold, -1.0, "Robust loss parameter. Set to -1 for " +DEFINE_double(robust_threshold, 0.0, "Robust loss parameter. Set to 0 for " "normal squared error (no robustification)."); // The cost for a single sample. The returned residual is related to the @@ -88,7 +88,7 @@ // It is tempting to use the following cost: // - // residual[0] = *r - sqrt(xp*xp + yp*yp); + // residual[0] = r - sqrt(xp*xp + yp*yp); // // which is the distance of the sample from the circle. This works // reasonably well, but the sqrt() adds strong nonlinearities to the cost
diff --git a/include/ceres/numeric_diff_cost_function.h b/include/ceres/numeric_diff_cost_function.h index 736fb97..bbaefca 100644 --- a/include/ceres/numeric_diff_cost_function.h +++ b/include/ceres/numeric_diff_cost_function.h
@@ -72,7 +72,7 @@ enum NumericDiffMethod { CENTRAL, - FORWARD, + FORWARD }; // This is split from the main class because C++ doesn't allow partial template
diff --git a/include/ceres/types.h b/include/ceres/types.h index e23786c..ea41b4d 100644 --- a/include/ceres/types.h +++ b/include/ceres/types.h
@@ -88,7 +88,7 @@ // This is not meant for direct client use; it is used under the // hood while using ITERATIVE_SCHUR. Once there is a decent // preconditioner, this will make sense for general sparse problems. - CONJUGATE_GRADIENTS, + CONJUGATE_GRADIENTS }; enum PreconditionerType { @@ -150,11 +150,11 @@ // The options get progressively noisier. enum LoggingType { SILENT, - PER_MINIMIZER_ITERATION, + PER_MINIMIZER_ITERATION }; enum MinimizerType { - LEVENBERG_MARQUARDT, + LEVENBERG_MARQUARDT }; enum SolverTerminationType { @@ -191,7 +191,7 @@ USER_ABORT, // User's IterationCallback returned SOLVER_TERMINATE_SUCCESSFULLY - USER_SUCCESS, + USER_SUCCESS }; // Enums used by the IterationCallback instances to indicate to the