From 69fd46290f38e2203ff18f02283889d0245d4282 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 25 Feb 2020 22:00:36 +0100 Subject: [PATCH] solve: include {min,max}_iterations parameters (#130) * solve: include {min,max}_iteration parameters * solve: iterations fix defaults --- config.default.yaml | 4 ++-- scripts/solve_network.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config.default.yaml b/config.default.yaml index abdf41d8..95f47c2e 100755 --- a/config.default.yaml +++ b/config.default.yaml @@ -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 diff --git a/scripts/solve_network.py b/scripts/solve_network.py index e3ec5421..11c1f16c 100755 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -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