From cd3e43bccd67828ff0d2c53f76e1fcbeca36aa7d Mon Sep 17 00:00:00 2001
From: dcradu <dcradu@uliege.be>
Date: Sun, 28 Feb 2021 11:59:31 +0100
Subject: [PATCH] update on config structure

---
 config_model.yml | 15 ++++++---------
 src/main.py      |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/config_model.yml b/config_model.yml
index 7ea2f7a..5b76a05 100644
--- a/config_model.yml
+++ b/config_model.yml
@@ -1,15 +1,15 @@
 # Path to data folder
-data_path: 'D:/ULg_PhD_work/datasets/resite_ip/'
-#data_path: '/data/dcradu/resite_ip/'
+#data_path: 'D:/ULg_PhD_work/datasets/resite_ip/'
+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']
 # Technologies to deploy.
-regions: ['FR', 'SE', 'NO']
+regions: ['FR', 'ES', 'PL']
 technologies: ['wind_onshore']
-deployments: [10, 5, 3]
+deployments: [7, 5, 5]
 
 siting_params:
   smooth_measure: 'mean'
@@ -32,16 +32,13 @@ siting_params:
     MIRSA:
       # Simulated Annealing with Local Search
       set: True
-      c: [10]
+      c: [9]
       neighborhood: 1
-      no_iterations: 1000
+      no_iterations: 100
       no_epochs: 1000
       initial_temp: 200.
       no_runs: 1
       algorithm: 'SALS' #'GLS'
-      which_sol: 'rand' #'rand'
-      seed: 1
-      purpose: 'planning' # 'ol'
     GRED:
       set: False
       epsilon: 0.001
diff --git a/src/main.py b/src/main.py
index f8bee2c..1c33b33 100644
--- a/src/main.py
+++ b/src/main.py
@@ -93,7 +93,7 @@ if __name__ == '__main__':
                                                                  params['initial_temp'], params['no_runs'],
                                                                  params['algorithm'])
 
-            seed = params['seed']
+            seed = 1  # for folder naming purposes only
             for i in range(jl_selected.shape[0]):
 
                 output_folder = init_folder(model_parameters, c, suffix='_MIRSA_seed' + str(seed))
-- 
GitLab