always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

typo

Browse Source
This commit is contained in:
Laurent Perron
2023-11-22 17:32:43 +01:00
parent 745594a0b8
commit dd765fbbc5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ortools/pdlp/primal_dual_hybrid_gradient.cc
View File

@@ -2120,7 +2120,7 @@ IterationStats AddWorkStats(IterationStats stats,
// Accumulates and returns the work (`iteration_number`,
// `cumulative_kkt_matrix_passes`, `cumulative_rejected_steps`, and
// `cumulative_time_sec`) from `solve_log.feasibility_polishing_details`.
IterationStats WorkFromFeasiblityPolishing(const SolveLog& solve_log) {
IterationStats WorkFromFeasibilityPolishing(const SolveLog& solve_log) {
IterationStats result;
for (const FeasibilityPolishingDetails& feasibility_polishing_detail :
solve_log.feasibility_polishing_details()) {
@@ -2413,7 +2413,7 @@ InnerStepOutcome Solver::TakeConstantSizeStep() {
IterationStats Solver::TotalWorkSoFar(const SolveLog& solve_log) const {
IterationStats stats = CreateSimpleIterationStats(RESTART_CHOICE_NO_RESTART);
IterationStats full_stats =
AddWorkStats(stats, WorkFromFeasiblityPolishing(solve_log));
AddWorkStats(stats, WorkFromFeasibilityPolishing(solve_log));
return full_stats;
}
@@ -2717,7 +2717,7 @@ SolverResult Solver::Solve(const IterationType iteration_type,
num_rejected_steps_ = 0;
IterationStats work_from_feasibility_polishing =
WorkFromFeasiblityPolishing(solve_log);
WorkFromFeasibilityPolishing(solve_log);
for (iterations_completed_ = 0;; ++iterations_completed_) {
// This code performs the logic of the major iterations and termination
// checks. It may modify the current solution and primal weight (e.g., when
@@ -2750,7 +2750,7 @@ SolverResult Solver::Solve(const IterationType iteration_type,
}
next_feasibility_polishing_iteration *= 2;
// Update work to include new feasibility phases.
work_from_feasibility_polishing = WorkFromFeasiblityPolishing(solve_log);
work_from_feasibility_polishing = WorkFromFeasibilityPolishing(solve_log);
}
// TODO(user): If we use a step rule that could reject many steps in a

2
ortools/pdlp/primal_dual_hybrid_gradient_test.cc
View File

@@ -1870,7 +1870,7 @@ TEST_F(FeasibilityPolishingPrimalTest,
output.solve_log.iteration_stats_size() - 1);
EXPECT_GE(total_feasibility_iterations, 1);
EXPECT_GE(last_stats.iteration_number(), 1);
// This checks that `iteration_count()` includes both the main and feasiblity
// This checks that `iteration_count()` includes both the main and feasibility
// iterations, and that `iteration_stats.iteration_number()` does not include
// work from feasibility iterations.
EXPECT_EQ(last_stats.iteration_number() + total_feasibility_iterations,