From 7a2822d06cf33522699cd99fdc8438e400c2c9f9 Mon Sep 17 00:00:00 2001
From: Christian Heinrich <christian@gladbachcity.de>
Date: Tue, 10 Jan 2017 21:48:39 +0100
Subject: [PATCH] Changed bw_factor to bw-factor

---
 data/final_platforms/old_miriel.xml                           | 2 +-
 data/final_platforms/sirocco.xml                              | 2 +-
 data/miriel_27_06_2016/calibration/Analysis.Rmd               | 4 ++--
 data/miriel_27_06_2016/calibration/testplatform.Rmd           | 2 +-
 data/miriel_27_06_2016/calibration/testplatform.html          | 2 +-
 data/miriel_27_06_2016/calibration/testplatform.md            | 2 +-
 data/miriel_27_06_2016/calibration/testplatform_output.xml    | 2 +-
 data/plafrim_15_06_16/calibration/Analysis.Rmd                | 4 ++--
 data/plafrim_15_06_16/calibration/testplatform.Rmd            | 2 +-
 data/plafrim_15_06_16/calibration/testplatform.html           | 2 +-
 data/plafrim_15_06_16/calibration/testplatform.md             | 2 +-
 data/plafrim_15_06_16/calibration/testplatform_output.xml     | 2 +-
 data/sirocco_01_08_2016/calibration/Analysis.Rmd              | 4 ++--
 data/sirocco_01_08_2016/calibration/sirocco_output.xml        | 2 +-
 data/sirocco_01_08_2016/calibration/testplatform.Rmd          | 2 +-
 data/sirocco_01_08_2016/calibration/testplatform.html         | 2 +-
 data/sirocco_01_08_2016/calibration/testplatform.md           | 2 +-
 data/taurus_26_07_2016/calibration/Analysis.Rmd               | 4 ++--
 .../calibration/taurus-2016-06-09--1_output.xml               | 2 +-
 data/taurus_26_07_2016/calibration/taurus.Rmd                 | 2 +-
 data/taurus_26_07_2016/calibration/taurus.html                | 2 +-
 data/taurus_26_07_2016/calibration/taurus.md                  | 2 +-
 data/taurus_26_07_2016/calibration/taurus_output.xml          | 2 +-
 src/calibration/Analysis.Rmd                                  | 4 ++--
 src/calibration/examples/Analysis.Rmd                         | 4 ++--
 src/calibration/examples/stampede_output.xml                  | 2 +-
 26 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/data/final_platforms/old_miriel.xml b/data/final_platforms/old_miriel.xml
index 4ee13be..228dd7c 100644
--- a/data/final_platforms/old_miriel.xml
+++ b/data/final_platforms/old_miriel.xml
@@ -23,7 +23,7 @@
  <prop id="smpi/os" value="0:1.72337677392447e-06:2.80556540986036e-10;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
  <prop id="smpi/ois" value="0:1.79150437795041e-06:2.60957841144294e-10;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
  <prop id="smpi/or" value="0:3.27843243070814e-06:3.41675771019744e-09;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
- <prop id="smpi/bw_factor" value="0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705"/>
+ <prop id="smpi/bw-factor" value="0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705"/>
  <prop id="smpi/lat_factor" value="0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401"/>
  <prop id="smpi/async_small_thres" value="17408"/>
  <prop id="smpi/send_is_detached_thres" value="17408"/>
diff --git a/data/final_platforms/sirocco.xml b/data/final_platforms/sirocco.xml
index 2df5557..4b235a4 100644
--- a/data/final_platforms/sirocco.xml
+++ b/data/final_platforms/sirocco.xml
@@ -23,7 +23,7 @@
 <prop id="smpi/os" value="0:2.70683864220123e-06:2.47269722619783e-10;1420:3.97545175056929e-06:7.23786118047894e-11;65536:7.58804087458976e-06:6.77088730090102e-11;131072:0:0;4e+05:0:0"/>
 <prop id="smpi/ois" value="0:2.7741781272553e-06:2.1631688187721e-10;1420:4.03664653739977e-06:6.92199520863807e-11;65536:5.77600529533672e-06:8.19394370464538e-11;131072:2.46349531812281e-06:1.48757168395357e-13;4e+05:2.43434499482972e-06:3.03855696558919e-13"/>
 <prop id="smpi/or" value="0:5.24254663627748e-06:2.05940556065388e-09;1420:1.13604897462265e-05:2.8332717225738e-10;65536:7.36920463371884e-06:3.32186380684382e-10;131072:0:0;4e+05:0:0"/>
-<prop id="smpi/bw_factor" value="0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999"/>
+<prop id="smpi/bw-factor" value="0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999"/>
 <prop id="smpi/lat_factor" value="0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862"/>
 <prop id="smpi/async_small_thres" value="65536"/>
 <prop id="smpi/send_is_detached_thres" value="320000"/>
diff --git a/data/miriel_27_06_2016/calibration/Analysis.Rmd b/data/miriel_27_06_2016/calibration/Analysis.Rmd
index b35d56d..bdcf1b2 100644
--- a/data/miriel_27_06_2016/calibration/Analysis.Rmd
+++ b/data/miriel_27_06_2016/calibration/Analysis.Rmd
@@ -298,7 +298,7 @@ Print results in Simgrid's xml format
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/os",Limit=Limit, desc=paste0(LimitInf,":",OsIntercept,":",OsSize)))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/or",Limit=Limit, desc=paste0(LimitInf,":",OrIntercept,":",OrSize)))
 desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, desc=paste0(LimitInf,":",OisIntercept,":",OisSize)))
