Skip to content
Snippets Groups Projects
Commit c0d199d0 authored by Maxime MORGE's avatar Maxime MORGE :construction_worker:
Browse files

PSSI: try improve C^S_H

parent 9ea74835
Branches
No related tags found
No related merge requests found
......@@ -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]
......
......@@ -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 {
......
......@@ -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}")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment