[OptApp] Small fixes to RGP, Conv Crit, NLOPT test #12844
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sunethwarna
reviewed
Nov 19, 2024
There was a problem hiding this comment.
Thanks @Igarizza. I have few comments, otherwise this is OK for me.
applications/OptimizationApplication/python_scripts/algorithms/algorithm_gradient_projection.py
Outdated
Show resolved
Hide resolved
...s/OptimizationApplication/python_scripts/algorithms/algorithm_relaxed_gradient_projection.py
Outdated
Show resolved
Hide resolved
Comment on lines
+185
to
+188
| if update_map[control]: | ||
| Kratos.Logger.PrintInfo(f"Control {control.GetName()} updated.") | ||
| else: | ||
| Kratos.Logger.PrintInfo(f"Control {control.GetName()} not updated") |
Comment on lines
+25
to
+44
| """ | ||
| A convergence criterion class that checks if the maximum number of iterations has been reached. | ||
|
|
||
| Methods | ||
| ------- | ||
| GetDefaultParameters(): | ||
| Returns the default parameters for the convergence criterion. | ||
|
|
||
| __init__(parameters: Kratos.Parameters, optimization_problem: OptimizationProblem): | ||
| Initializes the convergence criterion with the given parameters and optimization problem. | ||
|
|
||
| IsMaxIterationsReached(): | ||
| Checks if the maximum number of iterations has been reached. | ||
|
|
||
| IsConverged(search_direction=None) -> bool: | ||
| Checks if the optimization problem has converged based on the maximum number of iterations. | ||
|
|
||
| GetInfo() -> dict: | ||
| Returns a dictionary with information about the current state of convergence. | ||
| """ |
There was a problem hiding this comment.
@matekelemen, does this way of writing method docs within the class doc works? can doxygen decipher this and put it to correct method?
...ationApplication/tests/algorithm_tests/nlopt_tests/mma_shell_thickness_opt/materials_2D.json
Show resolved
Hide resolved
...ation/tests/algorithm_tests/nlopt_tests/mma_shell_thickness_opt/optimization_parameters.json
Show resolved
Hide resolved
Co-authored-by: Suneth Warnakulasuriya <[email protected]>
Co-authored-by: Suneth Warnakulasuriya <[email protected]>
|
@sunethwarna can you check this PR please? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📝 Description
This pull request includes several changes aimed at improving the convergence criteria, logging, and testing in the OptimizationApplication. The key changes include updates to convergence checks, enhanced logging for control updates, and improvements in test configurations.
🆕 Changelog
Convergence Criteria Improvements:
Solvemethod inalgorithm_gradient_projection.pyandalgorithm_relaxed_gradient_projection.pyto include additional convergence checks and handle maximum iterations reached ([[1]](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-b969e5c1475ed205b65703b1bc60ff16b6238211dc61bb9b29911bb337e9fa1fL214-R218),[[2]](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-01c0c38f43755b39d627f69f1b3d3fe2d0c55bb30faa5853c548d69ecca44695L297-R301)).IsMaxIterationsReachedmethod to theopt_convergence.pyfile to check if the maximum number of iterations has been reached ([[1]](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-53198d3789dc3a41e658f177c6adcac323a55abae9fad3923b83494953660b1bR37-R39),[[2]](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-53198d3789dc3a41e658f177c6adcac323a55abae9fad3923b83494953660b1bR70-R72),[[3]](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-53198d3789dc3a41e658f177c6adcac323a55abae9fad3923b83494953660b1bR117-R119),[[4]](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-53198d3789dc3a41e658f177c6adcac323a55abae9fad3923b83494953660b1bR173-R175),[[5]](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-53198d3789dc3a41e658f177c6adcac323a55abae9fad3923b83494953660b1bR217-R219)).Logging Enhancements:
Updatemethod ofmaster_control.py([applications/OptimizationApplication/python_scripts/controls/master_control.pyR185-R188](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-394f78969e3543309c73a5a5f34fc4229043774270ff1f62f857426656117651R185-R188)).Testing Improvements:
test_mma_optimizer.py([[1]](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-1e1b3d0242ca9473d075c475a6be65e3986841b7754ca6c70006e7b147868b2cR5-R8),[[2]](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-1e1b3d0242ca9473d075c475a6be65e3986841b7754ca6c70006e7b147868b2cR22-R38)).[[1]](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-3d52cbac5abb020f3482e77973c6af2dfca69d4ce3594cd677847711175ada6aL14-R14),[[2]](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-fe0085ab276aa4c5ed8a57b7623566fc38b68c1fe8c194c44b52246b970602d5L64-R79),[[3]](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-fe0085ab276aa4c5ed8a57b7623566fc38b68c1fe8c194c44b52246b970602d5L96-R90),[[4]](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-fe0085ab276aa4c5ed8a57b7623566fc38b68c1fe8c194c44b52246b970602d5L123-R117),[[5]](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-31a83a4861af6d6b4de3d953b5597af3ab218deb1ffd743131260b4a9c8e983fL5-R7)).Additional Changes:
mathmodule invertex_morphing_shape_control.pyand usedmath.isclosefor numerical comparisons ([[1]](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-8bc62836048115abfbb5078bea9f1bcbeccb86af0b0887381a3768de7dec3d94R14),[[2]](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-8bc62836048115abfbb5078bea9f1bcbeccb86af0b0887381a3768de7dec3d94L150-R152)).[applications/OptimizationApplication/tests/algorithm_tests/nlopt_tests/mma_shell_thickness_opt/summary_orig.csvR1-R18](https://github.com/KratosMultiphysics/Kratos/pull/12844/files#diff-80bdf6f073ebcd30439349c4aa938b6e2de826ec702e7dd4bd0aba5c21bec472R1-R18)).