-  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw_factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
+  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw-factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat_factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
 
   desc <- desc[with(desc, order(Name,Limit)),]
@@ -306,7 +306,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des
 
   as <- xmlNode("prop", attrs = c(id="smpi/async_small_thres", value=eager_threshold))
   de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold))
-  bw <- xmlNode("prop", attrs = c(id="smpi/bw_factor", value=desc[desc$Name=="smpi/bw_factor",]$label))
+  bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label))
   lat <- xmlNode("prop", attrs = c(id="smpi/lat_factor", value=desc[desc$Name=="smpi/lat_factor",]$label))
   os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label))
   or <- xmlNode("prop", attrs = c(id="smpi/or", value=desc[desc$Name=="smpi/or",]$label))
diff --git a/data/miriel_27_06_2016/calibration/testplatform.Rmd b/data/miriel_27_06_2016/calibration/testplatform.Rmd
index 4046884..db1c067 100644
--- a/data/miriel_27_06_2016/calibration/testplatform.Rmd
+++ b/data/miriel_27_06_2016/calibration/testplatform.Rmd
@@ -388,7 +388,7 @@ The following snippet of XML has to be included at the beginning of your platfor
 ##  <prop id="smpi/os" value="0:1.70323849188712e-06:2.79726695925964e-10;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0"/>
 ##  <prop id="smpi/ois" value="0:1.75232188013067e-06:2.20494312485917e-10;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0"/>
 ##  <prop id="smpi/or" value="0:3.33315583120708e-06:3.40864964492857e-09;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0"/>
-##  <prop id="smpi/bw_factor" value="0:0.0636575813349588;1420:0.983495291166692;65536:1.52596144919948;131072:0.717251283995903;4e+05:0.619663249676955"/>
+##  <prop id="smpi/bw-factor" value="0:0.0636575813349588;1420:0.983495291166692;65536:1.52596144919948;131072:0.717251283995903;4e+05:0.619663249676955"/>
 ##  <prop id="smpi/lat_factor" value="0:0.424821296069165;1420:1.16678508115501;65536:1.86811479079315;131072:2.0798208704917;4e+05:0.923798288770192"/>
 ##  <prop id="smpi/async_small_thres" value="17408"/>
 ##  <prop id="smpi/send_is_detached_thres" value="17408"/>
diff --git a/data/miriel_27_06_2016/calibration/testplatform.html b/data/miriel_27_06_2016/calibration/testplatform.html
index 7e3c7e2..852f35d 100644
--- a/data/miriel_27_06_2016/calibration/testplatform.html
+++ b/data/miriel_27_06_2016/calibration/testplatform.html
@@ -544,7 +544,7 @@ Time for one MPI_Test call</p>
 ##  &lt;prop id=&quot;smpi/os&quot; value=&quot;0:1.70323849188712e-06:2.79726695925964e-10;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/ois&quot; value=&quot;0:1.75232188013067e-06:2.20494312485917e-10;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/or&quot; value=&quot;0:3.33315583120708e-06:3.40864964492857e-09;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0&quot;/&gt;
-##  &lt;prop id=&quot;smpi/bw_factor&quot; value=&quot;0:0.0636575813349588;1420:0.983495291166692;65536:1.52596144919948;131072:0.717251283995903;4e+05:0.619663249676955&quot;/&gt;
+##  &lt;prop id=&quot;smpi/bw-factor&quot; value=&quot;0:0.0636575813349588;1420:0.983495291166692;65536:1.52596144919948;131072:0.717251283995903;4e+05:0.619663249676955&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/lat_factor&quot; value=&quot;0:0.424821296069165;1420:1.16678508115501;65536:1.86811479079315;131072:2.0798208704917;4e+05:0.923798288770192&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/async_small_thres&quot; value=&quot;17408&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/send_is_detached_thres&quot; value=&quot;17408&quot;/&gt;
diff --git a/data/miriel_27_06_2016/calibration/testplatform.md b/data/miriel_27_06_2016/calibration/testplatform.md
index 4046884..db1c067 100644
--- a/data/miriel_27_06_2016/calibration/testplatform.md
+++ b/data/miriel_27_06_2016/calibration/testplatform.md
@@ -388,7 +388,7 @@ The following snippet of XML has to be included at the beginning of your platfor
 ##  <prop id="smpi/os" value="0:1.70323849188712e-06:2.79726695925964e-10;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0"/>
 ##  <prop id="smpi/ois" value="0:1.75232188013067e-06:2.20494312485917e-10;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0"/>
 ##  <prop id="smpi/or" value="0:3.33315583120708e-06:3.40864964492857e-09;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0"/>
