From 5f98e2daaedf8a0f8cb0ceebaf94c6d5722206c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Madon?= <mael.madon@irit.fr>
Date: Sun, 30 Jan 2022 18:40:06 +0100
Subject: [PATCH] campaign1 ready to be launched with 50 expe

---
 campaign1.py | 5 +----
 instance1.py | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/campaign1.py b/campaign1.py
index d227a5b..f9cb454 100644
--- a/campaign1.py
+++ b/campaign1.py
@@ -13,7 +13,7 @@ jun1, nov30 = (int)(jun1_unix_time -
 
 random.seed(1997)
 
-nb_expe = 2
+nb_expe = 50
 
 
 start_dates = [random.randint(jun1, nov30 - 72 * 3600)
@@ -27,6 +27,3 @@ with concurrent.futures.ProcessPoolExecutor() as executor:
 
     for instance in concurrent.futures.as_completed(instances):
         print(f"Expe {instance.result()} terminated")
-
-# For every start date
-#   Call the one_instance file with this date
diff --git a/instance1.py b/instance1.py
index 5123840..6763912 100755
--- a/instance1.py
+++ b/instance1.py
@@ -44,7 +44,7 @@ def run_expe(expe_num, user_category, window_size, clean_log):
     uf = f"{ROOT_DIR}/sched_input/user_description_file.json"
 
     # Demand response window, from 12 to (12 + window_size) on day2
-    dm_window = [(24+12)*3600, (24+12+window_size)*3600]
+    dm_window = [(24+12)*3600, (int) (24+12+window_size)*3600]
 
     # User description file
     def user_description(user):
-- 
GitLab