From 7eee0def1247f35671b723ab623c68c77b9a5342 Mon Sep 17 00:00:00 2001
From: David Hendriks <davidhendriks93@gmail.com>
Date: Tue, 11 Feb 2020 12:09:47 +0000
Subject: [PATCH] updated and moved files

---
 ...pulation_comparing_with_multiprocessing.py |   3 +-
 .../scaling/run_tests_astro1_new.sh           | 175 ++++++++++++++++++
 .../comparison_result_astro1.dat              |   0
 ...result_david-Lenovo-IdeaPad-S340-14IWL.dat |   0
 .../comparison_result_laptop.dat              |   0
 5 files changed, 177 insertions(+), 1 deletion(-)
 rename tests/population/scaling/{ => scaling_results}/comparison_result_astro1.dat (100%)
 rename tests/population/scaling/{ => scaling_results}/comparison_result_david-Lenovo-IdeaPad-S340-14IWL.dat (100%)
 rename tests/population/scaling/{ => scaling_results}/comparison_result_laptop.dat (100%)

diff --git a/tests/population/scaling/evolve_population_comparing_with_multiprocessing.py b/tests/population/scaling/evolve_population_comparing_with_multiprocessing.py
index 2a11d4ce4..c880e820e 100644
--- a/tests/population/scaling/evolve_population_comparing_with_multiprocessing.py
+++ b/tests/population/scaling/evolve_population_comparing_with_multiprocessing.py
@@ -81,6 +81,7 @@ def parse_function(self, output):
 
 resolution = {'M_1': res_m_1, 'per': res_per}
 total_systems = np.prod([el for el in resolution.values()])
+result_dir = 'scaling_results'
 # AMT_CORES = int(amt_cores)
 
 
@@ -147,6 +148,6 @@ print("The speed up by using MP is: {}".format(total_lin/total_mp))
 
 # Write to file:
 # amt_cores, amt_systems, total_time_lin, total_time_mp, speedup
-with open("comparison_result_{}.dat".format(name_testcase), "a") as f:
+with open(os.path.join(result_dir, "comparison_result_{}.dat".format(name_testcase)), "a") as f:
     res = (AMT_CORES, total_systems, total_lin, total_mp, speed_up)
     f.write(str(res) + "\n")
\ No newline at end of file
diff --git a/tests/population/scaling/run_tests_astro1_new.sh b/tests/population/scaling/run_tests_astro1_new.sh
index 3acf2260f..5734e1de8 100755
--- a/tests/population/scaling/run_tests_astro1_new.sh
+++ b/tests/population/scaling/run_tests_astro1_new.sh
@@ -4,8 +4,183 @@ python evolve_population_comparing_with_multiprocessing.py 10 10 2 "${HOSTNAME}"
 python evolve_population_comparing_with_multiprocessing.py 10 10 2 "${HOSTNAME}"
 python evolve_population_comparing_with_multiprocessing.py 10 10 2 "${HOSTNAME}"
 
+python evolve_population_comparing_with_multiprocessing.py 20 20 2 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 2 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 2 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 2 "${HOSTNAME}"
+
 python evolve_population_comparing_with_multiprocessing.py 25 25 2 "${HOSTNAME}"
 python evolve_population_comparing_with_multiprocessing.py 25 25 2 "${HOSTNAME}"
 python evolve_population_comparing_with_multiprocessing.py 25 25 2 "${HOSTNAME}"
 python evolve_population_comparing_with_multiprocessing.py 25 25 2 "${HOSTNAME}"
 
+python evolve_population_comparing_with_multiprocessing.py 30 30 2 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 2 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 2 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 2 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 50 50 2 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 2 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 2 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 2 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 80 80 2 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 2 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 2 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 2 "${HOSTNAME}"
+
+#
+python evolve_population_comparing_with_multiprocessing.py 10 10 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 10 10 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 10 10 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 10 10 4 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 20 20 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 4 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 25 25 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 25 25 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 25 25 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 25 25 4 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 30 30 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 4 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 50 50 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 4 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 80 80 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 4 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 4 "${HOSTNAME}"
+
+#
+python evolve_population_comparing_with_multiprocessing.py 10 10 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 10 10 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 10 10 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 10 10 8 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 20 20 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 8 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 25 25 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 25 25 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 25 25 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 25 25 8 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 30 30 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 8 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 50 50 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 8 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 80 80 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 8 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 8 "${HOSTNAME}"
+
+#
+python evolve_population_comparing_with_multiprocessing.py 10 10 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 10 10 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 10 10 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 10 10 12 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 20 20 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 12 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 25 25 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 25 25 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 25 25 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 25 25 12 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 30 30 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 12 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 50 50 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 12 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 80 80 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 12 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 12 "${HOSTNAME}"
+
+#
+python evolve_population_comparing_with_multiprocessing.py 10 10 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 10 10 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 10 10 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 10 10 16 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 20 20 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 16 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 25 25 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 25 25 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 25 25 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 25 25 16 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 30 30 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 16 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 50 50 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 16 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 80 80 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 16 "${HOSTNAME}"
+
+#
+python evolve_population_comparing_with_multiprocessing.py 10 10 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 10 10 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 10 10 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 10 10 16 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 20 20 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 20 20 16 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 25 25 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 25 25 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 25 25 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 25 25 16 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 30 30 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 30 30 16 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 50 50 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 50 50 16 "${HOSTNAME}"
+
+python evolve_population_comparing_with_multiprocessing.py 80 80 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 16 "${HOSTNAME}"
+python evolve_population_comparing_with_multiprocessing.py 80 80 16 "${HOSTNAME}"
+
diff --git a/tests/population/scaling/comparison_result_astro1.dat b/tests/population/scaling/scaling_results/comparison_result_astro1.dat
similarity index 100%
rename from tests/population/scaling/comparison_result_astro1.dat
rename to tests/population/scaling/scaling_results/comparison_result_astro1.dat
diff --git a/tests/population/scaling/comparison_result_david-Lenovo-IdeaPad-S340-14IWL.dat b/tests/population/scaling/scaling_results/comparison_result_david-Lenovo-IdeaPad-S340-14IWL.dat
similarity index 100%
rename from tests/population/scaling/comparison_result_david-Lenovo-IdeaPad-S340-14IWL.dat
rename to tests/population/scaling/scaling_results/comparison_result_david-Lenovo-IdeaPad-S340-14IWL.dat
diff --git a/tests/population/scaling/comparison_result_laptop.dat b/tests/population/scaling/scaling_results/comparison_result_laptop.dat
similarity index 100%
rename from tests/population/scaling/comparison_result_laptop.dat
rename to tests/population/scaling/scaling_results/comparison_result_laptop.dat
-- 
GitLab