-##  <prop id="smpi/bw_factor" value="0:0.0636575813349588;1420:0.983495291166692;65536:1.52596144919948;131072:0.717251283995903;4e+05:0.619663249676955"/>
+##  <prop id="smpi/bw-factor" value="0:0.0636575813349588;1420:0.983495291166692;65536:1.52596144919948;131072:0.717251283995903;4e+05:0.619663249676955"/>
 ##  <prop id="smpi/lat_factor" value="0:0.424821296069165;1420:1.16678508115501;65536:1.86811479079315;131072:2.0798208704917;4e+05:0.923798288770192"/>
 ##  <prop id="smpi/async_small_thres" value="17408"/>
 ##  <prop id="smpi/send_is_detached_thres" value="17408"/>
diff --git a/data/miriel_27_06_2016/calibration/testplatform_output.xml b/data/miriel_27_06_2016/calibration/testplatform_output.xml
index e4c4a4f..c389b45 100644
--- a/data/miriel_27_06_2016/calibration/testplatform_output.xml
+++ b/data/miriel_27_06_2016/calibration/testplatform_output.xml
@@ -3,7 +3,7 @@
  <prop id="smpi/os" value="0:1.70323849188712e-06:2.79726695925964e-10;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0"/>
  <prop id="smpi/ois" value="0:1.75232188013067e-06:2.20494312485917e-10;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0"/>
  <prop id="smpi/or" value="0:3.33315583120708e-06:3.40864964492857e-09;1420:0:0;65536:0:0;131072:0:0;4e+05:0:0"/>
- <prop id="smpi/bw_factor" value="0:0.0636575813349588;1420:0.983495291166692;65536:1.52596144919948;131072:0.717251283995903;4e+05:0.619663249676955"/>
+ <prop id="smpi/bw-factor" value="0:0.0636575813349588;1420:0.983495291166692;65536:1.52596144919948;131072:0.717251283995903;4e+05:0.619663249676955"/>
  <prop id="smpi/lat_factor" value="0:0.424821296069165;1420:1.16678508115501;65536:1.86811479079315;131072:2.0798208704917;4e+05:0.923798288770192"/>
  <prop id="smpi/async_small_thres" value="17408"/>
  <prop id="smpi/send_is_detached_thres" value="17408"/>
diff --git a/data/plafrim_15_06_16/calibration/Analysis.Rmd b/data/plafrim_15_06_16/calibration/Analysis.Rmd
index b35d56d..bdcf1b2 100644
--- a/data/plafrim_15_06_16/calibration/Analysis.Rmd
+++ b/data/plafrim_15_06_16/calibration/Analysis.Rmd
@@ -298,7 +298,7 @@ Print results in Simgrid's xml format
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/os",Limit=Limit, desc=paste0(LimitInf,":",OsIntercept,":",OsSize)))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/or",Limit=Limit, desc=paste0(LimitInf,":",OrIntercept,":",OrSize)))
 desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, desc=paste0(LimitInf,":",OisIntercept,":",OisSize)))
-  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw_factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
+  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw-factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat_factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
 
   desc <- desc[with(desc, order(Name,Limit)),]
@@ -306,7 +306,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des
 
   as <- xmlNode("prop", attrs = c(id="smpi/async_small_thres", value=eager_threshold))
   de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold))
-  bw <- xmlNode("prop", attrs = c(id="smpi/bw_factor", value=desc[desc$Name=="smpi/bw_factor",]$label))
+  bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label))
   lat <- xmlNode("prop", attrs = c(id="smpi/lat_factor", value=desc[desc$Name=="smpi/lat_factor",]$label))
   os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label))
   or <- xmlNode("prop", attrs = c(id="smpi/or", value=desc[desc$Name=="smpi/or",]$label))
diff --git a/data/plafrim_15_06_16/calibration/testplatform.Rmd b/data/plafrim_15_06_16/calibration/testplatform.Rmd
index ce3a20e..0f5a208 100644
--- a/data/plafrim_15_06_16/calibration/testplatform.Rmd
+++ b/data/plafrim_15_06_16/calibration/testplatform.Rmd
@@ -393,7 +393,7 @@ The following snippet of XML has to be included at the beginning of your platfor
 ##  <prop id="smpi/os" value="0:1.72337677392447e-06:2.80556540986036e-10;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
 ##  <prop id="smpi/ois" value="0:1.79150437795041e-06:2.60957841144294e-10;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
 ##  <prop id="smpi/or" value="0:3.27843243070814e-06:3.41675771019744e-09;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
-##  <prop id="smpi/bw_factor" value="0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705"/>
+##  <prop id="smpi/bw-factor" value="0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705"/>
 ##  <prop id="smpi/lat_factor" value="0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401"/>
 ##  <prop id="smpi/async_small_thres" value="17408"/>
 ##  <prop id="smpi/send_is_detached_thres" value="17408"/>
diff --git a/data/plafrim_15_06_16/calibration/testplatform.html b/data/plafrim_15_06_16/calibration/testplatform.html
index d59d2ad..19b703a 100644
--- a/data/plafrim_15_06_16/calibration/testplatform.html
+++ b/data/plafrim_15_06_16/calibration/testplatform.html
@@ -549,7 +549,7 @@ Time for one MPI_Test call</p>
 ##  &lt;prop id=&quot;smpi/os&quot; value=&quot;0:1.72337677392447e-06:2.80556540986036e-10;1420:0:0;65536:0:0;131072:0:0;450000:0:0&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/ois&quot; value=&quot;0:1.79150437795041e-06:2.60957841144294e-10;1420:0:0;65536:0:0;131072:0:0;450000:0:0&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/or&quot; value=&quot;0:3.27843243070814e-06:3.41675771019744e-09;1420:0:0;65536:0:0;131072:0:0;450000:0:0&quot;/&gt;
