diff --git a/config_model.yml b/config_model.yml index 5b76a05ceaf34b16d18e98124bd9ae50944afad8..ce2a8bd1c598c2b1c4f8ec25555815d875e12177 100644 --- a/config_model.yml +++ b/config_model.yml @@ -5,11 +5,11 @@ data_path: '/data/dcradu/resite_ip/' # Spatial resolution (in degrees) of the potential sites. spatial_resolution: 0.28 # Start time and end time of the analysis. -time_slice: ['2014-01-01T00:00', '2014-12-31T23:00'] +time_slice: ['2014-01-01T00:00', '2018-12-31T23:00'] # Technologies to deploy. -regions: ['FR', 'ES', 'PL'] +regions: ['FR'] technologies: ['wind_onshore'] -deployments: [7, 5, 5] +deployments: [[19]] siting_params: smooth_measure: 'mean' @@ -32,9 +32,9 @@ siting_params: MIRSA: # Simulated Annealing with Local Search set: True - c: [9] + c: [1, 2, 4, 10, 19] neighborhood: 1 - no_iterations: 100 + no_iterations: 1000 no_epochs: 1000 initial_temp: 200. no_runs: 1 diff --git a/src/helpers.py b/src/helpers.py index 4dcd401e7168cebfaa54196a9777c0ffff756cf6..ed4b8a6453a7cfce53343432e83652afa7bb3d27 100644 --- a/src/helpers.py +++ b/src/helpers.py @@ -133,10 +133,7 @@ def get_deployment_vector(regions, technologies, deployments): for i, region in enumerate(regions): d[region] = {} for j, tech in enumerate(technologies): - if isinstance(deployments[i], int): - d[region][tech] = deployments[i] - else: - d[region][tech] = deployments[i][j] + d[region][tech] = deployments[i][j] return d