From 29f5797e58e9cf4119c3b8c387dec2f7e3c4db9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Madon?= <mael.madon@irit.fr>
Date: Wed, 2 Feb 2022 15:35:35 +0100
Subject: [PATCH] few fixes
---
.gitignore | 3 +-
campaign2.py | 2 +-
passive_submit.sh | 2 +-
workload/start_days_for_campaign2.txt | 105 ++++++++++++++++++++++++++
4 files changed, 109 insertions(+), 3 deletions(-)
create mode 100644 workload/start_days_for_campaign2.txt
diff --git a/.gitignore b/.gitignore
index 9c5d5e1..9726a15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
sched_input/*.json
workload/*
!workload/empty_workload.json
+!workload/start_days_for_campaign2.txt
*.ipynb_checkpoints
*__pycache__/
-out/*
+out*
cache_nix
diff --git a/campaign2.py b/campaign2.py
index e70a479..aa5812a 100755
--- a/campaign2.py
+++ b/campaign2.py
@@ -46,7 +46,7 @@ with concurrent.futures.ProcessPoolExecutor() as executor:
print(f"Submit expe {i}")
# start_instance(expe_num, start_date, prepare_workload, clean_log)
instances.append(executor.submit(
- start_instance, i, expe_start_time[i], False, True))
+ start_instance, i, expe_start_time[i], True, True))
for instance in concurrent.futures.as_completed(instances):
print(f"Expe {instance.result()} terminated")
diff --git a/passive_submit.sh b/passive_submit.sh
index 68278c3..8f66ebe 100755
--- a/passive_submit.sh
+++ b/passive_submit.sh
@@ -2,5 +2,5 @@
cd ~/demand-response-user
source scripts/install_nix.sh
-nix-shell --pure -A exp_env --run "python3 campaign1.py"
+nix-shell --pure -A exp_env --run "python3 campaign2.py"
diff --git a/workload/start_days_for_campaign2.txt b/workload/start_days_for_campaign2.txt
new file mode 100644
index 0000000..9ade1dd
--- /dev/null
+++ b/workload/start_days_for_campaign2.txt
@@ -0,0 +1,105 @@
+Sun Jun 1 00:00:00 2014
+Mon Jun 2 00:00:00 2014
+Tue Jun 3 00:00:00 2014
+Wed Jun 4 00:00:00 2014
+Thu Jun 5 00:00:00 2014
+Sun Jun 8 00:00:00 2014
+Mon Jun 9 00:00:00 2014
+Tue Jun 10 00:00:00 2014
+Wed Jun 11 00:00:00 2014
+Thu Jun 12 00:00:00 2014
+Sun Jun 15 00:00:00 2014
+Mon Jun 16 00:00:00 2014
+Tue Jun 17 00:00:00 2014
+Wed Jun 18 00:00:00 2014
+Thu Jun 19 00:00:00 2014
+Sun Jun 22 00:00:00 2014
+Mon Jun 23 00:00:00 2014
+Tue Jun 24 00:00:00 2014
+Wed Jun 25 00:00:00 2014
+Thu Jun 26 00:00:00 2014
+Sun Jun 29 00:00:00 2014
+Mon Jun 30 00:00:00 2014
+Tue Jul 1 00:00:00 2014
+Wed Jul 2 00:00:00 2014
+Thu Jul 3 00:00:00 2014
+Sun Jul 6 00:00:00 2014
+Mon Jul 7 00:00:00 2014
+Tue Jul 8 00:00:00 2014
+Wed Jul 9 00:00:00 2014
+Thu Jul 10 00:00:00 2014
+Sun Jul 13 00:00:00 2014
+Mon Jul 14 00:00:00 2014
+Tue Jul 15 00:00:00 2014
+Wed Jul 16 00:00:00 2014
+Thu Jul 17 00:00:00 2014
+Sun Jul 20 00:00:00 2014
+Mon Jul 21 00:00:00 2014
+Tue Jul 22 00:00:00 2014
+Wed Jul 23 00:00:00 2014
+Thu Jul 24 00:00:00 2014
+Sun Jul 27 00:00:00 2014
+Mon Jul 28 00:00:00 2014
+Tue Jul 29 00:00:00 2014
+Wed Jul 30 00:00:00 2014
+Thu Jul 31 00:00:00 2014
+Sun Aug 3 00:00:00 2014
+Mon Aug 4 00:00:00 2014
+Tue Aug 5 00:00:00 2014
+Wed Aug 6 00:00:00 2014
+Thu Aug 7 00:00:00 2014
+Sun Aug 10 00:00:00 2014
+Mon Aug 11 00:00:00 2014
+Tue Aug 12 00:00:00 2014
+Wed Aug 13 00:00:00 2014
+Thu Aug 14 00:00:00 2014
+Sun Aug 17 00:00:00 2014
+Mon Aug 18 00:00:00 2014
+Tue Aug 19 00:00:00 2014
+Wed Aug 20 00:00:00 2014
+Thu Aug 21 00:00:00 2014
+Sun Aug 24 00:00:00 2014
+Mon Aug 25 00:00:00 2014
+Tue Aug 26 00:00:00 2014
+Wed Aug 27 00:00:00 2014
+Thu Aug 28 00:00:00 2014
+Sun Aug 31 00:00:00 2014
+Mon Sep 1 00:00:00 2014
+Tue Sep 2 00:00:00 2014
+Wed Sep 3 00:00:00 2014
+Thu Sep 4 00:00:00 2014
+Sun Sep 7 00:00:00 2014
+Mon Sep 8 00:00:00 2014
+Tue Sep 9 00:00:00 2014
+Wed Sep 10 00:00:00 2014
+Thu Sep 11 00:00:00 2014
+Sun Sep 14 00:00:00 2014
+Mon Sep 15 00:00:00 2014
+Tue Sep 16 00:00:00 2014
+Wed Sep 17 00:00:00 2014
+Thu Sep 18 00:00:00 2014
+Sun Sep 21 00:00:00 2014
+Mon Sep 22 00:00:00 2014
+Tue Sep 23 00:00:00 2014
+Wed Sep 24 00:00:00 2014
+Thu Sep 25 00:00:00 2014
+Sun Sep 28 00:00:00 2014
+Mon Sep 29 00:00:00 2014
+Tue Sep 30 00:00:00 2014
+Wed Oct 1 00:00:00 2014
+Thu Oct 2 00:00:00 2014
+Sun Oct 5 00:00:00 2014
+Mon Oct 6 00:00:00 2014
+Tue Oct 7 00:00:00 2014
+Wed Oct 8 00:00:00 2014
+Thu Oct 9 00:00:00 2014
+Sun Oct 12 00:00:00 2014
+Mon Oct 13 00:00:00 2014
+Tue Oct 14 00:00:00 2014
+Wed Oct 15 00:00:00 2014
+Thu Oct 16 00:00:00 2014
+Sun Oct 19 00:00:00 2014
+Mon Oct 20 00:00:00 2014
+Tue Oct 21 00:00:00 2014
+Wed Oct 22 00:00:00 2014
+Thu Oct 23 00:00:00 2014
--
GitLab