FWIW this is the calibration I'm using to run experiments right now. -- Mark

[simgrid.git] / src / surf / network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index 3ab1a34..6e6e794 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -103,49 +103,54 @@ static double constant_bandwidth_constraint(double rate, double bound,
   return rate;
 }
 
-/**
- *------------------ <copy/paste C code snippet in surf/network.c> ----------------------
- *
- * produced by: ./calibrate_piecewise2.py griffon_skampi_pt2pt.ski.dat 2 2.4e-5 1.25e8 1024 65536
- *
- *---------------------------------------------------------------------------------------
- **/
+/**--------- <copy/paste C code snippet in surf/network.c> -------------
+  * produced by:
+  * ./regression2.py ./pingpong-in.dat 0.15 100 2 2.4e-5 1.25e8
+  * outliers: 65
+  * gnuplot: 
+    plot "./pingpong-in.dat" using 1:2 with lines title "data", \
+        (x >= 65472) ? 0.00850436*x+558.894 : \
+        (x >= 15424) ? 0.0114635*x+167.446 : \
+        (x >= 9376) ? 0.0136219*x+124.464 : \
+        (x >= 5776) ? 0.00735707*x+105.022 : \
+        (x >= 3484) ? 0.0103235*x+90.2886 : \
+        (x >= 1426) ? 0.0131384*x+77.3159 : \
+        (x >= 732) ? 0.0233927*x+93.6146 : \
+        (x >= 257) ? 0.0236608*x+93.7637 : \
+        (x >= 0) ? 0.00985119*x+96.704 : \
+        1.0 with lines title "piecewise function"
+  *-------------------------------------------------------------------*/
+
 static double smpi_bandwidth_factor(double size)
 {
-         /* case 1 Bytes <= size <=1024 Bytes */
-         if (1 <= size && size <=  1024) {
-                   return(0.188567);
-         }
-         /* case 1536 Bytes <= size <=65536 Bytes */
-         if (1536 <= size && size <=  65536) {
-                   return(0.58527);
-         }
-         /* case 66560 Bytes <= size <=8388608 Bytes */
-         if (66560 <= size && size <=  8388608) {
-                   return(0.933246);
-         }
+
+    if (size >= 65472) return 0.940694;
+    if (size >= 15424) return 0.697866;
+    if (size >= 9376) return 0.58729;
+    if (size >= 5776) return 1.08739;
+    if (size >= 3484) return 0.77493;
+    if (size >= 1426) return 0.608902;
+    if (size >= 732) return 0.341987;
+    if (size >= 257) return 0.338112;
+    if (size >= 0) return 0.812084;
+    return 1.0;
 }
 
 static double smpi_latency_factor(double size)
 {
-         /* case 1 Bytes <= size <=1024 Bytes */
-         if (1 <= size && size <=  1024) {
-                   return(1.1484);
-         }
-         /* case 1536 Bytes <= size <=65536 Bytes */
-         if (1536 <= size && size <=  65536) {
-                   return(1.82006);
-         }
-         /* case 66560 Bytes <= size <=8388608 Bytes */
-         if (66560 <= size && size <=  8388608) {
-                   return(14.6187);
-         }
-}
-
-/**
- *------------------ </copy/paste C code snippet in surf/network.c> ---------------------
- **/
 
+    if (size >= 65472) return 11.6436;
+    if (size >= 15424) return 3.48845;
+    if (size >= 9376) return 2.59299;
+    if (size >= 5776) return 2.18796;
+    if (size >= 3484) return 1.88101;
+    if (size >= 1426) return 1.61075;
+    if (size >= 732) return 1.9503;
+    if (size >= 257) return 1.95341;
+    if (size >= 0) return 2.01467;
+    return 1.0;
+}
+/**--------- <copy/paste C code snippet in surf/network.c> -----------*/
 
 static double smpi_bandwidth_constraint(double rate, double bound,
                                         double size)