-##  &lt;prop id=&quot;smpi/bw_factor&quot; value=&quot;0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705&quot;/&gt;
+##  &lt;prop id=&quot;smpi/bw-factor&quot; value=&quot;0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/lat_factor&quot; value=&quot;0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/async_small_thres&quot; value=&quot;17408&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/send_is_detached_thres&quot; value=&quot;17408&quot;/&gt;
diff --git a/data/plafrim_15_06_16/calibration/testplatform.md b/data/plafrim_15_06_16/calibration/testplatform.md
index ce3a20e..0f5a208 100644
--- a/data/plafrim_15_06_16/calibration/testplatform.md
+++ b/data/plafrim_15_06_16/calibration/testplatform.md
@@ -393,7 +393,7 @@ The following snippet of XML has to be included at the beginning of your platfor
 ##  <prop id="smpi/os" value="0:1.72337677392447e-06:2.80556540986036e-10;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
 ##  <prop id="smpi/ois" value="0:1.79150437795041e-06:2.60957841144294e-10;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
 ##  <prop id="smpi/or" value="0:3.27843243070814e-06:3.41675771019744e-09;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
-##  <prop id="smpi/bw_factor" value="0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705"/>
+##  <prop id="smpi/bw-factor" value="0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705"/>
 ##  <prop id="smpi/lat_factor" value="0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401"/>
 ##  <prop id="smpi/async_small_thres" value="17408"/>
 ##  <prop id="smpi/send_is_detached_thres" value="17408"/>
diff --git a/data/plafrim_15_06_16/calibration/testplatform_output.xml b/data/plafrim_15_06_16/calibration/testplatform_output.xml
index b2cbd7a..ea026f5 100644
--- a/data/plafrim_15_06_16/calibration/testplatform_output.xml
+++ b/data/plafrim_15_06_16/calibration/testplatform_output.xml
@@ -3,7 +3,7 @@
  <prop id="smpi/os" value="0:1.72337677392447e-06:2.80556540986036e-10;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
  <prop id="smpi/ois" value="0:1.79150437795041e-06:2.60957841144294e-10;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
  <prop id="smpi/or" value="0:3.27843243070814e-06:3.41675771019744e-09;1420:0:0;65536:0:0;131072:0:0;450000:0:0"/>
- <prop id="smpi/bw_factor" value="0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705"/>
+ <prop id="smpi/bw-factor" value="0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705"/>
  <prop id="smpi/lat_factor" value="0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401"/>
  <prop id="smpi/async_small_thres" value="17408"/>
  <prop id="smpi/send_is_detached_thres" value="17408"/>
diff --git a/data/sirocco_01_08_2016/calibration/Analysis.Rmd b/data/sirocco_01_08_2016/calibration/Analysis.Rmd
index aaa4b4e..41090ac 100644
--- a/data/sirocco_01_08_2016/calibration/Analysis.Rmd
+++ b/data/sirocco_01_08_2016/calibration/Analysis.Rmd
@@ -299,7 +299,7 @@ Print results in Simgrid's xml format
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/os",Limit=Limit, desc=paste0(LimitInf,":",OsIntercept,":",OsSize)))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/or",Limit=Limit, desc=paste0(LimitInf,":",OrIntercept,":",OrSize)))
 desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, desc=paste0(LimitInf,":",OisIntercept,":",OisSize)))
-  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw_factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
+  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw-factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat_factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
 
   desc <- desc[with(desc, order(Name,Limit)),]
@@ -307,7 +307,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des
 
   as <- xmlNode("prop", attrs = c(id="smpi/async_small_thres", value=eager_threshold))
   de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold))
-  bw <- xmlNode("prop", attrs = c(id="smpi/bw_factor", value=desc[desc$Name=="smpi/bw_factor",]$label))
+  bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label))
   lat <- xmlNode("prop", attrs = c(id="smpi/lat_factor", value=desc[desc$Name=="smpi/lat_factor",]$label))
   os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label))
   or <- xmlNode("prop", attrs = c(id="smpi/or", value=desc[desc$Name=="smpi/or",]$label))
diff --git a/data/sirocco_01_08_2016/calibration/sirocco_output.xml b/data/sirocco_01_08_2016/calibration/sirocco_output.xml
index 700dd5c..39c9fa1 100644
--- a/data/sirocco_01_08_2016/calibration/sirocco_output.xml
+++ b/data/sirocco_01_08_2016/calibration/sirocco_output.xml
@@ -3,7 +3,7 @@
  <prop id="smpi/os" value="0:2.70683864220123e-06:2.47269722619783e-10;1420:3.97545175056929e-06:7.23786118047894e-11;65536:7.58804087458976e-06:6.77088730090102e-11;131072:0:0;4e+05:0:0"/>
  <prop id="smpi/ois" value="0:2.7741781272553e-06:2.1631688187721e-10;1420:4.03664653739977e-06:6.92199520863807e-11;65536:5.77600529533672e-06:8.19394370464538e-11;131072:2.46349531812281e-06:1.48757168395357e-13;4e+05:2.43434499482972e-06:3.03855696558919e-13"/>
  <prop id="smpi/or" value="0:5.24254663627748e-06:2.05940556065388e-09;1420:1.13604897462265e-05:2.8332717225738e-10;65536:7.36920463371884e-06:3.32186380684382e-10;131072:0:0;4e+05:0:0"/>
