diff --git a/analyse_campaign.ipynb b/analyse_campaign.ipynb
index 1e6ce1ce69a4709257cb848f867fc3d176bc4a9d..db396cac8a5e06c3ba19f467c4e7c25cd61bf2ac 100644
--- a/analyse_campaign.ipynb
+++ b/analyse_campaign.ipynb
@@ -7,7 +7,7 @@
"source": [
"# Analyse the data from the third campaign\n",
"\n",
- "In this notebook we analyse the results generated by launching the third experimental campaign `campaign3.py`.\n",
+ "In this notebook we analyse the results generated by launching the third experimental campaign `campaign.py`.\n",
"\n",
"## Initializing the environment"
]
@@ -928,7 +928,7 @@
}
],
"source": [
- "metrics = pd.read_csv(f\"{OUT_DIR}/metrics_campaign3_big.csv\")\n",
+ "metrics = pd.read_csv(f\"{OUT_DIR}/metrics_campaign_big.csv\")\n",
"metrics"
]
},
@@ -1301,7 +1301,7 @@
"source": [
"# analyze metrics relative to the control XP\n",
"import math\n",
- "expe_filename = f\"{OUT_DIR}/metrics_relative_campaign3_big.csv\"\n",
+ "expe_filename = f\"{OUT_DIR}/metrics_relative_campaign_big.csv\"\n",
"metrics_relative = pd.read_csv(expe_filename)\n",
"aggregated_behavior_mean = metrics_relative.groupby([\"window_type\",\"behavior\",\"XP\"]).mean()\n",
"aggregated_behavior_mean = aggregated_behavior_mean.add_suffix(\"_mean\")\n",
@@ -1712,7 +1712,7 @@
}
],
"source": [
- "metrics = pd.read_csv(f\"{OUT_DIR}/metrics_campaign3_big.csv\")\n",
+ "metrics = pd.read_csv(f\"{OUT_DIR}/metrics_campaign_big.csv\")\n",
"#Convert energy to kwh for better view\n",
"metrics[\"NRJ_red (kwh)\"] = metrics[\"NRJ_red (Joules)\"]/3600/1000\n",
"metrics[\"NRJ_total (kwh)\"] = metrics[\"NRJ_total (Joules)\"]/3600/1000\n",
@@ -1768,7 +1768,7 @@
" if \"max_\" in behavior :\n",
" return 1\n",
"\n",
- "metrics = pd.read_csv(f\"{OUT_DIR}/metrics_campaign3_big.csv\")\n",
+ "metrics = pd.read_csv(f\"{OUT_DIR}/metrics_campaign_big.csv\")\n",
"metrics[\"alpha\"]=metrics[\"behavior\"].apply(lambda x : behavior_to_alpha(x))\n",
"alpha = metrics[\"alpha\"]\n",
"underprod = metrics[\"energy underproduced (Joules)\"]\n",
@@ -1903,7 +1903,7 @@
" ax.set_ylim(bottom=ybot)\n",
" return ax\n",
"\n",
- "metrics = pd.read_csv(f\"{OUT_DIR}/metrics_campaign3_big.csv\")\n",
+ "metrics = pd.read_csv(f\"{OUT_DIR}/metrics_campaign_big.csv\")\n",
"\n",
"total_jobs = metrics[metrics.behavior==\"replay_user_rigid\"][\"#jobs\"].values[0]\n",
"# metrics = metrics[metrics.behavior!='dm_user_multi_behavior_degrad']\n",
@@ -2154,7 +2154,7 @@
" \"renounce\": 4/4\n",
"}\n",
"\n",
- "metrics = pd.read_csv(f\"{OUT_DIR}/metrics_campaign3_big.csv\")\n",
+ "metrics = pd.read_csv(f\"{OUT_DIR}/metrics_campaign_big.csv\")\n",
"# Sort out the experiments we don't need\n",
"# metrics = metrics[metrics.behavior!='dm_user_multi_behavior_degrad']\n",
"# metrics = metrics[metrics.behavior!='dm_user_multi_behavior_reconfig']\n",
diff --git a/campaign.py b/campaign.py
index 1785755b3594219bf461f3b419f3a44bec5cf1a6..d8e3b5378f538c1da49bf69324191d3f0a22a2ea 100755
--- a/campaign.py
+++ b/campaign.py
@@ -14,7 +14,7 @@ from scripts.generate_file import save_dict_to_json
from instance import start_instance, prepare_input_data, generate_windows_dict, \
compress_expe_result, user_type_to_behavior
from scripts.stat_tools import plot_exec_time, plot_queue_load
-from compute_metrics_campaign3 import compute_metrics_all_expe_parr
+from compute_metrics_campaign import compute_metrics_all_expe_parr
def parse_argument():
diff --git a/compute_metrics_campaign.py b/compute_metrics_campaign.py
index b6eba71ade14ec6033b959af3d4cbd3bf4d9bde5..9d708e0497736c308cdc9895ed3755875784d857 100644
--- a/compute_metrics_campaign.py
+++ b/compute_metrics_campaign.py
@@ -220,7 +220,7 @@ def main():
argument_parser.add_argument("--threads", type=int,
help="number of threads (default : 1 sequential)", default=1, required=False)
argument_parser.add_argument("--output", type=str, required=True,
- help="name of the output csv file (example : out/metrics_campaign3_2)")
+ help="name of the output csv file (example : out/metrics_campaign_2)")
argument_parser.add_argument("--merge", action="store_true",
help="merge the already computed data when using compress_mode")
argument_parser.add_argument("--energy-file", default=None,nargs="*",
diff --git a/scripts/install_nix.sh b/scripts/install_nix_g5k.sh
similarity index 64%
rename from scripts/install_nix.sh
rename to scripts/install_nix_g5k.sh
index fd8e2948e0dea0e2b5e024255e166e61b1d4024a..edd40cb5357a3cb9e5aa1b57ce6dd90a7c2a48ac 100755
--- a/scripts/install_nix.sh
+++ b/scripts/install_nix_g5k.sh
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
sudo-g5k
#creation of directory for nancy host
-mkdir -m 0755 -p /nix/var/nix/{profiles,gcroots}/per-user/$USER
+sudo mkdir -m 0755 -p /nix/var/nix/{profiles,gcroots}/per-user/$USER
+sudo chown -R mmadon /nix
#nix installation
sh <(curl -L https://nixos.org/nix/install) --no-daemon --yes
. ~/.nix-profile/etc/profile.d/nix.sh
-nix-env -iA nixpkgs.bat nixpkgs.tree
diff --git a/scripts/run_expe.sh b/scripts/run_expe.sh
index c0497863a40b5eb3f613b1a4472d69b4d9c2c263..5e7771b78618615d58e0792b08203edf9d5fe9c4 100755
--- a/scripts/run_expe.sh
+++ b/scripts/run_expe.sh
@@ -1,5 +1,5 @@
#!/bin/bash
# example launch of experiments of 164 days with 1 replicat with every behavior json
-python3 campaign.py --nb-replicat 1 --expe-range -1 --window-mode 8 --nb-days 164 \
+python3 campaign.py --nb-replicat 30 --expe-range -1 --window-mode 8 --nb-days 164 \
--json-behavior behavior_file/big_effort.json behavior_file/low_effort.json behavior_file/max_effort.json behavior_file/medium_effort.json \
--compress-mode --production-file data_energy/energy_trace_sizing_solar.csv data_energy/energy_trace_sizing_solar.csv
\ No newline at end of file