kill dead code that annoys sonar

- I guess that these names were intended to help debugging
- but there is no way it can be directly used, as we are filling
  strings where surf usually provides resources. So, nothing of the
  logging or whatsoever can use them.
- Sonar don't like them because we have to cast the constness
- so wipe that out and forget about this file for now.

diff --git a/teshsuite/surf/lmm_usage/lmm_usage.cpp b/teshsuite/surf/lmm_usage/lmm_usage.cpp
index 0d18ec6..c671bda 100644 (file)
--- a/teshsuite/surf/lmm_usage/lmm_usage.cpp
+++ b/teshsuite/surf/lmm_usage/lmm_usage.cpp
@@ -97,14 +97,14 @@ static void test1(method_t method)
     lmm_set_default_protocol_function(func_reno_f, func_reno_fpi, func_reno_fpi);
 
   lmm_system_t Sys = lmm_system_new(1);
     lmm_set_default_protocol_function(func_reno_f, func_reno_fpi, func_reno_fpi);
 
   lmm_system_t Sys = lmm_system_new(1);

-  lmm_constraint_t L1 = lmm_constraint_new(Sys, static_cast<void *>(const_cast<char*>("L1")), a);
-  lmm_constraint_t L2 = lmm_constraint_new(Sys, static_cast<void *>(const_cast<char*>("L2")), b);
-  lmm_constraint_t L3 = lmm_constraint_new(Sys, static_cast<void *>(const_cast<char*>("L3")), a);
+  lmm_constraint_t L1 = lmm_constraint_new(Sys, nullptr, a);
+  lmm_constraint_t L2 = lmm_constraint_new(Sys, nullptr, b);
+  lmm_constraint_t L3 = lmm_constraint_new(Sys, nullptr, a);

 
 

-  lmm_variable_t R_1_2_3 = lmm_variable_new(Sys, static_cast<void *>(const_cast<char*>( "R 1->2->3")), 1.0, -1.0, 3);
-  lmm_variable_t R_1 = lmm_variable_new(Sys, static_cast<void *>(const_cast<char*>( "R 1")), 1.0, -1.0, 1);
-  lmm_variable_t R_2 = lmm_variable_new(Sys, static_cast<void *>(const_cast<char*>( "R 2")), 1.0, -1.0, 1);
-  lmm_variable_t R_3 = lmm_variable_new(Sys, static_cast<void *>(const_cast<char*>( "R 3")), 1.0, -1.0, 1);
+  lmm_variable_t R_1_2_3 = lmm_variable_new(Sys, nullptr, 1.0, -1.0, 3);
+  lmm_variable_t R_1 = lmm_variable_new(Sys, nullptr, 1.0, -1.0, 1);
+  lmm_variable_t R_2 = lmm_variable_new(Sys, nullptr, 1.0, -1.0, 1);
+  lmm_variable_t R_3 = lmm_variable_new(Sys, nullptr, 1.0, -1.0, 1);

 
   lmm_update_variable_weight(Sys, R_1_2_3, 1.0);
   lmm_update_variable_weight(Sys, R_1, 1.0);
 
   lmm_update_variable_weight(Sys, R_1_2_3, 1.0);
   lmm_update_variable_weight(Sys, R_1, 1.0);


@@ -185,11 +185,11 @@ static void test2(method_t method)
     lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi);
 
   lmm_system_t Sys = lmm_system_new(1);
     lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi);
 
   lmm_system_t Sys = lmm_system_new(1);

-  lmm_constraint_t CPU1 = lmm_constraint_new(Sys, static_cast<void *>(const_cast<char*>( "CPU1")), 200.0);
-  lmm_constraint_t CPU2 = lmm_constraint_new(Sys, static_cast<void *>(const_cast<char*>( "CPU2")), 100.0);
+  lmm_constraint_t CPU1 = lmm_constraint_new(Sys, nullptr, 200.0);
+  lmm_constraint_t CPU2 = lmm_constraint_new(Sys, nullptr, 100.0);

 
 

-  lmm_variable_t T1 = lmm_variable_new(Sys, static_cast<void *>(const_cast<char*>( "T1")), 1.0, -1.0, 1);
-  lmm_variable_t T2 = lmm_variable_new(Sys, static_cast<void *>(const_cast<char*>( "T2")), 1.0, -1.0, 1);
+  lmm_variable_t T1 = lmm_variable_new(Sys, nullptr, 1.0, -1.0, 1);
+  lmm_variable_t T2 = lmm_variable_new(Sys, nullptr, 1.0, -1.0, 1);

 
   lmm_update_variable_weight(Sys, T1, 1.0);
   lmm_update_variable_weight(Sys, T2, 1.0);
 
   lmm_update_variable_weight(Sys, T1, 1.0);
   lmm_update_variable_weight(Sys, T2, 1.0);