- <prop id="smpi/bw_factor" value="0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999"/>
+ <prop id="smpi/bw-factor" value="0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999"/>
  <prop id="smpi/lat_factor" value="0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862"/>
  <prop id="smpi/async_small_thres" value="65536"/>
  <prop id="smpi/send_is_detached_thres" value="320000"/>
diff --git a/data/sirocco_01_08_2016/calibration/testplatform.Rmd b/data/sirocco_01_08_2016/calibration/testplatform.Rmd
index dda2651..cec9004 100644
--- a/data/sirocco_01_08_2016/calibration/testplatform.Rmd
+++ b/data/sirocco_01_08_2016/calibration/testplatform.Rmd
@@ -519,7 +519,7 @@ The following snippet of XML has to be included at the beginning of your platfor
 ##  <prop id="smpi/os" value="0:2.70683864220123e-06:2.47269722619783e-10;1420:3.97545175056929e-06:7.23786118047894e-11;65536:7.58804087458976e-06:6.77088730090102e-11;131072:0:0;4e+05:0:0"/>
 ##  <prop id="smpi/ois" value="0:2.7741781272553e-06:2.1631688187721e-10;1420:4.03664653739977e-06:6.92199520863807e-11;65536:5.77600529533672e-06:8.19394370464538e-11;131072:2.46349531812281e-06:1.48757168395357e-13;4e+05:2.43434499482972e-06:3.03855696558919e-13"/>
 ##  <prop id="smpi/or" value="0:5.24254663627748e-06:2.05940556065388e-09;1420:1.13604897462265e-05:2.8332717225738e-10;65536:7.36920463371884e-06:3.32186380684382e-10;131072:0:0;4e+05:0:0"/>
-##  <prop id="smpi/bw_factor" value="0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999"/>
+##  <prop id="smpi/bw-factor" value="0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999"/>
 ##  <prop id="smpi/lat_factor" value="0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862"/>
 ##  <prop id="smpi/async_small_thres" value="65536"/>
 ##  <prop id="smpi/send_is_detached_thres" value="320000"/>
diff --git a/data/sirocco_01_08_2016/calibration/testplatform.html b/data/sirocco_01_08_2016/calibration/testplatform.html
index aeff366..caa9a08 100644
--- a/data/sirocco_01_08_2016/calibration/testplatform.html
+++ b/data/sirocco_01_08_2016/calibration/testplatform.html
@@ -675,7 +675,7 @@ Time for one MPI_Test call</p>
 ##  &lt;prop id=&quot;smpi/os&quot; value=&quot;0:2.70683864220123e-06:2.47269722619783e-10;1420:3.97545175056929e-06:7.23786118047894e-11;65536:7.58804087458976e-06:6.77088730090102e-11;131072:0:0;4e+05:0:0&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/ois&quot; value=&quot;0:2.7741781272553e-06:2.1631688187721e-10;1420:4.03664653739977e-06:6.92199520863807e-11;65536:5.77600529533672e-06:8.19394370464538e-11;131072:2.46349531812281e-06:1.48757168395357e-13;4e+05:2.43434499482972e-06:3.03855696558919e-13&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/or&quot; value=&quot;0:5.24254663627748e-06:2.05940556065388e-09;1420:1.13604897462265e-05:2.8332717225738e-10;65536:7.36920463371884e-06:3.32186380684382e-10;131072:0:0;4e+05:0:0&quot;/&gt;
-##  &lt;prop id=&quot;smpi/bw_factor&quot; value=&quot;0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999&quot;/&gt;
+##  &lt;prop id=&quot;smpi/bw-factor&quot; value=&quot;0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/lat_factor&quot; value=&quot;0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/async_small_thres&quot; value=&quot;65536&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/send_is_detached_thres&quot; value=&quot;320000&quot;/&gt;
diff --git a/data/sirocco_01_08_2016/calibration/testplatform.md b/data/sirocco_01_08_2016/calibration/testplatform.md
index dda2651..cec9004 100644
--- a/data/sirocco_01_08_2016/calibration/testplatform.md
+++ b/data/sirocco_01_08_2016/calibration/testplatform.md
@@ -519,7 +519,7 @@ The following snippet of XML has to be included at the beginning of your platfor
 ##  <prop id="smpi/os" value="0:2.70683864220123e-06:2.47269722619783e-10;1420:3.97545175056929e-06:7.23786118047894e-11;65536:7.58804087458976e-06:6.77088730090102e-11;131072:0:0;4e+05:0:0"/>
 ##  <prop id="smpi/ois" value="0:2.7741781272553e-06:2.1631688187721e-10;1420:4.03664653739977e-06:6.92199520863807e-11;65536:5.77600529533672e-06:8.19394370464538e-11;131072:2.46349531812281e-06:1.48757168395357e-13;4e+05:2.43434499482972e-06:3.03855696558919e-13"/>
 ##  <prop id="smpi/or" value="0:5.24254663627748e-06:2.05940556065388e-09;1420:1.13604897462265e-05:2.8332717225738e-10;65536:7.36920463371884e-06:3.32186380684382e-10;131072:0:0;4e+05:0:0"/>
