solve: include {min,max}_iterations parameters (#130)

* solve: include {min,max}_iteration parameters

* solve: iterations fix defaults
This commit is contained in:
Fabian Neumann 2020-02-25 22:00:36 +01:00 committed by GitHub
parent c2d3cd283f
commit 69fd46290f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions

View File

@ -181,8 +181,8 @@ solving:
formulation: kirchhoff
load_shedding: false
noisy_costs: true
min_iterations: 3
max_iterations: 5
min_iterations: 4
max_iterations: 6
clip_p_max_pu: 0.01
skip_iterations: false
track_iterations: false

View File

@ -214,6 +214,8 @@ def solve_network(n, config, solver_log=None, opts='', **kwargs):
solver_options = config['solving']['solver'].copy()
solver_name = solver_options.pop('name')
track_iterations = config['solving']['options'].get('track_iterations', False)
min_iterations = config['solving']['options'].get('min_iterations', 4)
max_iterations = config['solving']['options'].get('max_iterations', 6)
# add to network for extra_functionality
n.config = config
@ -225,6 +227,8 @@ def solve_network(n, config, solver_log=None, opts='', **kwargs):
else:
ilopf(n, solver_name=solver_name, solver_options=solver_options,
track_iterations=track_iterations,
min_iterations=min_iterations,
max_iterations=max_iterations,
extra_functionality=extra_functionality, **kwargs)
return n