Skip to content

Commit a57a850

Browse files
authored
Merge pull request #438 from danielpmorton/patch-1
Patch solver settings issue in API docs
2 parents 9a29ca9 + 80f332d commit a57a850

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
2323
- Allow project to be used as an external CMake project (FetchContent) ([#408](https://github.com/Simple-Robotics/proxsuite/pull/408))
2424
- Fix -Wdeprecated-literal-operator warning ([#420](https://github.com/Simple-Robotics/proxsuite/pull/420))
2525
- Fix compilation error with Apple Clang compiler ([#431](https://github.com/Simple-Robotics/proxsuite/pull/431))
26+
- Fix `settings.primal_infeasibility_solving` documentation ([#438](https://github.com/Simple-Robotics/proxsuite/pull/438))
2627

2728
### Removed
2829
- Don't release PyPy package on GNU/Linux anymore ([#403](https://github.com/Simple-Robotics/proxsuite/pull/403))

doc/2-ProxQP_api.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,9 +413,8 @@ In this table, you have the three columns from left to right: the name of the se
413413
| HessianType | Dense | Defines the type of problem solved (Dense, Zero, or Diagonal). In case the Zero or Diagonal option is used, the solver exploits the Hessian structure to evaluate the Cholesky factorization efficiently.
414414
| primal_infeasibility_solving | False | If set to true, it solves the closest primal feasible problem if primal infeasibility is detected.
415415
| nb_power_iteration | 1000 | Number of power iteration iteration used by default for estimating H lowest eigenvalue.
416-
| power_iteration_accuracy | 1.E-6 | If set to true, it solves the closest primal feasible problem if primal infeasibility is detected.
417-
| primal_infeasibility_solving | False | Accuracy target of the power iteration algorithm for estimating the lowest eigenvalue of H.
418-
| estimate_method_option | NoRegularization | Option for estimating the minimal eigen value of H and regularizing default_rho default_rho=rho_regularization_scaling*abs(default_H_eigenvalue_estimate). This option can be used for solving non convex QPs.
416+
| power_iteration_accuracy | 1.E-6 | Accuracy target of the power iteration algorithm for estimating the lowest eigenvalue of H.
417+
| estimate_method_option | NoRegularization | Option for estimating the minimal eigen value of H and regularizing default_rho default_rho=rho_regularization_scaling*abs(default_H_eigenvalue_estimate). This option can be used for solving non convex QPs.
419418
| default_H_eigenvalue_estimate | 0. | Default estimate of the minimal eigen value of H.
420419
| rho_regularization_scaling | 1.5 | Scaling for regularizing default_rho according to the minimal eigen value of H.
421420

0 commit comments

Comments
 (0)