From c0d199d01c65a97b7d763a5457b1fd46c2096a66 Mon Sep 17 00:00:00 2001
From: Maxime MORGE <maxime.morge@univ-lille.fr>
Date: Tue, 27 Jun 2023 14:21:31 +0200
Subject: [PATCH] PSSI: try improve C^S_H
---
experiments/consumer/consumption.plot | 9 +-
...llocationsSlowDownHalfNode040-320tasks.svg | 128 +++++++++---------
.../consumer/ConsumptionCampaign.scala | 2 +-
.../consumer/ConsumptionExperiment.scala | 2 +-
4 files changed, 70 insertions(+), 71 deletions(-)
diff --git a/experiments/consumer/consumption.plot b/experiments/consumer/consumption.plot
index 974e0c05..02f8203f 100644
--- a/experiments/consumer/consumption.plot
+++ b/experiments/consumer/consumption.plot
@@ -49,8 +49,7 @@ plot "data/consumption4jobs8nodes5staps5allocationsFromStable040-320tasks.csv" u
# "data/consumption4jobs8nodes5staps5allocationsFromStable040-320tasks.csv" using 3:($56/1000/60):($58/1000/60) with filledcurves fc "#5862ed" fs transparent solid 0.3 border lc "#5862ed" notitle,\
# "data/consumption4jobs8nodes5staps5allocationsFromStable040-320tasks.csv" using 3:($57/1000/60) with lines dt 2 lc "#5862ed" title 'C^S_E(Ae) for PSI',\
-
-set yrange [0:7]
+#set yrange [0:7]
set output 'figures/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.svg'
plot "data/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.csv" using 3:($14/1000/60):($16/1000/60) with filledcurves fc "#89e0b1" fs transparent solid 0.3 border lc "#32a68c" notitle,\
"data/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.csv" using 3:($15/1000/60) with lines dt 1 lc "#32a68c" title 'C^R(Ae) for bargaining',\
@@ -61,11 +60,11 @@ plot "data/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.
"data/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.csv" using 3:($131/1000/60):($133/1000/60) with filledcurves fc "#ff6941" fs transparent solid 0.3 border lc "#fc535c" notitle,\
"data/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.csv" using 3:($132/1000/60) with lines dt 1 lc "#fc535c" title 'C^R(A0)',\
"data/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.csv" using 3:($17/1000/60):($19/1000/60) with filledcurves fc "#89e0b1" fs transparent solid 0.3 border lc "#32a68c" notitle,\
- "data/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.csv" using 3:($18/1000/60) with lines dt 2 lc "#32a68c" title 'C^S_E(Ae) for bargaining',\
+ "data/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.csv" using 3:($18/1000/60) with lines dt 2 lc "#32a68c" title 'C^S_H(Ae) for bargaining',\
"data/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.csv" using 3:($95/1000/60):($97/1000/60) with filledcurves fc "#2d0505" fs transparent solid 0.3 border lc "#000000" notitle,\
- "data/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.csv" using 3:($96/1000/60) with lines dt 2 lc "#000000" title 'C^S_E(Ae) for SSI'
+ "data/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.csv" using 3:($96/1000/60) with lines dt 2 lc "#000000" title 'C^S_H(Ae) for SSI'
# "data/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.csv" using 3:($56/1000/60):($58/1000/60) with filledcurves fc "#5862ed" fs transparent solid 0.3 border lc "#5862ed" notitle,\
-# "data/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.csv" using 3:($57/1000/60) with lines dt 2 lc "#5862ed" title 'C^S_E(Ae) for PSI',\
+# "data/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.csv" using 3:($57/1000/60) with lines dt 2 lc "#5862ed" title 'C^S_H(Ae) for PSI',\
#set yrange [0:1.5]
diff --git a/experiments/consumer/figures/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.svg b/experiments/consumer/figures/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.svg
index c16ee888..775c2f80 100644
--- a/experiments/consumer/figures/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.svg
+++ b/experiments/consumer/figures/consumption4jobs8nodes5staps5allocationsSlowDownHalfNode040-320tasks.svg
@@ -46,11 +46,11 @@
<g fill="none" color="black" stroke="black" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="gray" stroke="currentColor" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M55.75,422.40 L574.82,422.40 '/></g>
+ <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M72.53,422.40 L574.82,422.40 '/></g>
<g fill="none" color="gray" stroke="gray" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M55.75,422.40 L64.75,422.40 '/> <g transform="translate(47.36,426.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="end">
+ <path stroke='black' d='M72.53,422.40 L81.53,422.40 '/> <g transform="translate(64.14,426.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="end">
<text><tspan font-family="Arial" > 0</tspan></text>
</g>
</g>
@@ -59,12 +59,12 @@
<g fill="none" color="black" stroke="black" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="gray" stroke="currentColor" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M55.75,373.63 L574.82,373.63 '/></g>
+ <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M72.53,373.63 L574.82,373.63 '/></g>
<g fill="none" color="gray" stroke="gray" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M55.75,373.63 L64.75,373.63 '/> <g transform="translate(47.36,377.53)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="end">
- <text><tspan font-family="Arial" > 1</tspan></text>
+ <path stroke='black' d='M72.53,373.63 L81.53,373.63 '/> <g transform="translate(64.14,377.53)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="end">
+ <text><tspan font-family="Arial" > 0.5</tspan></text>
</g>
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
@@ -72,12 +72,12 @@
<g fill="none" color="black" stroke="black" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="gray" stroke="currentColor" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M55.75,324.86 L574.82,324.86 '/></g>
+ <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M72.53,324.86 L574.82,324.86 '/></g>
<g fill="none" color="gray" stroke="gray" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M55.75,324.86 L64.75,324.86 '/> <g transform="translate(47.36,328.76)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="end">
- <text><tspan font-family="Arial" > 2</tspan></text>
+ <path stroke='black' d='M72.53,324.86 L81.53,324.86 '/> <g transform="translate(64.14,328.76)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="end">
+ <text><tspan font-family="Arial" > 1</tspan></text>
</g>
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
@@ -85,12 +85,12 @@
<g fill="none" color="black" stroke="black" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="gray" stroke="currentColor" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M55.75,276.09 L574.82,276.09 '/></g>
+ <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M72.53,276.09 L574.82,276.09 '/></g>
<g fill="none" color="gray" stroke="gray" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M55.75,276.09 L64.75,276.09 '/> <g transform="translate(47.36,279.99)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="end">
- <text><tspan font-family="Arial" > 3</tspan></text>
+ <path stroke='black' d='M72.53,276.09 L81.53,276.09 '/> <g transform="translate(64.14,279.99)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="end">
+ <text><tspan font-family="Arial" > 1.5</tspan></text>
</g>
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
@@ -98,12 +98,12 @@
<g fill="none" color="black" stroke="black" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="gray" stroke="currentColor" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M55.75,227.32 L574.82,227.32 '/></g>
+ <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M72.53,227.32 L574.82,227.32 '/></g>
<g fill="none" color="gray" stroke="gray" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M55.75,227.32 L64.75,227.32 '/> <g transform="translate(47.36,231.22)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="end">
- <text><tspan font-family="Arial" > 4</tspan></text>
+ <path stroke='black' d='M72.53,227.32 L81.53,227.32 '/> <g transform="translate(64.14,231.22)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="end">
+ <text><tspan font-family="Arial" > 2</tspan></text>
</g>
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
@@ -111,12 +111,12 @@
<g fill="none" color="black" stroke="black" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="gray" stroke="currentColor" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M55.75,178.55 L574.82,178.55 '/></g>
+ <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M72.53,178.55 L574.82,178.55 '/></g>
<g fill="none" color="gray" stroke="gray" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M55.75,178.55 L64.75,178.55 '/> <g transform="translate(47.36,182.45)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="end">
- <text><tspan font-family="Arial" > 5</tspan></text>
+ <path stroke='black' d='M72.53,178.55 L81.53,178.55 '/> <g transform="translate(64.14,182.45)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="end">
+ <text><tspan font-family="Arial" > 2.5</tspan></text>
</g>
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
@@ -124,12 +124,12 @@
<g fill="none" color="black" stroke="black" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="gray" stroke="currentColor" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M55.75,129.78 L574.82,129.78 '/></g>
+ <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M72.53,129.78 L574.82,129.78 '/></g>
<g fill="none" color="gray" stroke="gray" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M55.75,129.78 L64.75,129.78 '/> <g transform="translate(47.36,133.68)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="end">
- <text><tspan font-family="Arial" > 6</tspan></text>
+ <path stroke='black' d='M72.53,129.78 L81.53,129.78 '/> <g transform="translate(64.14,133.68)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="end">
+ <text><tspan font-family="Arial" > 3</tspan></text>
</g>
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
@@ -137,12 +137,12 @@
<g fill="none" color="black" stroke="black" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="gray" stroke="currentColor" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M55.75,81.01 L574.82,81.01 '/></g>
+ <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M72.53,81.01 L574.82,81.01 '/></g>
<g fill="none" color="gray" stroke="gray" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M55.75,81.01 L64.75,81.01 '/> <g transform="translate(47.36,84.91)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="end">
- <text><tspan font-family="Arial" > 7</tspan></text>
+ <path stroke='black' d='M72.53,81.01 L81.53,81.01 '/> <g transform="translate(64.14,84.91)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="end">
+ <text><tspan font-family="Arial" > 3.5</tspan></text>
</g>
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
@@ -150,11 +150,11 @@
<g fill="none" color="black" stroke="black" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="gray" stroke="currentColor" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M55.75,422.40 L55.75,81.01 '/></g>
+ <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M72.53,422.40 L72.53,81.01 '/></g>
<g fill="none" color="gray" stroke="gray" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M55.75,422.40 L55.75,413.40 M55.75,81.01 L55.75,90.01 '/> <g transform="translate(55.75,444.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="middle">
+ <path stroke='black' d='M72.53,422.40 L72.53,413.40 M72.53,81.01 L72.53,90.01 '/> <g transform="translate(72.53,444.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="middle">
<text><tspan font-family="Arial" > 0</tspan></text>
</g>
</g>
@@ -163,11 +163,11 @@
<g fill="none" color="black" stroke="black" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="gray" stroke="currentColor" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M127.84,422.40 L127.84,81.01 '/></g>
+ <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M142.29,422.40 L142.29,81.01 '/></g>
<g fill="none" color="gray" stroke="gray" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M127.84,422.40 L127.84,413.40 M127.84,81.01 L127.84,90.01 '/> <g transform="translate(127.84,444.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="middle">
+ <path stroke='black' d='M142.29,422.40 L142.29,413.40 M142.29,81.01 L142.29,90.01 '/> <g transform="translate(142.29,444.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="middle">
<text><tspan font-family="Arial" > 50</tspan></text>
</g>
</g>
@@ -176,11 +176,11 @@
<g fill="none" color="black" stroke="black" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="gray" stroke="currentColor" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M199.94,422.40 L199.94,81.01 '/></g>
+ <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M212.06,422.40 L212.06,81.01 '/></g>
<g fill="none" color="gray" stroke="gray" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M199.94,422.40 L199.94,413.40 M199.94,81.01 L199.94,90.01 '/> <g transform="translate(199.94,444.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="middle">
+ <path stroke='black' d='M212.06,422.40 L212.06,413.40 M212.06,81.01 L212.06,90.01 '/> <g transform="translate(212.06,444.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="middle">
<text><tspan font-family="Arial" > 100</tspan></text>
</g>
</g>
@@ -189,11 +189,11 @@
<g fill="none" color="black" stroke="black" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="gray" stroke="currentColor" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M272.03,422.40 L272.03,81.01 '/></g>
+ <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M281.82,422.40 L281.82,81.01 '/></g>
<g fill="none" color="gray" stroke="gray" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M272.03,422.40 L272.03,413.40 M272.03,81.01 L272.03,90.01 '/> <g transform="translate(272.03,444.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="middle">
+ <path stroke='black' d='M281.82,422.40 L281.82,413.40 M281.82,81.01 L281.82,90.01 '/> <g transform="translate(281.82,444.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="middle">
<text><tspan font-family="Arial" > 150</tspan></text>
</g>
</g>
@@ -202,11 +202,11 @@
<g fill="none" color="black" stroke="black" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="gray" stroke="currentColor" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M344.12,422.40 L344.12,81.01 '/></g>
+ <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M351.58,422.40 L351.58,81.01 '/></g>
<g fill="none" color="gray" stroke="gray" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M344.12,422.40 L344.12,413.40 M344.12,81.01 L344.12,90.01 '/> <g transform="translate(344.12,444.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="middle">
+ <path stroke='black' d='M351.58,422.40 L351.58,413.40 M351.58,81.01 L351.58,90.01 '/> <g transform="translate(351.58,444.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="middle">
<text><tspan font-family="Arial" > 200</tspan></text>
</g>
</g>
@@ -215,11 +215,11 @@
<g fill="none" color="black" stroke="black" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="gray" stroke="currentColor" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M416.22,422.40 L416.22,81.01 '/></g>
+ <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M421.34,422.40 L421.34,81.01 '/></g>
<g fill="none" color="gray" stroke="gray" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M416.22,422.40 L416.22,413.40 M416.22,81.01 L416.22,90.01 '/> <g transform="translate(416.22,444.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="middle">
+ <path stroke='black' d='M421.34,422.40 L421.34,413.40 M421.34,81.01 L421.34,90.01 '/> <g transform="translate(421.34,444.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="middle">
<text><tspan font-family="Arial" > 250</tspan></text>
</g>
</g>
@@ -228,11 +228,11 @@
<g fill="none" color="black" stroke="black" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="gray" stroke="currentColor" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M488.31,422.40 L488.31,81.01 '/></g>
+ <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M491.11,422.40 L491.11,81.01 '/></g>
<g fill="none" color="gray" stroke="gray" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M488.31,422.40 L488.31,413.40 M488.31,81.01 L488.31,90.01 '/> <g transform="translate(488.31,444.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="middle">
+ <path stroke='black' d='M491.11,422.40 L491.11,413.40 M491.11,81.01 L491.11,90.01 '/> <g transform="translate(491.11,444.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="middle">
<text><tspan font-family="Arial" > 300</tspan></text>
</g>
</g>
@@ -241,25 +241,25 @@
<g fill="none" color="black" stroke="black" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="gray" stroke="currentColor" stroke-width="0.50" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M560.40,422.40 L560.40,81.01 '/></g>
+ <path stroke='gray' stroke-dasharray='2,4' class="gridline" d='M560.87,422.40 L560.87,81.01 '/></g>
<g fill="none" color="gray" stroke="gray" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M560.40,422.40 L560.40,413.40 M560.40,81.01 L560.40,90.01 '/> <g transform="translate(560.40,444.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="middle">
+ <path stroke='black' d='M560.87,422.40 L560.87,413.40 M560.87,81.01 L560.87,90.01 '/> <g transform="translate(560.87,444.30)" stroke="none" fill="black" font-family="Arial" font-size="12.00" text-anchor="middle">
<text><tspan font-family="Arial" > 350</tspan></text>
</g>
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M55.75,81.01 L55.75,422.40 L574.82,422.40 L574.82,81.01 L55.75,81.01 Z '/></g>
+ <path stroke='black' d='M72.53,81.01 L72.53,422.40 L574.82,422.40 L574.82,81.01 L72.53,81.01 Z '/></g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
<g transform="translate(20.48,251.71) rotate(270)" stroke="none" fill="black" font-family="Arial" font-size="16.00" text-anchor="middle">
<text><tspan font-family="Arial" >Flowtime (mins)</tspan></text>
</g>
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <g transform="translate(315.28,472.60)" stroke="none" fill="black" font-family="Arial" font-size="16.00" text-anchor="middle">
+ <g transform="translate(323.67,472.60)" stroke="none" fill="black" font-family="Arial" font-size="16.00" text-anchor="middle">
<text><tspan font-family="Arial" >Number of tasks</tspan></text>
</g>
</g>
@@ -268,102 +268,102 @@
<g id="gnuplot_plot_1" fill="none"><title>gnuplot_plot_1</title>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
<g stroke='none' shape-rendering='crispEdges'>
- <polygon fill = 'rgb(137, 224, 177)' fill-opacity = '0.300000' points = '113.42,395.26 171.10,367.26 228.77,342.60 286.45,312.57 344.12,287.51 401.80,253.27 401.80,236.72 344.12,275.87 286.45,297.22 228.77,333.49 171.10,363.96 113.42,390.48 '/>
+ <polygon fill = 'rgb(137, 224, 177)' fill-opacity = '0.300000' points = '128.34,368.11 184.15,312.13 239.96,262.80 295.77,202.73 351.58,152.62 407.39,84.14 407.39,81.01 386.03,81.01 351.58,129.33 295.77,172.05 239.96,244.58 184.15,305.52 128.34,358.57 '/>
</g>
</g>
</g>
<g id="gnuplot_plot_2" ><title>CR(Ae) for bargaining</title>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <g transform="translate(247.54,24.05)" stroke="none" fill="black" font-family="Arial" font-size="14.00" text-anchor="end">
+ <g transform="translate(255.93,24.05)" stroke="none" fill="black" font-family="Arial" font-size="14.00" text-anchor="end">
<text><tspan font-family="Arial" >C</tspan><tspan font-family="Arial" font-size="11.2" dy="-7.00px">R</tspan><tspan font-family="Arial" font-size="14.0" dy="7.00px">(Ae) for bargaining</tspan></text>
</g>
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='rgb( 50, 166, 140)' d='M257.33,19.50 L305.49,19.50 M113.42,392.76 L171.10,365.40 L228.77,337.85 L286.45,303.61 L344.12,281.27 L401.80,242.70
+ <path stroke='rgb( 50, 166, 140)' d='M265.72,19.50 L313.88,19.50 M128.34,363.12 L184.15,308.41 L239.96,253.30 L295.77,184.82 L351.58,140.14 L394.35,81.01
'/></g>
</g>
<g id="gnuplot_plot_3" fill="none"><title>gnuplot_plot_3</title>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
<g stroke='none' shape-rendering='crispEdges'>
- <polygon fill = 'rgb( 88, 98, 237)' fill-opacity = '0.300000' points = '113.42,397.52 171.10,372.25 228.77,346.13 286.45,311.76 344.12,273.59 401.80,231.32 401.80,201.45 344.12,261.56 286.45,296.00 228.77,336.81 171.10,369.97 113.42,394.83 '/>
+ <polygon fill = 'rgb( 88, 98, 237)' fill-opacity = '0.300000' points = '128.34,372.65 184.15,322.09 239.96,269.86 295.77,201.12 351.58,124.78 380.47,81.01 360.74,81.01 351.58,100.72 295.77,169.60 239.96,251.21 184.15,317.54 128.34,367.27 '/>
</g>
</g>
</g>
<g id="gnuplot_plot_4" ><title>CR(Ae) for PSI</title>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <g transform="translate(247.54,45.05)" stroke="none" fill="black" font-family="Arial" font-size="14.00" text-anchor="end">
+ <g transform="translate(255.93,45.05)" stroke="none" fill="black" font-family="Arial" font-size="14.00" text-anchor="end">
<text><tspan font-family="Arial" >C</tspan><tspan font-family="Arial" font-size="11.2" dy="-7.00px">R</tspan><tspan font-family="Arial" font-size="14.0" dy="7.00px">(Ae) for PSI</tspan></text>
</g>
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='rgb( 88, 98, 237)' d='M257.33,40.50 L305.49,40.50 M113.42,396.29 L171.10,371.00 L228.77,342.61 L286.45,304.51 L344.12,269.43 L401.80,222.18
+ <path stroke='rgb( 88, 98, 237)' d='M265.72,40.50 L313.88,40.50 M128.34,370.18 L184.15,319.60 L239.96,262.82 L295.77,186.61 L351.58,116.47 L372.51,81.01
'/></g>
</g>
<g id="gnuplot_plot_5" fill="none"><title>gnuplot_plot_5</title>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
<g stroke='none' shape-rendering='crispEdges'>
- <polygon fill = 'rgb( 45, 5, 5)' fill-opacity = '0.300000' points = '113.42,398.76 171.10,360.29 228.77,309.54 286.45,218.22 339.58,81.01 335.57,81.01 286.45,214.65 228.77,299.41 171.10,355.17 113.42,396.13 '/>
+ <polygon fill = 'rgb( 45, 5, 5)' fill-opacity = '0.300000' points = '128.34,375.11 184.15,298.18 239.96,196.68 275.30,81.01 271.38,81.01 239.96,176.43 184.15,287.95 128.34,369.85 '/>
</g>
</g>
</g>
<g id="gnuplot_plot_6" ><title>CR(Ae) for SSI</title>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <g transform="translate(247.54,66.05)" stroke="none" fill="black" font-family="Arial" font-size="14.00" text-anchor="end">
+ <g transform="translate(255.93,66.05)" stroke="none" fill="black" font-family="Arial" font-size="14.00" text-anchor="end">
<text><tspan font-family="Arial" >C</tspan><tspan font-family="Arial" font-size="11.2" dy="-7.00px">R</tspan><tspan font-family="Arial" font-size="14.0" dy="7.00px">(Ae) for SSI</tspan></text>
</g>
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='rgb( 0, 0, 0)' d='M257.33,61.50 L305.49,61.50 M113.42,397.35 L171.10,359.50 L228.77,306.73 L286.45,216.48 L337.56,81.01 '/></g>
+ <path stroke='rgb( 0, 0, 0)' d='M265.72,61.50 L313.88,61.50 M128.34,372.30 L184.15,296.59 L239.96,191.06 L273.98,81.01 '/></g>
</g>
<g id="gnuplot_plot_7" fill="none"><title>gnuplot_plot_7</title>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
<g stroke='none' shape-rendering='crispEdges'>
- <polygon fill = 'rgb(255, 105, 65)' fill-opacity = '0.300000' points = '113.42,387.58 171.10,357.11 228.77,323.74 286.45,291.01 344.12,257.22 401.80,221.13 401.80,195.86 344.12,248.51 286.45,275.67 228.77,308.40 171.10,347.79 113.42,380.95 '/>
+ <polygon fill = 'rgb(255, 105, 65)' fill-opacity = '0.300000' points = '128.34,352.76 184.15,291.82 239.96,225.08 295.77,159.62 351.58,92.04 360.10,81.01 345.01,81.01 295.77,128.94 239.96,194.40 184.15,273.17 128.34,339.50 '/>
</g>
</g>
</g>
<g id="gnuplot_plot_8" ><title>CR(A0)</title>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <g transform="translate(452.34,24.05)" stroke="none" fill="black" font-family="Arial" font-size="14.00" text-anchor="end">
+ <g transform="translate(460.73,24.05)" stroke="none" fill="black" font-family="Arial" font-size="14.00" text-anchor="end">
<text><tspan font-family="Arial" >C</tspan><tspan font-family="Arial" font-size="11.2" dy="-7.00px">R</tspan><tspan font-family="Arial" font-size="14.0" dy="7.00px">(A0)</tspan></text>
</g>
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='rgb(252, 83, 92)' d='M462.13,19.50 L510.29,19.50 M113.42,382.61 L171.10,351.34 L228.77,315.24 L286.45,287.08 L344.12,253.32 L401.80,203.13
+ <path stroke='rgb(252, 83, 92)' d='M470.52,19.50 L518.68,19.50 M128.34,342.83 L184.15,280.27 L239.96,208.08 L295.77,151.77 L351.58,84.24 L353.37,81.01
'/></g>
</g>
<g id="gnuplot_plot_9" fill="none"><title>gnuplot_plot_9</title>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
<g stroke='none' shape-rendering='crispEdges'>
- <polygon fill = 'rgb(137, 224, 177)' fill-opacity = '0.300000' points = '113.42,406.12 171.10,391.44 228.77,375.54 286.45,360.46 344.12,346.01 401.80,330.26 401.80,320.79 344.12,338.73 286.45,354.72 228.77,370.98 171.10,388.66 113.42,403.90 '/>
+ <polygon fill = 'rgb(137, 224, 177)' fill-opacity = '0.300000' points = '128.34,389.85 184.15,360.48 239.96,328.68 295.77,298.52 351.58,269.61 407.39,238.12 407.39,219.19 351.58,255.06 295.77,287.04 239.96,319.57 184.15,354.92 128.34,385.39 '/>
</g>
</g>
</g>
- <g id="gnuplot_plot_10" ><title>CSE(Ae) for bargaining</title>
+ <g id="gnuplot_plot_10" ><title>CSH(Ae) for bargaining</title>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <g transform="translate(452.34,45.05)" stroke="none" fill="black" font-family="Arial" font-size="14.00" text-anchor="end">
- <text><tspan font-family="Arial" >C</tspan><tspan font-family="Arial" font-size="11.2" dy="-7.00px">S</tspan><tspan font-family="Arial" dy="11.20px">E</tspan><tspan font-family="Arial" font-size="14.0" dy="-4.20px">(Ae) for bargaining</tspan></text>
+ <g transform="translate(460.73,45.05)" stroke="none" fill="black" font-family="Arial" font-size="14.00" text-anchor="end">
+ <text><tspan font-family="Arial" >C</tspan><tspan font-family="Arial" font-size="11.2" dy="-7.00px">S</tspan><tspan font-family="Arial" dy="11.20px">H</tspan><tspan font-family="Arial" font-size="14.0" dy="-4.20px">(Ae) for bargaining</tspan></text>
</g>
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='rgb( 50, 166, 140)' stroke-dasharray='2.5,4.0' d='M462.13,40.50 L510.29,40.50 M113.42,405.25 L171.10,389.74 L228.77,373.89 L286.45,356.53 L344.12,344.09 L401.80,327.33
+ <path stroke='rgb( 50, 166, 140)' stroke-dasharray='2.5,4.0' d='M470.52,40.50 L518.68,40.50 M128.34,388.09 L184.15,357.07 L239.96,325.38 L295.77,290.66 L351.58,265.79 L407.39,232.25
'/></g>
</g>
<g id="gnuplot_plot_11" fill="none"><title>gnuplot_plot_11</title>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
<g stroke='none' shape-rendering='crispEdges'>
- <polygon fill = 'rgb( 45, 5, 5)' fill-opacity = '0.300000' points = '113.42,407.29 171.10,393.96 228.77,380.80 286.45,370.16 344.12,356.55 401.80,344.93 401.80,338.18 344.12,352.94 286.45,364.92 228.77,378.62 171.10,392.32 113.42,405.20 '/>
+ <polygon fill = 'rgb( 45, 5, 5)' fill-opacity = '0.300000' points = '128.34,392.18 184.15,365.52 239.96,339.20 295.77,317.91 351.58,290.71 407.39,267.46 407.39,253.96 351.58,283.47 295.77,307.44 239.96,334.83 184.15,362.24 128.34,388.00 '/>
</g>
</g>
</g>
- <g id="gnuplot_plot_12" ><title>CSE(Ae) for SSI</title>
+ <g id="gnuplot_plot_12" ><title>CSH(Ae) for SSI</title>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <g transform="translate(452.34,66.05)" stroke="none" fill="black" font-family="Arial" font-size="14.00" text-anchor="end">
- <text><tspan font-family="Arial" >C</tspan><tspan font-family="Arial" font-size="11.2" dy="-7.00px">S</tspan><tspan font-family="Arial" dy="11.20px">E</tspan><tspan font-family="Arial" font-size="14.0" dy="-4.20px">(Ae) for SSI</tspan></text>
+ <g transform="translate(460.73,66.05)" stroke="none" fill="black" font-family="Arial" font-size="14.00" text-anchor="end">
+ <text><tspan font-family="Arial" >C</tspan><tspan font-family="Arial" font-size="11.2" dy="-7.00px">S</tspan><tspan font-family="Arial" dy="11.20px">H</tspan><tspan font-family="Arial" font-size="14.0" dy="-4.20px">(Ae) for SSI</tspan></text>
</g>
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='rgb( 0, 0, 0)' stroke-dasharray='2.5,4.0' d='M462.13,61.50 L510.29,61.50 M113.42,406.79 L171.10,393.09 L228.77,378.90 L286.45,365.25 L344.12,356.04 L401.80,344.37
+ <path stroke='rgb( 0, 0, 0)' stroke-dasharray='2.5,4.0' d='M470.52,61.50 L518.68,61.50 M128.34,391.18 L184.15,363.79 L239.96,335.39 L295.77,308.11 L351.58,289.68 L407.39,266.35
'/></g>
</g>
<g fill="none" color="white" stroke="rgb( 0, 0, 0)" stroke-width="2.00" stroke-linecap="butt" stroke-linejoin="miter">
@@ -373,7 +373,7 @@
<g fill="none" color="black" stroke="black" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
- <path stroke='black' d='M55.75,81.01 L55.75,422.40 L574.82,422.40 L574.82,81.01 L55.75,81.01 Z '/></g>
+ <path stroke='black' d='M72.53,81.01 L72.53,422.40 L574.82,422.40 L574.82,81.01 L72.53,81.01 Z '/></g>
<g fill="none" color="black" stroke="currentColor" stroke-width="1.00" stroke-linecap="butt" stroke-linejoin="miter">
</g>
</g>
diff --git a/src/main/scala/org/smastaplus/experiment/consumer/ConsumptionCampaign.scala b/src/main/scala/org/smastaplus/experiment/consumer/ConsumptionCampaign.scala
index 54ef506b..07eef487 100644
--- a/src/main/scala/org/smastaplus/experiment/consumer/ConsumptionCampaign.scala
+++ b/src/main/scala/org/smastaplus/experiment/consumer/ConsumptionCampaign.scala
@@ -26,7 +26,7 @@ class ConsumptionCampaign(simulatedCost: SimulatedCost, fromStable: Boolean = fa
val configurations : List[ConsumptionConfiguration] = { // The configurations
val numbersOfJobs = List.range(4, 5, 1) // l in [4,5[
- val numbersOfTasks = List.range(40, 360, 40)
+ val numbersOfTasks = List.range(150, 360, 40)
if (byNodes)
List.tabulate(9)(nbNodes => new ConsumptionConfiguration(8+ nbNodes, 4, 120, Uncorrelated))
else {
diff --git a/src/main/scala/org/smastaplus/experiment/consumer/ConsumptionExperiment.scala b/src/main/scala/org/smastaplus/experiment/consumer/ConsumptionExperiment.scala
index df3234f8..16b71a34 100644
--- a/src/main/scala/org/smastaplus/experiment/consumer/ConsumptionExperiment.scala
+++ b/src/main/scala/org/smastaplus/experiment/consumer/ConsumptionExperiment.scala
@@ -78,7 +78,7 @@ class ConsumptionExperiment(setting: ConsumptionSetting) extends Experiment[Cons
"09NbDelegatedTasks" -> setting.consumer.nbDelegatedTasks,
"10NbFirstStages" -> setting.consumer.nbFirstStages,
"11NbSecondStages" -> setting.consumer.nbSecondStages,
- "12MeanSimulatedFlowtime" -> result.simulatedMeanGlobalFlowtime
+ "12MeanSimulatedFlowtime" -> result.consumptions2allocation.realGlobalMeanFlowtime//result.simulatedMeanGlobalFlowtime
))
if (result.isSound) outcome
else throw new RuntimeException(s"Consumer: the outcome\n $result\nis not sound for\n ${setting.allocation.stap}")
--
GitLab