-##  <prop id="smpi/bw_factor" value="0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999"/>
+##  <prop id="smpi/bw-factor" value="0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999"/>
 ##  <prop id="smpi/lat_factor" value="0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862"/>
 ##  <prop id="smpi/async_small_thres" value="65536"/>
 ##  <prop id="smpi/send_is_detached_thres" value="320000"/>
diff --git a/data/taurus_26_07_2016/calibration/Analysis.Rmd b/data/taurus_26_07_2016/calibration/Analysis.Rmd
index aaa4b4e..41090ac 100644
--- a/data/taurus_26_07_2016/calibration/Analysis.Rmd
+++ b/data/taurus_26_07_2016/calibration/Analysis.Rmd
@@ -299,7 +299,7 @@ Print results in Simgrid's xml format
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/os",Limit=Limit, desc=paste0(LimitInf,":",OsIntercept,":",OsSize)))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/or",Limit=Limit, desc=paste0(LimitInf,":",OrIntercept,":",OrSize)))
 desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, desc=paste0(LimitInf,":",OisIntercept,":",OisSize)))
-  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw_factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
+  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw-factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat_factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
 
   desc <- desc[with(desc, order(Name,Limit)),]
@@ -307,7 +307,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des
 
   as <- xmlNode("prop", attrs = c(id="smpi/async_small_thres", value=eager_threshold))
   de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold))
-  bw <- xmlNode("prop", attrs = c(id="smpi/bw_factor", value=desc[desc$Name=="smpi/bw_factor",]$label))
+  bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label))
   lat <- xmlNode("prop", attrs = c(id="smpi/lat_factor", value=desc[desc$Name=="smpi/lat_factor",]$label))
   os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label))
   or <- xmlNode("prop", attrs = c(id="smpi/or", value=desc[desc$Name=="smpi/or",]$label))
diff --git a/data/taurus_26_07_2016/calibration/taurus-2016-06-09--1_output.xml b/data/taurus_26_07_2016/calibration/taurus-2016-06-09--1_output.xml
index 5730e01..0bd1332 100644
--- a/data/taurus_26_07_2016/calibration/taurus-2016-06-09--1_output.xml
+++ b/data/taurus_26_07_2016/calibration/taurus-2016-06-09--1_output.xml
@@ -3,7 +3,7 @@
  <prop id="smpi/os" value="0:3.79946267082783e-06:1.09809596167633e-10;1420:4.06752467953734e-06:8.98782555257323e-11;33500:6.01204627458251e-06:7.10122202865045e-11;65536:7.28270630967833e-05:1.9683266729216e-10;320000:0:0"/>
  <prop id="smpi/ois" value="0:3.65848336553355e-06:1.33280621516301e-10;1420:3.83673729379869e-06:7.84867337035856e-11;33500:5.57232433176236e-06:6.5668893954931e-11;65536:4.17803219267394e-06:2.37460347640595e-12;320000:4.70677307448713e-06:3.38065421824938e-13"/>
  <prop id="smpi/or" value="0:3.51809764924934e-06:3.01847204118237e-10;1420:8.16124874852713e-06:2.66840481979518e-10;33500:1.49347740713389e-05:1.97645004617501e-10;65536:5.88893263987424e-05:1.29160163208845e-09;320000:0:0"/>
- <prop id="smpi/bw_factor" value="0:0.00874688662522859;1420:0.147211715861806;33500:0.107192502175564;65536:0.187807186806016;320000:0.0958499316204859"/>
+ <prop id="smpi/bw-factor" value="0:0.00874688662522859;1420:0.147211715861806;33500:0.107192502175564;65536:0.187807186806016;320000:0.0958499316204859"/>
  <prop id="smpi/lat_factor" value="0:2.12853331297438;1420:5.19380442595492;33500:4.24573375719345;65536:6.9874709829732;320000:6.23567954616888"/>
  <prop id="smpi/async_small_thres" value="65536"/>
  <prop id="smpi/send_is_detached_thres" value="320000"/>
diff --git a/data/taurus_26_07_2016/calibration/taurus.Rmd b/data/taurus_26_07_2016/calibration/taurus.Rmd
index f23809a..15a3f9a 100644
--- a/data/taurus_26_07_2016/calibration/taurus.Rmd
+++ b/data/taurus_26_07_2016/calibration/taurus.Rmd
@@ -556,7 +556,7 @@ The following snippet of XML has to be included at the beginning of your platfor
 ##  <prop id="smpi/os" value="0:3.79946267082783e-06:1.09809596167633e-10;1420:4.06752467953734e-06:8.98782555257323e-11;33500:6.01204627458251e-06:7.10122202865045e-11;65536:7.28270630967833e-05:1.9683266729216e-10;320000:0:0"/>
 ##  <prop id="smpi/ois" value="0:3.65848336553355e-06:1.33280621516301e-10;1420:3.83673729379869e-06:7.84867337035856e-11;33500:5.57232433176236e-06:6.5668893954931e-11;65536:4.17803219267394e-06:2.37460347640595e-12;320000:4.70677307448713e-06:3.38065421824938e-13"/>
 ##  <prop id="smpi/or" value="0:3.51809764924934e-06:3.01847204118237e-10;1420:8.16124874852713e-06:2.66840481979518e-10;33500:1.49347740713389e-05:1.97645004617501e-10;65536:5.88893263987424e-05:1.29160163208845e-09;320000:0:0"/>
