Address some of the comments on CGNR patch

- Rename BlockDiagonalPreconditioner to BlockJacobiPreconditioner
- Include the diagonal in the block jacobi preconditioner.
- Better flag help for eta.
- Enable test for CGNR
- Rename CONJUGATE_GRADIENTS to CGNR.
- etc.
This commit is contained in:
Keir Mierle
2012-05-07 06:39:56 -07:00
parent 1b95dc580a
commit e2a6cdc081
14 changed files with 93 additions and 65 deletions
@@ -84,7 +84,6 @@ LinearSolver::Summary IterativeSchurComplementSolver::SolveImpl(
// Instantiate a conjugate gradient solver that runs on the Schur complement
// matrix with the block diagonal of the matrix F'F as the preconditioner.
LinearSolver::Options cg_options;
cg_options.type = CONJUGATE_GRADIENTS;
cg_options.max_num_iterations = options_.max_num_iterations;
ConjugateGradientsSolver cg_solver(cg_options);
LinearSolver::PerSolveOptions cg_per_solve_options;