From ca4b65bea67654314a111c704ced933a60b300f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Madon?= <mael.madon@irit.fr>
Date: Tue, 7 Nov 2023 09:48:45 +0100
Subject: [PATCH] fix makespan definition
---
KTH.ipynb | 213 +++++++++++++++++++++++-----------------------------
SDSC.ipynb | 215 ++++++++++++++++++++++++-----------------------------
2 files changed, 191 insertions(+), 237 deletions(-)
diff --git a/KTH.ipynb b/KTH.ipynb
index 907a608..9dc57d9 100644
--- a/KTH.ipynb
+++ b/KTH.ipynb
@@ -1769,7 +1769,7 @@
},
{
"cell_type": "code",
- "execution_count": 3,
+ "execution_count": 6,
"metadata": {},
"outputs": [
{
@@ -1845,7 +1845,7 @@
" <td>EASY</td>\n",
" <td>rigid</td>\n",
" <td>15.478527</td>\n",
- " <td>2.936363e+07</td>\n",
+ " <td>2.876378e+07</td>\n",
" <td>28763768.0</td>\n",
" <td>0</td>\n",
" <td>1.000000</td>\n",
@@ -1865,7 +1865,7 @@
" <td>EASY</td>\n",
" <td>a0</td>\n",
" <td>16.019170</td>\n",
- " <td>3.223402e+07</td>\n",
+ " <td>3.163418e+07</td>\n",
" <td>31632548.0</td>\n",
" <td>-290319</td>\n",
" <td>0.989907</td>\n",
@@ -1885,7 +1885,7 @@
" <td>EASY</td>\n",
" <td>a60</td>\n",
" <td>15.659092</td>\n",
- " <td>3.228012e+07</td>\n",
+ " <td>3.168027e+07</td>\n",
" <td>31678644.0</td>\n",
" <td>-386140</td>\n",
" <td>0.986575</td>\n",
@@ -1905,7 +1905,7 @@
" <td>FCFS</td>\n",
" <td>rigid</td>\n",
" <td>15.330505</td>\n",
- " <td>2.937961e+07</td>\n",
+ " <td>2.877976e+07</td>\n",
" <td>28763768.0</td>\n",
" <td>0</td>\n",
" <td>1.000000</td>\n",
@@ -1925,7 +1925,7 @@
" <td>FCFS</td>\n",
" <td>a0</td>\n",
" <td>15.799495</td>\n",
- " <td>4.016510e+07</td>\n",
+ " <td>3.956165e+07</td>\n",
" <td>39549643.0</td>\n",
" <td>2821433</td>\n",
" <td>1.098090</td>\n",
@@ -1945,7 +1945,7 @@
" <td>FCFS</td>\n",
" <td>a60</td>\n",
" <td>15.415444</td>\n",
- " <td>3.986430e+07</td>\n",
+ " <td>3.926085e+07</td>\n",
" <td>39248837.0</td>\n",
" <td>2272841</td>\n",
" <td>1.079017</td>\n",
@@ -1965,7 +1965,7 @@
" <td>speed*2</td>\n",
" <td>rigid</td>\n",
" <td>15.323384</td>\n",
- " <td>2.936362e+07</td>\n",
+ " <td>2.876377e+07</td>\n",
" <td>28763768.0</td>\n",
" <td>0</td>\n",
" <td>1.000000</td>\n",
@@ -1985,7 +1985,7 @@
" <td>speed*2</td>\n",
" <td>a0</td>\n",
" <td>15.529632</td>\n",
- " <td>2.933394e+07</td>\n",
+ " <td>2.873409e+07</td>\n",
" <td>28734078.0</td>\n",
" <td>-1071667</td>\n",
" <td>0.962742</td>\n",
@@ -2005,7 +2005,7 @@
" <td>speed*2</td>\n",
" <td>a60</td>\n",
" <td>15.177044</td>\n",
- " <td>2.933725e+07</td>\n",
+ " <td>2.873740e+07</td>\n",
" <td>28737388.0</td>\n",
" <td>-1150172</td>\n",
" <td>0.960013</td>\n",
@@ -2025,7 +2025,7 @@
" <td>speed/2</td>\n",
" <td>rigid</td>\n",
" <td>21.655504</td>\n",
- " <td>4.137134e+07</td>\n",
+ " <td>4.076789e+07</td>\n",
" <td>28763768.0</td>\n",
" <td>0</td>\n",
" <td>1.000000</td>\n",
@@ -2045,7 +2045,7 @@
" <td>speed/2</td>\n",
" <td>a0</td>\n",
" <td>16.549820</td>\n",
- " <td>5.554752e+07</td>\n",
+ " <td>5.494767e+07</td>\n",
" <td>54923631.0</td>\n",
" <td>3982767</td>\n",
" <td>1.138465</td>\n",
@@ -2065,7 +2065,7 @@
" <td>speed/2</td>\n",
" <td>a60</td>\n",
" <td>15.909616</td>\n",
- " <td>5.505634e+07</td>\n",
+ " <td>5.445648e+07</td>\n",
" <td>54432445.0</td>\n",
" <td>3762023</td>\n",
" <td>1.130790</td>\n",
@@ -2085,7 +2085,7 @@
" <td>infra*2</td>\n",
" <td>rigid</td>\n",
" <td>15.670150</td>\n",
- " <td>2.936363e+07</td>\n",
+ " <td>2.876378e+07</td>\n",
" <td>28763768.0</td>\n",
" <td>0</td>\n",
" <td>1.000000</td>\n",
@@ -2105,7 +2105,7 @@
" <td>infra*2</td>\n",
" <td>a0</td>\n",
" <td>16.112785</td>\n",
- " <td>2.933878e+07</td>\n",
+ " <td>2.873893e+07</td>\n",
" <td>28738901.0</td>\n",
" <td>-747149</td>\n",
" <td>0.974025</td>\n",
@@ -2125,7 +2125,7 @@
" <td>infra*2</td>\n",
" <td>a60</td>\n",
" <td>17.260096</td>\n",
- " <td>2.934047e+07</td>\n",
+ " <td>2.874062e+07</td>\n",
" <td>28740401.0</td>\n",
" <td>-805374</td>\n",
" <td>0.972000</td>\n",
@@ -2145,7 +2145,7 @@
" <td>infra/2</td>\n",
" <td>rigid</td>\n",
" <td>15.316841</td>\n",
- " <td>3.401097e+07</td>\n",
+ " <td>3.341112e+07</td>\n",
" <td>28763768.0</td>\n",
" <td>0</td>\n",
" <td>1.000000</td>\n",
@@ -2165,7 +2165,7 @@
" <td>infra/2</td>\n",
" <td>a0</td>\n",
" <td>15.741748</td>\n",
- " <td>4.146484e+07</td>\n",
+ " <td>4.086139e+07</td>\n",
" <td>40849378.0</td>\n",
" <td>1423562</td>\n",
" <td>1.049492</td>\n",
@@ -2185,7 +2185,7 @@
" <td>infra/2</td>\n",
" <td>a60</td>\n",
" <td>15.190998</td>\n",
- " <td>4.142328e+07</td>\n",
+ " <td>4.081982e+07</td>\n",
" <td>40812715.0</td>\n",
" <td>1288183</td>\n",
" <td>1.044785</td>\n",
@@ -2207,24 +2207,24 @@
"text/plain": [
" expe replay simulation_time makespan length lateness \\\n",
"0 original_log NaN 0.000000 2.876502e+07 28763768.0 0 \n",
- "0 EASY rigid 15.478527 2.936363e+07 28763768.0 0 \n",
- "0 EASY a0 16.019170 3.223402e+07 31632548.0 -290319 \n",
- "0 EASY a60 15.659092 3.228012e+07 31678644.0 -386140 \n",
- "0 FCFS rigid 15.330505 2.937961e+07 28763768.0 0 \n",
- "0 FCFS a0 15.799495 4.016510e+07 39549643.0 2821433 \n",
- "0 FCFS a60 15.415444 3.986430e+07 39248837.0 2272841 \n",
- "0 speed*2 rigid 15.323384 2.936362e+07 28763768.0 0 \n",
- "0 speed*2 a0 15.529632 2.933394e+07 28734078.0 -1071667 \n",
- "0 speed*2 a60 15.177044 2.933725e+07 28737388.0 -1150172 \n",
- "0 speed/2 rigid 21.655504 4.137134e+07 28763768.0 0 \n",
- "0 speed/2 a0 16.549820 5.554752e+07 54923631.0 3982767 \n",
- "0 speed/2 a60 15.909616 5.505634e+07 54432445.0 3762023 \n",
- "0 infra*2 rigid 15.670150 2.936363e+07 28763768.0 0 \n",
- "0 infra*2 a0 16.112785 2.933878e+07 28738901.0 -747149 \n",
- "0 infra*2 a60 17.260096 2.934047e+07 28740401.0 -805374 \n",
- "0 infra/2 rigid 15.316841 3.401097e+07 28763768.0 0 \n",
- "0 infra/2 a0 15.741748 4.146484e+07 40849378.0 1423562 \n",
- "0 infra/2 a60 15.190998 4.142328e+07 40812715.0 1288183 \n",
+ "0 EASY rigid 15.478527 2.876378e+07 28763768.0 0 \n",
+ "0 EASY a0 16.019170 3.163418e+07 31632548.0 -290319 \n",
+ "0 EASY a60 15.659092 3.168027e+07 31678644.0 -386140 \n",
+ "0 FCFS rigid 15.330505 2.877976e+07 28763768.0 0 \n",
+ "0 FCFS a0 15.799495 3.956165e+07 39549643.0 2821433 \n",
+ "0 FCFS a60 15.415444 3.926085e+07 39248837.0 2272841 \n",
+ "0 speed*2 rigid 15.323384 2.876377e+07 28763768.0 0 \n",
+ "0 speed*2 a0 15.529632 2.873409e+07 28734078.0 -1071667 \n",
+ "0 speed*2 a60 15.177044 2.873740e+07 28737388.0 -1150172 \n",
+ "0 speed/2 rigid 21.655504 4.076789e+07 28763768.0 0 \n",
+ "0 speed/2 a0 16.549820 5.494767e+07 54923631.0 3982767 \n",
+ "0 speed/2 a60 15.909616 5.445648e+07 54432445.0 3762023 \n",
+ "0 infra*2 rigid 15.670150 2.876378e+07 28763768.0 0 \n",
+ "0 infra*2 a0 16.112785 2.873893e+07 28738901.0 -747149 \n",
+ "0 infra*2 a60 17.260096 2.874062e+07 28740401.0 -805374 \n",
+ "0 infra/2 rigid 15.316841 3.341112e+07 28763768.0 0 \n",
+ "0 infra/2 a0 15.741748 4.086139e+07 40849378.0 1423562 \n",
+ "0 infra/2 a60 15.190998 4.081982e+07 40812715.0 1288183 \n",
"\n",
" stretch delta nb_jobs nb_jobs_success mean_waiting_time \\\n",
"0 NaN NaN 28476 20530 1.529587e+04 \n",
@@ -2366,7 +2366,7 @@
" <td>EASY</td>\n",
" <td>rigid</td>\n",
" <td>0 days 00:00:15</td>\n",
- " <td>339 days 20:33:46</td>\n",
+ " <td>332 days 21:56:16</td>\n",
" <td>332 days 21:56:08</td>\n",
" <td>0 days 00:00:00</td>\n",
" <td>1.000000</td>\n",
@@ -2386,7 +2386,7 @@
" <td>EASY</td>\n",
" <td>a0</td>\n",
" <td>0 days 00:00:16</td>\n",
- " <td>373 days 01:53:45</td>\n",
+ " <td>366 days 03:16:15</td>\n",
" <td>366 days 02:49:08</td>\n",
" <td>-4 days +15:21:21</td>\n",
" <td>0.989907</td>\n",
@@ -2406,7 +2406,7 @@
" <td>EASY</td>\n",
" <td>a60</td>\n",
" <td>0 days 00:00:15</td>\n",
- " <td>373 days 14:42:01</td>\n",
+ " <td>366 days 16:04:31</td>\n",
" <td>366 days 15:37:24</td>\n",
" <td>-5 days +12:44:20</td>\n",
" <td>0.986575</td>\n",
@@ -2426,7 +2426,7 @@
" <td>FCFS</td>\n",
" <td>rigid</td>\n",
" <td>0 days 00:00:15</td>\n",
- " <td>340 days 01:00:08</td>\n",
+ " <td>333 days 02:22:38</td>\n",
" <td>332 days 21:56:08</td>\n",
" <td>0 days 00:00:00</td>\n",
" <td>1.000000</td>\n",
@@ -2446,7 +2446,7 @@
" <td>FCFS</td>\n",
" <td>a0</td>\n",
" <td>0 days 00:00:15</td>\n",
- " <td>464 days 20:58:24</td>\n",
+ " <td>457 days 21:20:54</td>\n",
" <td>457 days 18:00:43</td>\n",
" <td>32 days 15:43:53</td>\n",
" <td>1.098090</td>\n",
@@ -2466,7 +2466,7 @@
" <td>FCFS</td>\n",
" <td>a60</td>\n",
" <td>0 days 00:00:15</td>\n",
- " <td>461 days 09:24:58</td>\n",
+ " <td>454 days 09:47:28</td>\n",
" <td>454 days 06:27:17</td>\n",
" <td>26 days 07:20:41</td>\n",
" <td>1.079017</td>\n",
@@ -2486,7 +2486,7 @@
" <td>speed*2</td>\n",
" <td>rigid</td>\n",
" <td>0 days 00:00:15</td>\n",
- " <td>339 days 20:33:42</td>\n",
+ " <td>332 days 21:56:12</td>\n",
" <td>332 days 21:56:08</td>\n",
" <td>0 days 00:00:00</td>\n",
" <td>1.000000</td>\n",
@@ -2506,7 +2506,7 @@
" <td>speed*2</td>\n",
" <td>a0</td>\n",
" <td>0 days 00:00:15</td>\n",
- " <td>339 days 12:19:03</td>\n",
+ " <td>332 days 13:41:33</td>\n",
" <td>332 days 13:41:18</td>\n",
" <td>-13 days +14:18:53</td>\n",
" <td>0.962742</td>\n",
@@ -2526,7 +2526,7 @@
" <td>speed*2</td>\n",
" <td>a60</td>\n",
" <td>0 days 00:00:15</td>\n",
- " <td>339 days 13:14:13</td>\n",
+ " <td>332 days 14:36:43</td>\n",
" <td>332 days 14:36:28</td>\n",
" <td>-14 days +16:30:28</td>\n",
" <td>0.960013</td>\n",
@@ -2546,7 +2546,7 @@
" <td>speed/2</td>\n",
" <td>rigid</td>\n",
" <td>0 days 00:00:21</td>\n",
- " <td>478 days 20:02:19</td>\n",
+ " <td>471 days 20:24:49</td>\n",
" <td>332 days 21:56:08</td>\n",
" <td>0 days 00:00:00</td>\n",
" <td>1.000000</td>\n",
@@ -2566,7 +2566,7 @@
" <td>speed/2</td>\n",
" <td>a0</td>\n",
" <td>0 days 00:00:16</td>\n",
- " <td>642 days 21:52:01</td>\n",
+ " <td>635 days 23:14:31</td>\n",
" <td>635 days 16:33:51</td>\n",
" <td>46 days 02:19:27</td>\n",
" <td>1.138465</td>\n",
@@ -2586,7 +2586,7 @@
" <td>speed/2</td>\n",
" <td>a60</td>\n",
" <td>0 days 00:00:15</td>\n",
- " <td>637 days 05:25:35</td>\n",
+ " <td>630 days 06:48:05</td>\n",
" <td>630 days 00:07:25</td>\n",
" <td>43 days 13:00:23</td>\n",
" <td>1.130790</td>\n",
@@ -2606,7 +2606,7 @@
" <td>infra*2</td>\n",
" <td>rigid</td>\n",
" <td>0 days 00:00:15</td>\n",
- " <td>339 days 20:33:46</td>\n",
+ " <td>332 days 21:56:16</td>\n",
" <td>332 days 21:56:08</td>\n",
" <td>0 days 00:00:00</td>\n",
" <td>1.000000</td>\n",
@@ -2626,7 +2626,7 @@
" <td>infra*2</td>\n",
" <td>a0</td>\n",
" <td>0 days 00:00:16</td>\n",
- " <td>339 days 13:39:41</td>\n",
+ " <td>332 days 15:02:11</td>\n",
" <td>332 days 15:01:41</td>\n",
" <td>-9 days +08:27:31</td>\n",
" <td>0.974025</td>\n",
@@ -2646,7 +2646,7 @@
" <td>infra*2</td>\n",
" <td>a60</td>\n",
" <td>0 days 00:00:17</td>\n",
- " <td>339 days 14:07:53</td>\n",
+ " <td>332 days 15:30:23</td>\n",
" <td>332 days 15:26:41</td>\n",
" <td>-10 days +16:17:06</td>\n",
" <td>0.972000</td>\n",
@@ -2666,7 +2666,7 @@
" <td>infra/2</td>\n",
" <td>rigid</td>\n",
" <td>0 days 00:00:15</td>\n",
- " <td>393 days 15:29:30</td>\n",
+ " <td>386 days 16:52:00</td>\n",
" <td>332 days 21:56:08</td>\n",
" <td>0 days 00:00:00</td>\n",
" <td>1.000000</td>\n",
@@ -2686,7 +2686,7 @@
" <td>infra/2</td>\n",
" <td>a0</td>\n",
" <td>0 days 00:00:15</td>\n",
- " <td>479 days 22:00:39</td>\n",
+ " <td>472 days 22:23:09</td>\n",
" <td>472 days 19:02:58</td>\n",
" <td>16 days 11:26:02</td>\n",
" <td>1.049492</td>\n",
@@ -2706,7 +2706,7 @@
" <td>infra/2</td>\n",
" <td>a60</td>\n",
" <td>0 days 00:00:15</td>\n",
- " <td>479 days 10:27:55</td>\n",
+ " <td>472 days 10:50:25</td>\n",
" <td>472 days 08:51:55</td>\n",
" <td>14 days 21:49:43</td>\n",
" <td>1.044785</td>\n",
@@ -2728,24 +2728,24 @@
"text/plain": [
" expe replay simulation_time makespan length \\\n",
"0 original_log NaN 0 days 00:00:00 332 days 22:17:00 332 days 21:56:08 \n",
- "0 EASY rigid 0 days 00:00:15 339 days 20:33:46 332 days 21:56:08 \n",
- "0 EASY a0 0 days 00:00:16 373 days 01:53:45 366 days 02:49:08 \n",
- "0 EASY a60 0 days 00:00:15 373 days 14:42:01 366 days 15:37:24 \n",
- "0 FCFS rigid 0 days 00:00:15 340 days 01:00:08 332 days 21:56:08 \n",
- "0 FCFS a0 0 days 00:00:15 464 days 20:58:24 457 days 18:00:43 \n",
- "0 FCFS a60 0 days 00:00:15 461 days 09:24:58 454 days 06:27:17 \n",
- "0 speed*2 rigid 0 days 00:00:15 339 days 20:33:42 332 days 21:56:08 \n",
- "0 speed*2 a0 0 days 00:00:15 339 days 12:19:03 332 days 13:41:18 \n",
- "0 speed*2 a60 0 days 00:00:15 339 days 13:14:13 332 days 14:36:28 \n",
- "0 speed/2 rigid 0 days 00:00:21 478 days 20:02:19 332 days 21:56:08 \n",
- "0 speed/2 a0 0 days 00:00:16 642 days 21:52:01 635 days 16:33:51 \n",
- "0 speed/2 a60 0 days 00:00:15 637 days 05:25:35 630 days 00:07:25 \n",
- "0 infra*2 rigid 0 days 00:00:15 339 days 20:33:46 332 days 21:56:08 \n",
- "0 infra*2 a0 0 days 00:00:16 339 days 13:39:41 332 days 15:01:41 \n",
- "0 infra*2 a60 0 days 00:00:17 339 days 14:07:53 332 days 15:26:41 \n",
- "0 infra/2 rigid 0 days 00:00:15 393 days 15:29:30 332 days 21:56:08 \n",
- "0 infra/2 a0 0 days 00:00:15 479 days 22:00:39 472 days 19:02:58 \n",
- "0 infra/2 a60 0 days 00:00:15 479 days 10:27:55 472 days 08:51:55 \n",
+ "0 EASY rigid 0 days 00:00:15 332 days 21:56:16 332 days 21:56:08 \n",
+ "0 EASY a0 0 days 00:00:16 366 days 03:16:15 366 days 02:49:08 \n",
+ "0 EASY a60 0 days 00:00:15 366 days 16:04:31 366 days 15:37:24 \n",
+ "0 FCFS rigid 0 days 00:00:15 333 days 02:22:38 332 days 21:56:08 \n",
+ "0 FCFS a0 0 days 00:00:15 457 days 21:20:54 457 days 18:00:43 \n",
+ "0 FCFS a60 0 days 00:00:15 454 days 09:47:28 454 days 06:27:17 \n",
+ "0 speed*2 rigid 0 days 00:00:15 332 days 21:56:12 332 days 21:56:08 \n",
+ "0 speed*2 a0 0 days 00:00:15 332 days 13:41:33 332 days 13:41:18 \n",
+ "0 speed*2 a60 0 days 00:00:15 332 days 14:36:43 332 days 14:36:28 \n",
+ "0 speed/2 rigid 0 days 00:00:21 471 days 20:24:49 332 days 21:56:08 \n",
+ "0 speed/2 a0 0 days 00:00:16 635 days 23:14:31 635 days 16:33:51 \n",
+ "0 speed/2 a60 0 days 00:00:15 630 days 06:48:05 630 days 00:07:25 \n",
+ "0 infra*2 rigid 0 days 00:00:15 332 days 21:56:16 332 days 21:56:08 \n",
+ "0 infra*2 a0 0 days 00:00:16 332 days 15:02:11 332 days 15:01:41 \n",
+ "0 infra*2 a60 0 days 00:00:17 332 days 15:30:23 332 days 15:26:41 \n",
+ "0 infra/2 rigid 0 days 00:00:15 386 days 16:52:00 332 days 21:56:08 \n",
+ "0 infra/2 a0 0 days 00:00:15 472 days 22:23:09 472 days 19:02:58 \n",
+ "0 infra/2 a60 0 days 00:00:15 472 days 10:50:25 472 days 08:51:55 \n",
"\n",
" lateness stretch delta nb_jobs nb_jobs_success \\\n",
"0 0 days 00:00:00 NaN NaN 28476 20530 \n",
@@ -2869,6 +2869,7 @@
" expe_metrics['lateness'] = int(mean_lateness(jobs, ref=WL_rigid))\n",
" expe_metrics['stretch'] = stretch(jobs, ref=WL_rigid)\n",
" expe_metrics['delta'] = delta(jobs, ref=WL_rigid)\n",
+ " expe_metrics['makespan'] = (jobs.finish_time.max() - jobs.submission_time.min()).total_seconds() # redefine makespan with our def\n",
" dfs.append( expe_metrics )\n",
"\n",
"all = pd.concat(dfs)[[\"expe\", \"replay\", \"simulation_time\",\"makespan\",\"length\",\"lateness\",\"stretch\",\"delta\",\"nb_jobs\",\"nb_jobs_success\",\n",
@@ -2895,7 +2896,7 @@
},
{
"cell_type": "code",
- "execution_count": 78,
+ "execution_count": 7,
"metadata": {},
"outputs": [
{
@@ -2907,24 +2908,24 @@
" expe & replay & makespan & mean\\_waiting\\_time & max\\_waiting\\_time & lateness & stretch & delta \\\\\n",
"\\midrule\n",
"original\\_log & NaN & 332.93 & 0.18 & 11.34 & 0.00 & NaN & NaN \\\\\n",
- " EASY & rigid & 339.86 & 0.07 & 4.07 & 0.00 & 1.00 & 0.00 \\\\\n",
- " EASY & a0 & 373.08 & 0.06 & 5.06 & -3.36 & 0.99 & -20.39 \\\\\n",
- " EASY & a60 & 373.61 & 0.07 & 6.11 & -4.47 & 0.99 & -27.12 \\\\\n",
- " FCFS & rigid & 340.04 & 4.51 & 11.79 & 0.00 & 1.00 & 0.00 \\\\\n",
- " FCFS & a0 & 464.87 & 0.29 & 4.95 & 32.66 & 1.10 & 198.18 \\\\\n",
- " FCFS & a60 & 461.39 & 0.47 & 4.47 & 26.31 & 1.08 & 159.64 \\\\\n",
- " speed*2 & rigid & 339.86 & 0.01 & 1.34 & 0.00 & 1.00 & 0.00 \\\\\n",
- " speed*2 & a0 & 339.51 & 0.01 & 1.82 & -12.40 & 0.96 & -75.27 \\\\\n",
- " speed*2 & a60 & 339.55 & 0.01 & 1.44 & -13.31 & 0.96 & -80.79 \\\\\n",
- " speed/2 & rigid & 478.83 & 31.84 & 141.34 & 0.00 & 1.00 & 0.00 \\\\\n",
- " speed/2 & a0 & 642.91 & 0.46 & 10.70 & 46.10 & 1.14 & 279.75 \\\\\n",
- " speed/2 & a60 & 637.23 & 0.62 & 10.26 & 43.54 & 1.13 & 264.24 \\\\\n",
- " infra*2 & rigid & 339.86 & 0.00 & 0.54 & 0.00 & 1.00 & 0.00 \\\\\n",
- " infra*2 & a0 & 339.57 & 0.00 & 0.81 & -8.65 & 0.97 & -52.48 \\\\\n",
- " infra*2 & a60 & 339.59 & 0.00 & 0.56 & -9.32 & 0.97 & -56.57 \\\\\n",
- " infra/2 & rigid & 393.65 & 4.15 & 58.87 & 0.00 & 1.00 & 0.00 \\\\\n",
- " infra/2 & a0 & 479.92 & 0.27 & 7.43 & 16.48 & 1.05 & 99.99 \\\\\n",
- " infra/2 & a60 & 479.44 & 0.35 & 7.31 & 14.91 & 1.04 & 90.48 \\\\\n",
+ " EASY & rigid & 332.91 & 0.07 & 4.07 & 0.00 & 1.00 & 0.00 \\\\\n",
+ " EASY & a0 & 366.14 & 0.06 & 5.06 & -3.36 & 0.99 & -20.39 \\\\\n",
+ " EASY & a60 & 366.67 & 0.07 & 6.11 & -4.47 & 0.99 & -27.12 \\\\\n",
+ " FCFS & rigid & 333.10 & 4.51 & 11.79 & 0.00 & 1.00 & 0.00 \\\\\n",
+ " FCFS & a0 & 457.89 & 0.29 & 4.95 & 32.66 & 1.10 & 198.18 \\\\\n",
+ " FCFS & a60 & 454.41 & 0.47 & 4.47 & 26.31 & 1.08 & 159.64 \\\\\n",
+ " speed*2 & rigid & 332.91 & 0.01 & 1.34 & 0.00 & 1.00 & 0.00 \\\\\n",
+ " speed*2 & a0 & 332.57 & 0.01 & 1.82 & -12.40 & 0.96 & -75.27 \\\\\n",
+ " speed*2 & a60 & 332.61 & 0.01 & 1.44 & -13.31 & 0.96 & -80.79 \\\\\n",
+ " speed/2 & rigid & 471.85 & 31.84 & 141.34 & 0.00 & 1.00 & 0.00 \\\\\n",
+ " speed/2 & a0 & 635.97 & 0.46 & 10.70 & 46.10 & 1.14 & 279.75 \\\\\n",
+ " speed/2 & a60 & 630.28 & 0.62 & 10.26 & 43.54 & 1.13 & 264.24 \\\\\n",
+ " infra*2 & rigid & 332.91 & 0.00 & 0.54 & 0.00 & 1.00 & 0.00 \\\\\n",
+ " infra*2 & a0 & 332.63 & 0.00 & 0.81 & -8.65 & 0.97 & -52.48 \\\\\n",
+ " infra*2 & a60 & 332.65 & 0.00 & 0.56 & -9.32 & 0.97 & -56.57 \\\\\n",
+ " infra/2 & rigid & 386.70 & 4.15 & 58.87 & 0.00 & 1.00 & 0.00 \\\\\n",
+ " infra/2 & a0 & 472.93 & 0.27 & 7.43 & 16.48 & 1.05 & 99.99 \\\\\n",
+ " infra/2 & a60 & 472.45 & 0.35 & 7.31 & 14.91 & 1.04 & 90.48 \\\\\n",
"\\bottomrule\n",
"\\end{tabular}\n",
"\n"
@@ -2934,38 +2935,14 @@
"name": "stderr",
"output_type": "stream",
"text": [
- "/run/user/1000/ipykernel_53524/1629746578.py:3: SettingWithCopyWarning: \n",
- "A value is trying to be set on a copy of a slice from a DataFrame.\n",
- "Try using .loc[row_indexer,col_indexer] = value instead\n",
- "\n",
- "See the caveats in the documentation: https://pandas.pydata.org/pandas-docs/stable/user_guide/indexing.html#returning-a-view-versus-a-copy\n",
- " to_latex[\"makespan\"] = to_latex.makespan / (3600*24)\n",
- "/run/user/1000/ipykernel_53524/1629746578.py:4: SettingWithCopyWarning: \n",
- "A value is trying to be set on a copy of a slice from a DataFrame.\n",
- "Try using .loc[row_indexer,col_indexer] = value instead\n",
- "\n",
- "See the caveats in the documentation: https://pandas.pydata.org/pandas-docs/stable/user_guide/indexing.html#returning-a-view-versus-a-copy\n",
- " to_latex[\"lateness\"] = to_latex.lateness / (3600*24)\n",
- "/run/user/1000/ipykernel_53524/1629746578.py:5: SettingWithCopyWarning: \n",
- "A value is trying to be set on a copy of a slice from a DataFrame.\n",
- "Try using .loc[row_indexer,col_indexer] = value instead\n",
- "\n",
- "See the caveats in the documentation: https://pandas.pydata.org/pandas-docs/stable/user_guide/indexing.html#returning-a-view-versus-a-copy\n",
- " to_latex[\"mean_waiting_time\"] = to_latex.mean_waiting_time / (3600*24)\n",
- "/run/user/1000/ipykernel_53524/1629746578.py:6: SettingWithCopyWarning: \n",
- "A value is trying to be set on a copy of a slice from a DataFrame.\n",
- "Try using .loc[row_indexer,col_indexer] = value instead\n",
- "\n",
- "See the caveats in the documentation: https://pandas.pydata.org/pandas-docs/stable/user_guide/indexing.html#returning-a-view-versus-a-copy\n",
- " to_latex[\"max_waiting_time\"] = to_latex.max_waiting_time / (3600*24)\n",
- "/run/user/1000/ipykernel_53524/1629746578.py:8: FutureWarning: In future versions `DataFrame.to_latex` is expected to utilise the base implementation of `Styler.to_latex` for formatting and rendering. The arguments signature may therefore change. It is recommended instead to use `DataFrame.style.to_latex` which also contains additional functionality.\n",
+ "/tmp/ipykernel_11129/2957959135.py:8: FutureWarning: In future versions `DataFrame.to_latex` is expected to utilise the base implementation of `Styler.to_latex` for formatting and rendering. The arguments signature may therefore change. It is recommended instead to use `DataFrame.style.to_latex` which also contains additional functionality.\n",
" print(to_latex.to_latex(index=False, escape=True,float_format=\"{:.2f}\".format).replace(\" days\", \"d\"))\n"
]
}
],
"source": [
"columns = [\"expe\", \"replay\", \"makespan\",\"mean_waiting_time\",\"max_waiting_time\",\"lateness\", \"stretch\",\"delta\"]\n",
- "to_latex = all[columns]\n",
+ "to_latex = all[columns].copy()\n",
"to_latex[\"makespan\"] = to_latex.makespan / (3600*24)\n",
"to_latex[\"lateness\"] = to_latex.lateness / (3600*24)\n",
"to_latex[\"mean_waiting_time\"] = to_latex.mean_waiting_time / (3600*24)\n",
diff --git a/SDSC.ipynb b/SDSC.ipynb
index 12f9756..6370296 100644
--- a/SDSC.ipynb
+++ b/SDSC.ipynb
@@ -14,7 +14,7 @@
},
{
"cell_type": "code",
- "execution_count": 2,
+ "execution_count": 1,
"metadata": {},
"outputs": [],
"source": [
@@ -42,7 +42,7 @@
},
{
"cell_type": "code",
- "execution_count": 3,
+ "execution_count": 2,
"metadata": {},
"outputs": [],
"source": [
@@ -25321,7 +25321,7 @@
" <td>EASY</td>\n",
" <td>rigid</td>\n",
" <td>41.517854</td>\n",
- " <td>6.358890e+07</td>\n",
+ " <td>6.318963e+07</td>\n",
" <td>63183029.0</td>\n",
" <td>0</td>\n",
" <td>1.000000</td>\n",
@@ -25341,7 +25341,7 @@
" <td>EASY</td>\n",
" <td>a0</td>\n",
" <td>43.573649</td>\n",
- " <td>7.028639e+07</td>\n",
+ " <td>6.988713e+07</td>\n",
" <td>69887097.0</td>\n",
" <td>202892</td>\n",
" <td>1.003211</td>\n",
@@ -25361,7 +25361,7 @@
" <td>EASY</td>\n",
" <td>a60</td>\n",
" <td>42.893777</td>\n",
- " <td>6.863551e+07</td>\n",
+ " <td>6.823624e+07</td>\n",
" <td>68236214.0</td>\n",
" <td>89817</td>\n",
" <td>1.001422</td>\n",
@@ -25381,7 +25381,7 @@
" <td>FCFS</td>\n",
" <td>rigid</td>\n",
" <td>43.499704</td>\n",
- " <td>6.902326e+07</td>\n",
+ " <td>6.862399e+07</td>\n",
" <td>63183029.0</td>\n",
" <td>0</td>\n",
" <td>1.000000</td>\n",
@@ -25401,7 +25401,7 @@
" <td>FCFS</td>\n",
" <td>a0</td>\n",
" <td>43.896996</td>\n",
- " <td>1.040875e+08</td>\n",
+ " <td>1.036882e+08</td>\n",
" <td>103688143.0</td>\n",
" <td>6643962</td>\n",
" <td>1.105154</td>\n",
@@ -25421,7 +25421,7 @@
" <td>FCFS</td>\n",
" <td>a60</td>\n",
" <td>42.434508</td>\n",
- " <td>9.247632e+07</td>\n",
+ " <td>9.207346e+07</td>\n",
" <td>92073379.0</td>\n",
" <td>3110062</td>\n",
" <td>1.049223</td>\n",
@@ -25441,7 +25441,7 @@
" <td>speed*2</td>\n",
" <td>rigid</td>\n",
" <td>39.783432</td>\n",
- " <td>6.358560e+07</td>\n",
+ " <td>6.318633e+07</td>\n",
" <td>63183029.0</td>\n",
" <td>0</td>\n",
" <td>1.000000</td>\n",
@@ -25461,7 +25461,7 @@
" <td>speed*2</td>\n",
" <td>a0</td>\n",
" <td>41.736393</td>\n",
- " <td>6.349783e+07</td>\n",
+ " <td>6.309857e+07</td>\n",
" <td>63096304.0</td>\n",
" <td>-953573</td>\n",
" <td>0.984908</td>\n",
@@ -25481,7 +25481,7 @@
" <td>speed*2</td>\n",
" <td>a60</td>\n",
" <td>40.446312</td>\n",
- " <td>6.345591e+07</td>\n",
+ " <td>6.305665e+07</td>\n",
" <td>63054385.0</td>\n",
" <td>-997848</td>\n",
" <td>0.984207</td>\n",
@@ -25501,7 +25501,7 @@
" <td>speed/2</td>\n",
" <td>rigid</td>\n",
" <td>63.596114</td>\n",
- " <td>1.074805e+08</td>\n",
+ " <td>1.070812e+08</td>\n",
" <td>63183029.0</td>\n",
" <td>0</td>\n",
" <td>1.000000</td>\n",
@@ -25521,7 +25521,7 @@
" <td>speed/2</td>\n",
" <td>a0</td>\n",
" <td>44.654584</td>\n",
- " <td>1.305401e+08</td>\n",
+ " <td>1.301408e+08</td>\n",
" <td>130140675.0</td>\n",
" <td>9208363</td>\n",
" <td>1.145741</td>\n",
@@ -25541,7 +25541,7 @@
" <td>speed/2</td>\n",
" <td>a60</td>\n",
" <td>43.141661</td>\n",
- " <td>1.293662e+08</td>\n",
+ " <td>1.289669e+08</td>\n",
" <td>128966781.0</td>\n",
" <td>8237262</td>\n",
" <td>1.130371</td>\n",
@@ -25561,7 +25561,7 @@
" <td>infra*2</td>\n",
" <td>rigid</td>\n",
" <td>42.416218</td>\n",
- " <td>6.358890e+07</td>\n",
+ " <td>6.318963e+07</td>\n",
" <td>63183029.0</td>\n",
" <td>0</td>\n",
" <td>1.000000</td>\n",
@@ -25581,7 +25581,7 @@
" <td>infra*2</td>\n",
" <td>a0</td>\n",
" <td>45.752814</td>\n",
- " <td>6.345457e+07</td>\n",
+ " <td>6.305530e+07</td>\n",
" <td>63050776.0</td>\n",
" <td>-741588</td>\n",
" <td>0.988263</td>\n",
@@ -25601,7 +25601,7 @@
" <td>infra*2</td>\n",
" <td>a60</td>\n",
" <td>44.371137</td>\n",
- " <td>6.347290e+07</td>\n",
+ " <td>6.307364e+07</td>\n",
" <td>63069112.0</td>\n",
" <td>-797169</td>\n",
" <td>0.987383</td>\n",
@@ -25621,7 +25621,7 @@
" <td>infra/2</td>\n",
" <td>rigid</td>\n",
" <td>58.879591</td>\n",
- " <td>1.013091e+08</td>\n",
+ " <td>1.009099e+08</td>\n",
" <td>63183029.0</td>\n",
" <td>0</td>\n",
" <td>1.000000</td>\n",
@@ -25641,7 +25641,7 @@
" <td>infra/2</td>\n",
" <td>a0</td>\n",
" <td>43.569445</td>\n",
- " <td>1.258791e+08</td>\n",
+ " <td>1.254798e+08</td>\n",
" <td>125479751.0</td>\n",
" <td>7760441</td>\n",
" <td>1.122825</td>\n",
@@ -25661,7 +25661,7 @@
" <td>infra/2</td>\n",
" <td>a60</td>\n",
" <td>40.369022</td>\n",
- " <td>1.253446e+08</td>\n",
+ " <td>1.249453e+08</td>\n",
" <td>124945259.0</td>\n",
" <td>7041304</td>\n",
" <td>1.111443</td>\n",
@@ -25683,24 +25683,24 @@
"text/plain": [
" expe replay simulation_time makespan length lateness \\\n",
"0 original_log NaN 0.000000 6.360105e+07 63582293.0 0 \n",
- "0 EASY rigid 41.517854 6.358890e+07 63183029.0 0 \n",
- "0 EASY a0 43.573649 7.028639e+07 69887097.0 202892 \n",
- "0 EASY a60 42.893777 6.863551e+07 68236214.0 89817 \n",
- "0 FCFS rigid 43.499704 6.902326e+07 63183029.0 0 \n",
- "0 FCFS a0 43.896996 1.040875e+08 103688143.0 6643962 \n",
- "0 FCFS a60 42.434508 9.247632e+07 92073379.0 3110062 \n",
- "0 speed*2 rigid 39.783432 6.358560e+07 63183029.0 0 \n",
- "0 speed*2 a0 41.736393 6.349783e+07 63096304.0 -953573 \n",
- "0 speed*2 a60 40.446312 6.345591e+07 63054385.0 -997848 \n",
- "0 speed/2 rigid 63.596114 1.074805e+08 63183029.0 0 \n",
- "0 speed/2 a0 44.654584 1.305401e+08 130140675.0 9208363 \n",
- "0 speed/2 a60 43.141661 1.293662e+08 128966781.0 8237262 \n",
- "0 infra*2 rigid 42.416218 6.358890e+07 63183029.0 0 \n",
- "0 infra*2 a0 45.752814 6.345457e+07 63050776.0 -741588 \n",
- "0 infra*2 a60 44.371137 6.347290e+07 63069112.0 -797169 \n",
- "0 infra/2 rigid 58.879591 1.013091e+08 63183029.0 0 \n",
- "0 infra/2 a0 43.569445 1.258791e+08 125479751.0 7760441 \n",
- "0 infra/2 a60 40.369022 1.253446e+08 124945259.0 7041304 \n",
+ "0 EASY rigid 41.517854 6.318963e+07 63183029.0 0 \n",
+ "0 EASY a0 43.573649 6.988713e+07 69887097.0 202892 \n",
+ "0 EASY a60 42.893777 6.823624e+07 68236214.0 89817 \n",
+ "0 FCFS rigid 43.499704 6.862399e+07 63183029.0 0 \n",
+ "0 FCFS a0 43.896996 1.036882e+08 103688143.0 6643962 \n",
+ "0 FCFS a60 42.434508 9.207346e+07 92073379.0 3110062 \n",
+ "0 speed*2 rigid 39.783432 6.318633e+07 63183029.0 0 \n",
+ "0 speed*2 a0 41.736393 6.309857e+07 63096304.0 -953573 \n",
+ "0 speed*2 a60 40.446312 6.305665e+07 63054385.0 -997848 \n",
+ "0 speed/2 rigid 63.596114 1.070812e+08 63183029.0 0 \n",
+ "0 speed/2 a0 44.654584 1.301408e+08 130140675.0 9208363 \n",
+ "0 speed/2 a60 43.141661 1.289669e+08 128966781.0 8237262 \n",
+ "0 infra*2 rigid 42.416218 6.318963e+07 63183029.0 0 \n",
+ "0 infra*2 a0 45.752814 6.305530e+07 63050776.0 -741588 \n",
+ "0 infra*2 a60 44.371137 6.307364e+07 63069112.0 -797169 \n",
+ "0 infra/2 rigid 58.879591 1.009099e+08 63183029.0 0 \n",
+ "0 infra/2 a0 43.569445 1.254798e+08 125479751.0 7760441 \n",
+ "0 infra/2 a60 40.369022 1.249453e+08 124945259.0 7041304 \n",
"\n",
" stretch delta nb_jobs nb_jobs_success mean_waiting_time \\\n",
"0 NaN NaN 73496 56490 2.221448e+04 \n",
@@ -25842,7 +25842,7 @@
" <td>EASY</td>\n",
" <td>rigid</td>\n",
" <td>0 days 00:00:41</td>\n",
- " <td>735 days 23:34:58</td>\n",
+ " <td>731 days 08:40:34</td>\n",
" <td>731 days 06:50:29</td>\n",
" <td>0 days 00:00:00</td>\n",
" <td>1.000000</td>\n",
@@ -25862,7 +25862,7 @@
" <td>EASY</td>\n",
" <td>a0</td>\n",
" <td>0 days 00:00:43</td>\n",
- " <td>813 days 11:59:51</td>\n",
+ " <td>808 days 21:05:27</td>\n",
" <td>808 days 21:04:57</td>\n",
" <td>2 days 08:21:32</td>\n",
" <td>1.003211</td>\n",
@@ -25882,7 +25882,7 @@
" <td>EASY</td>\n",
" <td>a60</td>\n",
" <td>0 days 00:00:42</td>\n",
- " <td>794 days 09:25:08</td>\n",
+ " <td>789 days 18:30:44</td>\n",
" <td>789 days 18:30:14</td>\n",
" <td>1 days 00:56:57</td>\n",
" <td>1.001422</td>\n",
@@ -25902,7 +25902,7 @@
" <td>FCFS</td>\n",
" <td>rigid</td>\n",
" <td>0 days 00:00:43</td>\n",
- " <td>798 days 21:07:36</td>\n",
+ " <td>794 days 06:13:12</td>\n",
" <td>731 days 06:50:29</td>\n",
" <td>0 days 00:00:00</td>\n",
" <td>1.000000</td>\n",
@@ -25922,7 +25922,7 @@
" <td>FCFS</td>\n",
" <td>a0</td>\n",
" <td>0 days 00:00:43</td>\n",
- " <td>1204 days 17:11:24</td>\n",
+ " <td>1200 days 02:17:00</td>\n",
" <td>1200 days 02:15:43</td>\n",
" <td>76 days 21:32:42</td>\n",
" <td>1.105154</td>\n",
@@ -25942,7 +25942,7 @@
" <td>FCFS</td>\n",
" <td>a60</td>\n",
" <td>0 days 00:00:42</td>\n",
- " <td>1070 days 07:52:00</td>\n",
+ " <td>1065 days 15:57:36</td>\n",
" <td>1065 days 15:56:19</td>\n",
" <td>35 days 23:54:22</td>\n",
" <td>1.049223</td>\n",
@@ -25962,7 +25962,7 @@
" <td>speed*2</td>\n",
" <td>rigid</td>\n",
" <td>0 days 00:00:39</td>\n",
- " <td>735 days 22:39:55</td>\n",
+ " <td>731 days 07:45:31</td>\n",
" <td>731 days 06:50:29</td>\n",
" <td>0 days 00:00:00</td>\n",
" <td>1.000000</td>\n",
@@ -25982,7 +25982,7 @@
" <td>speed*2</td>\n",
" <td>a0</td>\n",
" <td>0 days 00:00:41</td>\n",
- " <td>734 days 22:17:11</td>\n",
+ " <td>730 days 07:22:47</td>\n",
" <td>730 days 06:45:04</td>\n",
" <td>-12 days +23:07:07</td>\n",
" <td>0.984908</td>\n",
@@ -26002,7 +26002,7 @@
" <td>speed*2</td>\n",
" <td>a60</td>\n",
" <td>0 days 00:00:40</td>\n",
- " <td>734 days 10:38:32</td>\n",
+ " <td>729 days 19:44:08</td>\n",
" <td>729 days 19:06:25</td>\n",
" <td>-12 days +10:49:12</td>\n",
" <td>0.984207</td>\n",
@@ -26022,7 +26022,7 @@
" <td>speed/2</td>\n",
" <td>rigid</td>\n",
" <td>0 days 00:01:03</td>\n",
- " <td>1243 days 23:40:51</td>\n",
+ " <td>1239 days 08:46:27</td>\n",
" <td>731 days 06:50:29</td>\n",
" <td>0 days 00:00:00</td>\n",
" <td>1.000000</td>\n",
@@ -26042,7 +26042,7 @@
" <td>speed/2</td>\n",
" <td>a0</td>\n",
" <td>0 days 00:00:44</td>\n",
- " <td>1510 days 21:08:13</td>\n",
+ " <td>1506 days 06:13:49</td>\n",
" <td>1506 days 06:11:15</td>\n",
" <td>106 days 13:52:43</td>\n",
" <td>1.145741</td>\n",
@@ -26062,7 +26062,7 @@
" <td>speed/2</td>\n",
" <td>a60</td>\n",
" <td>0 days 00:00:43</td>\n",
- " <td>1497 days 07:03:19</td>\n",
+ " <td>1492 days 16:08:55</td>\n",
" <td>1492 days 16:06:21</td>\n",
" <td>95 days 08:07:42</td>\n",
" <td>1.130371</td>\n",
@@ -26082,7 +26082,7 @@
" <td>infra*2</td>\n",
" <td>rigid</td>\n",
" <td>0 days 00:00:42</td>\n",
- " <td>735 days 23:34:58</td>\n",
+ " <td>731 days 08:40:34</td>\n",
" <td>731 days 06:50:29</td>\n",
" <td>0 days 00:00:00</td>\n",
" <td>1.000000</td>\n",
@@ -26102,7 +26102,7 @@
" <td>infra*2</td>\n",
" <td>a0</td>\n",
" <td>0 days 00:00:45</td>\n",
- " <td>734 days 10:16:07</td>\n",
+ " <td>729 days 19:21:43</td>\n",
" <td>729 days 18:06:16</td>\n",
" <td>-9 days +10:00:12</td>\n",
" <td>0.988263</td>\n",
@@ -26122,7 +26122,7 @@
" <td>infra*2</td>\n",
" <td>a60</td>\n",
" <td>0 days 00:00:44</td>\n",
- " <td>734 days 15:21:43</td>\n",
+ " <td>730 days 00:27:19</td>\n",
" <td>729 days 23:11:52</td>\n",
" <td>-10 days +18:33:51</td>\n",
" <td>0.987383</td>\n",
@@ -26142,7 +26142,7 @@
" <td>infra/2</td>\n",
" <td>rigid</td>\n",
" <td>0 days 00:00:58</td>\n",
- " <td>1172 days 13:25:29</td>\n",
+ " <td>1167 days 22:31:05</td>\n",
" <td>731 days 06:50:29</td>\n",
" <td>0 days 00:00:00</td>\n",
" <td>1.000000</td>\n",
@@ -26162,7 +26162,7 @@
" <td>infra/2</td>\n",
" <td>a0</td>\n",
" <td>0 days 00:00:43</td>\n",
- " <td>1456 days 22:24:52</td>\n",
+ " <td>1452 days 07:30:28</td>\n",
" <td>1452 days 07:29:11</td>\n",
" <td>89 days 19:40:41</td>\n",
" <td>1.122825</td>\n",
@@ -26182,7 +26182,7 @@
" <td>infra/2</td>\n",
" <td>a60</td>\n",
" <td>0 days 00:00:40</td>\n",
- " <td>1450 days 17:56:40</td>\n",
+ " <td>1446 days 03:02:16</td>\n",
" <td>1446 days 03:00:59</td>\n",
" <td>81 days 11:55:04</td>\n",
" <td>1.111443</td>\n",
@@ -26204,24 +26204,24 @@
"text/plain": [
" expe replay simulation_time makespan length \\\n",
"0 original_log NaN 0 days 00:00:00 736 days 02:57:28 735 days 21:44:53 \n",
- "0 EASY rigid 0 days 00:00:41 735 days 23:34:58 731 days 06:50:29 \n",
- "0 EASY a0 0 days 00:00:43 813 days 11:59:51 808 days 21:04:57 \n",
- "0 EASY a60 0 days 00:00:42 794 days 09:25:08 789 days 18:30:14 \n",
- "0 FCFS rigid 0 days 00:00:43 798 days 21:07:36 731 days 06:50:29 \n",
- "0 FCFS a0 0 days 00:00:43 1204 days 17:11:24 1200 days 02:15:43 \n",
- "0 FCFS a60 0 days 00:00:42 1070 days 07:52:00 1065 days 15:56:19 \n",
- "0 speed*2 rigid 0 days 00:00:39 735 days 22:39:55 731 days 06:50:29 \n",
- "0 speed*2 a0 0 days 00:00:41 734 days 22:17:11 730 days 06:45:04 \n",
- "0 speed*2 a60 0 days 00:00:40 734 days 10:38:32 729 days 19:06:25 \n",
- "0 speed/2 rigid 0 days 00:01:03 1243 days 23:40:51 731 days 06:50:29 \n",
- "0 speed/2 a0 0 days 00:00:44 1510 days 21:08:13 1506 days 06:11:15 \n",
- "0 speed/2 a60 0 days 00:00:43 1497 days 07:03:19 1492 days 16:06:21 \n",
- "0 infra*2 rigid 0 days 00:00:42 735 days 23:34:58 731 days 06:50:29 \n",
- "0 infra*2 a0 0 days 00:00:45 734 days 10:16:07 729 days 18:06:16 \n",
- "0 infra*2 a60 0 days 00:00:44 734 days 15:21:43 729 days 23:11:52 \n",
- "0 infra/2 rigid 0 days 00:00:58 1172 days 13:25:29 731 days 06:50:29 \n",
- "0 infra/2 a0 0 days 00:00:43 1456 days 22:24:52 1452 days 07:29:11 \n",
- "0 infra/2 a60 0 days 00:00:40 1450 days 17:56:40 1446 days 03:00:59 \n",
+ "0 EASY rigid 0 days 00:00:41 731 days 08:40:34 731 days 06:50:29 \n",
+ "0 EASY a0 0 days 00:00:43 808 days 21:05:27 808 days 21:04:57 \n",
+ "0 EASY a60 0 days 00:00:42 789 days 18:30:44 789 days 18:30:14 \n",
+ "0 FCFS rigid 0 days 00:00:43 794 days 06:13:12 731 days 06:50:29 \n",
+ "0 FCFS a0 0 days 00:00:43 1200 days 02:17:00 1200 days 02:15:43 \n",
+ "0 FCFS a60 0 days 00:00:42 1065 days 15:57:36 1065 days 15:56:19 \n",
+ "0 speed*2 rigid 0 days 00:00:39 731 days 07:45:31 731 days 06:50:29 \n",
+ "0 speed*2 a0 0 days 00:00:41 730 days 07:22:47 730 days 06:45:04 \n",
+ "0 speed*2 a60 0 days 00:00:40 729 days 19:44:08 729 days 19:06:25 \n",
+ "0 speed/2 rigid 0 days 00:01:03 1239 days 08:46:27 731 days 06:50:29 \n",
+ "0 speed/2 a0 0 days 00:00:44 1506 days 06:13:49 1506 days 06:11:15 \n",
+ "0 speed/2 a60 0 days 00:00:43 1492 days 16:08:55 1492 days 16:06:21 \n",
+ "0 infra*2 rigid 0 days 00:00:42 731 days 08:40:34 731 days 06:50:29 \n",
+ "0 infra*2 a0 0 days 00:00:45 729 days 19:21:43 729 days 18:06:16 \n",
+ "0 infra*2 a60 0 days 00:00:44 730 days 00:27:19 729 days 23:11:52 \n",
+ "0 infra/2 rigid 0 days 00:00:58 1167 days 22:31:05 731 days 06:50:29 \n",
+ "0 infra/2 a0 0 days 00:00:43 1452 days 07:30:28 1452 days 07:29:11 \n",
+ "0 infra/2 a60 0 days 00:00:40 1446 days 03:02:16 1446 days 03:00:59 \n",
"\n",
" lateness stretch delta nb_jobs nb_jobs_success \\\n",
"0 0 days 00:00:00 NaN NaN 73496 56490 \n",
@@ -26345,6 +26345,7 @@
" expe_metrics['lateness'] = int(mean_lateness(jobs, ref=WL_rigid))\n",
" expe_metrics['stretch'] = stretch(jobs, ref=WL_rigid)\n",
" expe_metrics['delta'] = delta(jobs, ref=WL_rigid)\n",
+ " expe_metrics['makespan'] = (jobs.finish_time.max() - jobs.submission_time.min()).total_seconds() # redefine makespan with our def\n",
" dfs.append( expe_metrics )\n",
"\n",
"all = pd.concat(dfs)[[\"expe\", \"replay\", \"simulation_time\",\"makespan\",\"length\",\"lateness\",\"stretch\",\"delta\",\"nb_jobs\",\"nb_jobs_success\",\n",
@@ -26373,7 +26374,7 @@
},
{
"cell_type": "code",
- "execution_count": 67,
+ "execution_count": 4,
"metadata": {},
"outputs": [
{
@@ -26385,24 +26386,24 @@
" expe & replay & makespan & mean\\_waiting\\_time & max\\_waiting\\_time & lateness & stretch & delta \\\\\n",
"\\midrule\n",
"original\\_log & NaN & 736.12 & 0.26 & 62.48 & 0.00 & NaN & NaN \\\\\n",
- " EASY & rigid & 735.98 & 0.19 & 5.73 & 0.00 & 1.00 & 0.00 \\\\\n",
- " EASY & a0 & 813.50 & 0.14 & 5.90 & 2.35 & 1.00 & 6.00 \\\\\n",
- " EASY & a60 & 794.39 & 0.18 & 5.16 & 1.04 & 1.00 & 2.65 \\\\\n",
- " FCFS & rigid & 798.88 & 14.82 & 63.96 & 0.00 & 1.00 & 0.00 \\\\\n",
- " FCFS & a0 & 1204.72 & 0.58 & 6.26 & 76.90 & 1.11 & 196.38 \\\\\n",
- " FCFS & a60 & 1070.33 & 0.88 & 5.51 & 36.00 & 1.05 & 91.92 \\\\\n",
- " speed*2 & rigid & 735.94 & 0.01 & 1.84 & 0.00 & 1.00 & 0.00 \\\\\n",
- " speed*2 & a0 & 734.93 & 0.01 & 1.58 & -11.04 & 0.98 & -28.18 \\\\\n",
- " speed*2 & a60 & 734.44 & 0.02 & 1.13 & -11.55 & 0.98 & -29.49 \\\\\n",
- " speed/2 & rigid & 1243.99 & 64.62 & 508.38 & 0.00 & 1.00 & 0.00 \\\\\n",
- " speed/2 & a0 & 1510.88 & 0.92 & 15.54 & 106.58 & 1.15 & 272.17 \\\\\n",
- " speed/2 & a60 & 1497.29 & 1.61 & 14.17 & 95.34 & 1.13 & 243.47 \\\\\n",
- " infra*2 & rigid & 735.98 & 0.01 & 1.28 & 0.00 & 1.00 & 0.00 \\\\\n",
- " infra*2 & a0 & 734.43 & 0.01 & 1.04 & -8.58 & 0.99 & -21.92 \\\\\n",
- " infra*2 & a60 & 734.64 & 0.01 & 1.35 & -9.23 & 0.99 & -23.56 \\\\\n",
- " infra/2 & rigid & 1172.56 & 37.43 & 437.28 & 0.00 & 1.00 & 0.00 \\\\\n",
- " infra/2 & a0 & 1456.93 & 0.80 & 14.82 & 89.82 & 1.12 & 229.37 \\\\\n",
- " infra/2 & a60 & 1450.75 & 1.20 & 15.93 & 81.50 & 1.11 & 208.12 \\\\\n",
+ " EASY & rigid & 731.36 & 0.19 & 5.73 & 0.00 & 1.00 & 0.00 \\\\\n",
+ " EASY & a0 & 808.88 & 0.14 & 5.90 & 2.35 & 1.00 & 6.00 \\\\\n",
+ " EASY & a60 & 789.77 & 0.18 & 5.16 & 1.04 & 1.00 & 2.65 \\\\\n",
+ " FCFS & rigid & 794.26 & 14.82 & 63.96 & 0.00 & 1.00 & 0.00 \\\\\n",
+ " FCFS & a0 & 1200.10 & 0.58 & 6.26 & 76.90 & 1.11 & 196.38 \\\\\n",
+ " FCFS & a60 & 1065.66 & 0.88 & 5.51 & 36.00 & 1.05 & 91.92 \\\\\n",
+ " speed*2 & rigid & 731.32 & 0.01 & 1.84 & 0.00 & 1.00 & 0.00 \\\\\n",
+ " speed*2 & a0 & 730.31 & 0.01 & 1.58 & -11.04 & 0.98 & -28.18 \\\\\n",
+ " speed*2 & a60 & 729.82 & 0.02 & 1.13 & -11.55 & 0.98 & -29.49 \\\\\n",
+ " speed/2 & rigid & 1239.37 & 64.62 & 508.38 & 0.00 & 1.00 & 0.00 \\\\\n",
+ " speed/2 & a0 & 1506.26 & 0.92 & 15.54 & 106.58 & 1.15 & 272.17 \\\\\n",
+ " speed/2 & a60 & 1492.67 & 1.61 & 14.17 & 95.34 & 1.13 & 243.47 \\\\\n",
+ " infra*2 & rigid & 731.36 & 0.01 & 1.28 & 0.00 & 1.00 & 0.00 \\\\\n",
+ " infra*2 & a0 & 729.81 & 0.01 & 1.04 & -8.58 & 0.99 & -21.92 \\\\\n",
+ " infra*2 & a60 & 730.02 & 0.01 & 1.35 & -9.23 & 0.99 & -23.56 \\\\\n",
+ " infra/2 & rigid & 1167.94 & 37.43 & 437.28 & 0.00 & 1.00 & 0.00 \\\\\n",
+ " infra/2 & a0 & 1452.31 & 0.80 & 14.82 & 89.82 & 1.12 & 229.37 \\\\\n",
+ " infra/2 & a60 & 1446.13 & 1.20 & 15.93 & 81.50 & 1.11 & 208.12 \\\\\n",
"\\bottomrule\n",
"\\end{tabular}\n",
"\n"
@@ -26412,38 +26413,14 @@
"name": "stderr",
"output_type": "stream",
"text": [
- "/run/user/1000/ipykernel_59452/4202454347.py:3: SettingWithCopyWarning: \n",
- "A value is trying to be set on a copy of a slice from a DataFrame.\n",
- "Try using .loc[row_indexer,col_indexer] = value instead\n",
- "\n",
- "See the caveats in the documentation: https://pandas.pydata.org/pandas-docs/stable/user_guide/indexing.html#returning-a-view-versus-a-copy\n",
- " to_latex[\"makespan\"] = to_latex.makespan / (3600*24)\n",
- "/run/user/1000/ipykernel_59452/4202454347.py:4: SettingWithCopyWarning: \n",
- "A value is trying to be set on a copy of a slice from a DataFrame.\n",
- "Try using .loc[row_indexer,col_indexer] = value instead\n",
- "\n",
- "See the caveats in the documentation: https://pandas.pydata.org/pandas-docs/stable/user_guide/indexing.html#returning-a-view-versus-a-copy\n",
- " to_latex[\"lateness\"] = to_latex.lateness / (3600*24)\n",
- "/run/user/1000/ipykernel_59452/4202454347.py:5: SettingWithCopyWarning: \n",
- "A value is trying to be set on a copy of a slice from a DataFrame.\n",
- "Try using .loc[row_indexer,col_indexer] = value instead\n",
- "\n",
- "See the caveats in the documentation: https://pandas.pydata.org/pandas-docs/stable/user_guide/indexing.html#returning-a-view-versus-a-copy\n",
- " to_latex[\"mean_waiting_time\"] = to_latex.mean_waiting_time / (3600*24)\n",
- "/run/user/1000/ipykernel_59452/4202454347.py:6: SettingWithCopyWarning: \n",
- "A value is trying to be set on a copy of a slice from a DataFrame.\n",
- "Try using .loc[row_indexer,col_indexer] = value instead\n",
- "\n",
- "See the caveats in the documentation: https://pandas.pydata.org/pandas-docs/stable/user_guide/indexing.html#returning-a-view-versus-a-copy\n",
- " to_latex[\"max_waiting_time\"] = to_latex.max_waiting_time / (3600*24)\n",
- "/run/user/1000/ipykernel_59452/4202454347.py:8: FutureWarning: In future versions `DataFrame.to_latex` is expected to utilise the base implementation of `Styler.to_latex` for formatting and rendering. The arguments signature may therefore change. It is recommended instead to use `DataFrame.style.to_latex` which also contains additional functionality.\n",
+ "/tmp/ipykernel_11464/4089764014.py:8: FutureWarning: In future versions `DataFrame.to_latex` is expected to utilise the base implementation of `Styler.to_latex` for formatting and rendering. The arguments signature may therefore change. It is recommended instead to use `DataFrame.style.to_latex` which also contains additional functionality.\n",
" print(to_latex.to_latex(index=False, escape=True,float_format=\"{:.2f}\".format))\n"
]
}
],
"source": [
"columns = [\"expe\", \"replay\", \"makespan\",\"mean_waiting_time\",\"max_waiting_time\",\"lateness\", \"stretch\",\"delta\"]\n",
- "to_latex = all[columns]\n",
+ "to_latex = all[columns].copy()\n",
"to_latex[\"makespan\"] = to_latex.makespan / (3600*24)\n",
"to_latex[\"lateness\"] = to_latex.lateness / (3600*24)\n",
"to_latex[\"mean_waiting_time\"] = to_latex.mean_waiting_time / (3600*24)\n",
--
GitLab