Skip to content

Commit bafbfaf

Browse files
MaxenceGollierdpo
authored andcommitted
change the callback signature to use reg_nlp instead of nlp
1 parent 0871eee commit bafbfaf

8 files changed

Lines changed: 16 additions & 16 deletions

File tree

src/LMTR_alg.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ function SolverCore.solve!(
324324
),
325325
)
326326

327-
callback(nls, solver, stats)
327+
callback(reg_nls, solver, stats)
328328

329329
done = stats.status != :unknown
330330

@@ -473,7 +473,7 @@ function SolverCore.solve!(
473473
),
474474
)
475475

476-
callback(nls, solver, stats)
476+
callback(reg_nls, solver, stats)
477477

478478
done = stats.status != :unknown
479479
end

src/LM_alg.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ function SolverCore.solve!(
327327
),
328328
)
329329

330-
callback(nls, solver, stats)
330+
callback(reg_nls, solver, stats)
331331

332332
done = stats.status != :unknown
333333

@@ -463,7 +463,7 @@ function SolverCore.solve!(
463463
),
464464
)
465465

466-
callback(nls, solver, stats)
466+
callback(reg_nls, solver, stats)
467467

468468
done = stats.status != :unknown
469469
end

src/R2DH.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ function SolverCore.solve!(
356356
),
357357
)
358358

359-
callback(nlp, solver, stats)
359+
callback(reg_nlp, solver, stats)
360360

361361
done = stats.status != :unknown
362362

@@ -451,7 +451,7 @@ function SolverCore.solve!(
451451
),
452452
)
453453

454-
callback(nlp, solver, stats)
454+
callback(reg_nlp, solver, stats)
455455

456456
done = stats.status != :unknown
457457
end

src/R2N.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ function SolverCore.solve!(
357357
),
358358
)
359359

360-
callback(nlp, solver, stats)
360+
callback(reg_nlp, solver, stats)
361361

362362
done = stats.status != :unknown
363363

@@ -502,7 +502,7 @@ function SolverCore.solve!(
502502
),
503503
)
504504

505-
callback(nlp, solver, stats)
505+
callback(reg_nlp, solver, stats)
506506

507507
done = stats.status != :unknown
508508
end

src/R2_alg.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ function SolverCore.solve!(
431431
),
432432
)
433433

434-
callback(nlp, solver, stats)
434+
callback(reg_nlp, solver, stats)
435435

436436
done = stats.status != :unknown
437437

@@ -515,7 +515,7 @@ function SolverCore.solve!(
515515
),
516516
)
517517

518-
callback(nlp, solver, stats)
518+
callback(reg_nlp, solver, stats)
519519

520520
done = stats.status != :unknown
521521
end

src/RegularizedOptimization.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import SolverCore.reset!
2020

2121
const callback_docstring = "
2222
The callback is called at each iteration.
23-
The expected signature of the callback is `callback(nlp, solver, stats)`, and its output is ignored.
23+
The expected signature of the callback is `callback(reg_nlp, solver, stats)`, and its output is ignored.
2424
Changing any of the input arguments will affect the subsequent iterations.
2525
In particular, setting `stats.status = :user` will stop the algorithm.
26-
All relevant information should be available in `nlp` and `solver`.
26+
All relevant information should be available in `reg_nlp` and `solver`.
2727
Notably, you can access, and modify, the following:
2828
- `solver.xk`: current iterate;
2929
- `solver.∇fk`: current gradient;

src/TRDH_alg.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ function SolverCore.solve!(
408408
),
409409
)
410410

411-
callback(nlp, solver, stats)
411+
callback(reg_nlp, solver, stats)
412412

413413
done = stats.status != :unknown
414414

@@ -514,7 +514,7 @@ function SolverCore.solve!(
514514
),
515515
)
516516

517-
callback(nlp, solver, stats)
517+
callback(reg_nlp, solver, stats)
518518

519519
done = stats.status != :unknown
520520
end

src/TR_alg.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ function SolverCore.solve!(
356356
),
357357
)
358358

359-
callback(nlp, solver, stats)
359+
callback(reg_nlp, solver, stats)
360360

361361
done = stats.status != :unknown
362362
while !done
@@ -515,7 +515,7 @@ function SolverCore.solve!(
515515
),
516516
)
517517

518-
callback(nlp, solver, stats)
518+
callback(reg_nlp, solver, stats)
519519

520520
done = stats.status != :unknown
521521
end

0 commit comments

Comments
 (0)