Skip to content

Commit d4ba4f1

Browse files
committed
Added some logger info
1 parent 0050c68 commit d4ba4f1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

uno/ingredients/constraint_relaxation_strategies/FeasibilityRestoration.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ namespace uno {
7878
if (this->current_phase == Phase::OPTIMALITY) {
7979
statistics.set("phase", "OPT");
8080
try {
81-
DEBUG << "Solving the optimality subproblem\n";
81+
DEBUG << "Solving the optimality problem\n";
8282
const OptimizationProblem optimality_problem{model};
8383
this->solve_subproblem(statistics, *this->optimality_inequality_handling_method, optimality_problem, current_iterate,
8484
direction, *this->optimality_hessian_model, *this->optimality_regularization_strategy, trust_region_radius,
@@ -103,7 +103,7 @@ namespace uno {
103103
}
104104

105105
// solve the feasibility problem (minimize the constraint violation)
106-
DEBUG << "Solving the feasibility subproblem\n";
106+
DEBUG << "Solving the feasibility problem\n";
107107
statistics.set("phase", "FEAS");
108108
// note: failure of regularization should not happen here, since the feasibility Jacobian has full rank
109109
l1RelaxedProblem feasibility_problem{model, 0., this->constraint_violation_coefficient,

uno/ingredients/inequality_handling_methods/equality_constrained_methods/LPEQPMethod.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ namespace uno {
139139
// protected member functions
140140
void LPEQPMethod::solve_LP(Statistics& statistics, Subproblem& subproblem, const Multipliers& current_multipliers,
141141
const WarmstartInformation& warmstart_information) {
142+
DEBUG << "LP-EQP: solving the LP subproblem\n";
142143
this->LP_solver->solve(statistics, subproblem, this->initial_point, this->LP_direction, warmstart_information);
143144
InequalityHandlingMethod::compute_dual_displacements(current_multipliers, this->LP_direction.multipliers);
144145
this->number_subproblems_solved++;
@@ -157,6 +158,7 @@ namespace uno {
157158

158159
void LPEQPMethod::solve_EQP(Statistics& statistics, Subproblem& subproblem, const Multipliers& current_multipliers,
159160
Direction& direction, const WarmstartInformation& warmstart_information) {
161+
DEBUG << "LP-EQP: solving the EQP subproblem\n";
160162
this->QP_solver->solve(statistics, subproblem, this->initial_point, direction, warmstart_information);
161163

162164
// correct EQP multipliers (the QP solver has no knowledge of the original bounds of fixed variables)

0 commit comments

Comments
 (0)