diff --git a/campaign1.py b/campaign1.py index d227a5b8fee36c033b141da0bd2109bbe5a22804..f9cb454eccf7cb153f22ef80b93c02089f7ecac4 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 51238408bb68bcf485e2f9813db2c18f34e7e947..67639121b28b9b3d7508b2ef8c0d41645cf31359 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):