-##  <prop id="smpi/bw_factor" value="0:0.00874688662522859;1420:0.147211715861806;33500:0.107192502175564;65536:0.187807186806016;320000:0.0958499316204859"/>
+##  <prop id="smpi/bw-factor" value="0:0.00874688662522859;1420:0.147211715861806;33500:0.107192502175564;65536:0.187807186806016;320000:0.0958499316204859"/>
 ##  <prop id="smpi/lat_factor" value="0:2.12853331297438;1420:5.19380442595492;33500:4.24573375719345;65536:6.9874709829732;320000:6.23567954616888"/>
 ##  <prop id="smpi/async_small_thres" value="65536"/>
 ##  <prop id="smpi/send_is_detached_thres" value="320000"/>
diff --git a/data/taurus_26_07_2016/calibration/taurus.html b/data/taurus_26_07_2016/calibration/taurus.html
index c86f6fc..523ec2b 100644
--- a/data/taurus_26_07_2016/calibration/taurus.html
+++ b/data/taurus_26_07_2016/calibration/taurus.html
@@ -712,7 +712,7 @@ Time for one MPI_Test call</p>
 ##  &lt;prop id=&quot;smpi/os&quot; value=&quot;0:3.79946267082783e-06:1.09809596167633e-10;1420:4.06752467953734e-06:8.98782555257323e-11;33500:6.01204627458251e-06:7.10122202865045e-11;65536:7.28270630967833e-05:1.9683266729216e-10;320000:0:0&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/ois&quot; value=&quot;0:3.65848336553355e-06:1.33280621516301e-10;1420:3.83673729379869e-06:7.84867337035856e-11;33500:5.57232433176236e-06:6.5668893954931e-11;65536:4.17803219267394e-06:2.37460347640595e-12;320000:4.70677307448713e-06:3.38065421824938e-13&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/or&quot; value=&quot;0:3.51809764924934e-06:3.01847204118237e-10;1420:8.16124874852713e-06:2.66840481979518e-10;33500:1.49347740713389e-05:1.97645004617501e-10;65536:5.88893263987424e-05:1.29160163208845e-09;320000:0:0&quot;/&gt;
-##  &lt;prop id=&quot;smpi/bw_factor&quot; value=&quot;0:0.00874688662522859;1420:0.147211715861806;33500:0.107192502175564;65536:0.187807186806016;320000:0.0958499316204859&quot;/&gt;
+##  &lt;prop id=&quot;smpi/bw-factor&quot; value=&quot;0:0.00874688662522859;1420:0.147211715861806;33500:0.107192502175564;65536:0.187807186806016;320000:0.0958499316204859&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/lat_factor&quot; value=&quot;0:2.12853331297438;1420:5.19380442595492;33500:4.24573375719345;65536:6.9874709829732;320000:6.23567954616888&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/async_small_thres&quot; value=&quot;65536&quot;/&gt;
 ##  &lt;prop id=&quot;smpi/send_is_detached_thres&quot; value=&quot;320000&quot;/&gt;
diff --git a/data/taurus_26_07_2016/calibration/taurus.md b/data/taurus_26_07_2016/calibration/taurus.md
index f23809a..15a3f9a 100644
--- a/data/taurus_26_07_2016/calibration/taurus.md
+++ b/data/taurus_26_07_2016/calibration/taurus.md
@@ -556,7 +556,7 @@ The following snippet of XML has to be included at the beginning of your platfor
 ##  <prop id="smpi/os" value="0:3.79946267082783e-06:1.09809596167633e-10;1420:4.06752467953734e-06:8.98782555257323e-11;33500:6.01204627458251e-06:7.10122202865045e-11;65536:7.28270630967833e-05:1.9683266729216e-10;320000:0:0"/>
 ##  <prop id="smpi/ois" value="0:3.65848336553355e-06:1.33280621516301e-10;1420:3.83673729379869e-06:7.84867337035856e-11;33500:5.57232433176236e-06:6.5668893954931e-11;65536:4.17803219267394e-06:2.37460347640595e-12;320000:4.70677307448713e-06:3.38065421824938e-13"/>
 ##  <prop id="smpi/or" value="0:3.51809764924934e-06:3.01847204118237e-10;1420:8.16124874852713e-06:2.66840481979518e-10;33500:1.49347740713389e-05:1.97645004617501e-10;65536:5.88893263987424e-05:1.29160163208845e-09;320000:0:0"/>
-##  <prop id="smpi/bw_factor" value="0:0.00874688662522859;1420:0.147211715861806;33500:0.107192502175564;65536:0.187807186806016;320000:0.0958499316204859"/>
+##  <prop id="smpi/bw-factor" value="0:0.00874688662522859;1420:0.147211715861806;33500:0.107192502175564;65536:0.187807186806016;320000:0.0958499316204859"/>
 ##  <prop id="smpi/lat_factor" value="0:2.12853331297438;1420:5.19380442595492;33500:4.24573375719345;65536:6.9874709829732;320000:6.23567954616888"/>
 ##  <prop id="smpi/async_small_thres" value="65536"/>
 ##  <prop id="smpi/send_is_detached_thres" value="320000"/>
