Added the weight model improvements to lagrange models.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6104 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/surf/network.c b/src/surf/network.c
index a8596dc..fd42c0c 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -847,6 +847,10 @@ void surf_network_model_init_Reno(const char *filename)
                                    func_reno_fpi);
   network_solve = lagrange_solve;
 
                                    func_reno_fpi);
   network_solve = lagrange_solve;
 

+  latency_factor = 10.4;
+  bandwidth_factor = 0.92;
+  weight_S_parameter = 8775;
+

   update_model_description(surf_network_model_description,
                           "Reno",
                           (surf_model_t) surf_network_model);
   update_model_description(surf_network_model_description,
                           "Reno",
                           (surf_model_t) surf_network_model);


@@ -865,6 +869,10 @@ void surf_network_model_init_Reno2(const char *filename)
                                    func_reno2_fpi);
   network_solve = lagrange_solve;
 
                                    func_reno2_fpi);
   network_solve = lagrange_solve;
 

+  latency_factor = 10.4;
+  bandwidth_factor = 0.92;
+  weight_S_parameter = 8775;
+

   update_model_description(surf_network_model_description,
                           "Reno2",
                           (surf_model_t) surf_network_model);
   update_model_description(surf_network_model_description,
                           "Reno2",
                           (surf_model_t) surf_network_model);


@@ -882,6 +890,10 @@ void surf_network_model_init_Vegas(const char *filename)
                                    func_vegas_fpi);
   network_solve = lagrange_solve;
 
                                    func_vegas_fpi);
   network_solve = lagrange_solve;
 

+  latency_factor = 10.4;
+  bandwidth_factor = 0.92;
+  weight_S_parameter = 8775;
+

   update_model_description(surf_network_model_description,
                           "Vegas",
                           (surf_model_t) surf_network_model);
   update_model_description(surf_network_model_description,
                           "Vegas",
                           (surf_model_t) surf_network_model);