@@ -218,13 +218,10 @@ static void test3(method_t method)
   int flows = 11;
   int links = 10;
 
   int flows = 11;
   int links = 10;
 

-  double **A;
-
-  /*array to add the the constraints of fictitious variables */
+  double **A = xbt_new0(double *, links + 5);
+  /* array to add the constraints of fictitious variables */

   double B[15] = { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 1, 1, 1, 1, 1 };
 
   double B[15] = { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 1, 1, 1, 1, 1 };
 

-  A = xbt_new0(double *, links + 5);
-

   for (int i = 0; i < links + 5; i++) {
     A[i] = xbt_new0(double, flows + 5);
     for (int j = 0; j < flows + 5; j++) {
   for (int i = 0; i < links + 5; i++) {
     A[i] = xbt_new0(double, flows + 5);
     for (int j = 0; j < flows + 5; j++) {


@@ -260,31 +257,23 @@ static void test3(method_t method)
 
   lmm_system_t Sys = lmm_system_new(1);
 
 
   lmm_system_t Sys = lmm_system_new(1);
 

-  char **tmp_name = xbt_new0(char *, 31);
-

   /* Creates the constraints */
   lmm_constraint_t *tmp_cnst = xbt_new0(lmm_constraint_t, 15);
   /* Creates the constraints */
   lmm_constraint_t *tmp_cnst = xbt_new0(lmm_constraint_t, 15);

-  for (int i = 0; i < 15; i++) {
-    tmp_name[i] = bprintf("C_%03d", i);
-    tmp_cnst[i] = lmm_constraint_new(Sys, static_cast<void *>(tmp_name[i]), B[i]);
-  }
+  for (int i = 0; i < 15; i++) 
+    tmp_cnst[i] = lmm_constraint_new(Sys, nullptr, B[i]);

 
   /* Creates the variables */
   lmm_variable_t *tmp_var = xbt_new0(lmm_variable_t, 16);
   for (int j = 0; j < 16; j++) {
 
   /* Creates the variables */
   lmm_variable_t *tmp_var = xbt_new0(lmm_variable_t, 16);
   for (int j = 0; j < 16; j++) {

-    tmp_name[15 + j] = bprintf("X_%03d", j);
-    tmp_var[j] = lmm_variable_new(Sys, static_cast<void *>(tmp_name[15 + j]), 1.0, -1.0, 15);
+    tmp_var[j] = lmm_variable_new(Sys, nullptr, 1.0, -1.0, 15);

     lmm_update_variable_weight(Sys, tmp_var[j], 1.0);
   }
 
   /* Link constraints and variables */
     lmm_update_variable_weight(Sys, tmp_var[j], 1.0);
   }
 
   /* Link constraints and variables */

-  for (int i = 0; i < 15; i++) {
-    for (int j = 0; j < 16; j++) {
-      if (A[i][j]) {
+  for (int i = 0; i < 15; i++)
+    for (int j = 0; j < 16; j++)
+      if (A[i][j])

         lmm_expand(Sys, tmp_cnst[i], tmp_var[j], 1.0);
         lmm_expand(Sys, tmp_cnst[i], tmp_var[j], 1.0);

-      }
-    }
-  }

 
   if (method == MAXMIN) {
     lmm_solve(Sys);
 
   if (method == MAXMIN) {
     lmm_solve(Sys);


@@ -296,17 +285,13 @@ static void test3(method_t method)
     xbt_die("Invalid method");
   }
 
     xbt_die("Invalid method");
   }
 

-  for (int j = 0; j < 16; j++) {
+  for (int j = 0; j < 16; j++)

     PRINT_VAR(tmp_var[j]);
     PRINT_VAR(tmp_var[j]);

-  }

 
   for (int j = 0; j < 16; j++)
     lmm_variable_free(Sys, tmp_var[j]);
   xbt_free(tmp_var);
   xbt_free(tmp_cnst);
 
   for (int j = 0; j < 16; j++)
     lmm_variable_free(Sys, tmp_var[j]);
   xbt_free(tmp_var);
   xbt_free(tmp_cnst);

-  for (int i = 0; i < 31; i++)
-    xbt_free(tmp_name[i]);
-  xbt_free(tmp_name);

   lmm_system_free(Sys);
   for (int i = 0; i < links + 5; i++)
     xbt_free(A[i]);
   lmm_system_free(Sys);
   for (int i = 0; i < links + 5; i++)
     xbt_free(A[i]);