solve_network: move extra_functionality to args

This commit is contained in:
martacki 2022-11-25 11:08:35 +01:00
parent dcd394dd0a
commit 643a62049b

View File

@ -392,7 +392,6 @@ def solve_network(n, config, opts="", **kwargs):
n, n,
solver_name=solver_name, solver_name=solver_name,
solver_options=solver_options, solver_options=solver_options,
extra_functionality=extra_functionality,
**kwargs **kwargs
) )
else: else:
@ -403,7 +402,6 @@ def solve_network(n, config, opts="", **kwargs):
track_iterations=track_iterations, track_iterations=track_iterations,
min_iterations=min_iterations, min_iterations=min_iterations,
max_iterations=max_iterations, max_iterations=max_iterations,
extra_functionality=extra_functionality,
**kwargs **kwargs
) )
return n return n
@ -432,6 +430,7 @@ if __name__ == "__main__":
n, n,
snakemake.config, snakemake.config,
opts, opts,
extra_functionality=extra_functionality,
solver_dir=tmpdir, solver_dir=tmpdir,
solver_logfile=snakemake.log.solver, solver_logfile=snakemake.log.solver,
) )