diff --git a/data/taurus_26_07_2016/calibration/taurus_output.xml b/data/taurus_26_07_2016/calibration/taurus_output.xml
index f85b8bc..2e2e6a7 100644
--- a/data/taurus_26_07_2016/calibration/taurus_output.xml
+++ b/data/taurus_26_07_2016/calibration/taurus_output.xml
@@ -3,7 +3,7 @@
  <prop id="smpi/os"/>
  <prop id="smpi/ois"/>
  <prop id="smpi/or"/>
- <prop id="smpi/bw_factor"/>
+ <prop id="smpi/bw-factor"/>
  <prop id="smpi/lat_factor"/>
  <prop id="smpi/async_small_thres" value="65536"/>
  <prop id="smpi/send_is_detached_thres" value="260000"/>
diff --git a/src/calibration/Analysis.Rmd b/src/calibration/Analysis.Rmd
index aaa4b4e..41090ac 100644
--- a/src/calibration/Analysis.Rmd
+++ b/src/calibration/Analysis.Rmd
@@ -299,7 +299,7 @@ Print results in Simgrid's xml format
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/os",Limit=Limit, desc=paste0(LimitInf,":",OsIntercept,":",OsSize)))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/or",Limit=Limit, desc=paste0(LimitInf,":",OrIntercept,":",OrSize)))
 desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, desc=paste0(LimitInf,":",OisIntercept,":",OisSize)))
-  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw_factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
+  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw-factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat_factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
 
   desc <- desc[with(desc, order(Name,Limit)),]
@@ -307,7 +307,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des
 
   as <- xmlNode("prop", attrs = c(id="smpi/async_small_thres", value=eager_threshold))
   de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold))
-  bw <- xmlNode("prop", attrs = c(id="smpi/bw_factor", value=desc[desc$Name=="smpi/bw_factor",]$label))
+  bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label))
   lat <- xmlNode("prop", attrs = c(id="smpi/lat_factor", value=desc[desc$Name=="smpi/lat_factor",]$label))
   os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label))
   or <- xmlNode("prop", attrs = c(id="smpi/or", value=desc[desc$Name=="smpi/or",]$label))
diff --git a/src/calibration/examples/Analysis.Rmd b/src/calibration/examples/Analysis.Rmd
index b35d56d..bdcf1b2 100644
--- a/src/calibration/examples/Analysis.Rmd
+++ b/src/calibration/examples/Analysis.Rmd
@@ -298,7 +298,7 @@ Print results in Simgrid's xml format
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/os",Limit=Limit, desc=paste0(LimitInf,":",OsIntercept,":",OsSize)))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/or",Limit=Limit, desc=paste0(LimitInf,":",OrIntercept,":",OrSize)))
 desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, desc=paste0(LimitInf,":",OisIntercept,":",OisSize)))
-  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw_factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
+  desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/bw-factor",Limit=Limit, desc=paste0(LimitInf,":",1/(DelaySize*expected_bandwidth))))
   desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/lat_factor",Limit=Limit, desc=paste0(LimitInf,":",DelayIntercept/expected_latency)))
 
   desc <- desc[with(desc, order(Name,Limit)),]
@@ -306,7 +306,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des
 
   as <- xmlNode("prop", attrs = c(id="smpi/async_small_thres", value=eager_threshold))
   de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold))
-  bw <- xmlNode("prop", attrs = c(id="smpi/bw_factor", value=desc[desc$Name=="smpi/bw_factor",]$label))
+  bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label))
   lat <- xmlNode("prop", attrs = c(id="smpi/lat_factor", value=desc[desc$Name=="smpi/lat_factor",]$label))
   os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label))
   or <- xmlNode("prop", attrs = c(id="smpi/or", value=desc[desc$Name=="smpi/or",]$label))
diff --git a/src/calibration/examples/stampede_output.xml b/src/calibration/examples/stampede_output.xml
index 250f94c..f2550af 100644
--- a/src/calibration/examples/stampede_output.xml
+++ b/src/calibration/examples/stampede_output.xml
@@ -3,7 +3,7 @@
  <prop id="smpi/os" value="0:3.33809800772755e-07:1.19758012561479e-10;4120:1.80025892006293e-06:1.37844482790579e-10;17408:0:0"/>
  <prop id="smpi/ois" value="0:2.9956039499098e-07:1.31295276288599e-10;4120:5.22643731028535e-07:5.59286363481658e-12;17408:0:0"/>
  <prop id="smpi/or" value="0:1.3635950877903e-06:1.08008992233296e-10;4120:0:0;17408:0:0"/>
- <prop id="smpi/bw_factor" value="0:1.0212271015512;4120:1.00592739101783;17408:1.32354721253027"/>
+ <prop id="smpi/bw-factor" value="0:1.0212271015512;4120:1.00592739101783;17408:1.32354721253027"/>
  <prop id="smpi/lat_factor" value="0:0.000453157054255973;4120:0.149947156921692;17408:0.260476437970144"/>
  <prop id="smpi/async_small_thres" value="17408"/>
  <prop id="smpi/send_is_detached_thres" value="17408"/>
-- 
GitLab