Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Start the SimDag revolution: function renaming
[simgrid.git] / teshsuite / simdag / platforms / basic_parsing_test.c
index 76bd393..9f6b022 100644 (file)
@@ -32,7 +32,7 @@ int main(int argc, char **argv)
   /* creation of the environment */
   SD_create_environment(argv[1]);
   printf("Workstation number: %d, link number: %d\n",
-         SD_workstation_get_number(), SD_link_get_number());
+         SD_workstation_get_count(), SD_link_get_count());
 
   if (argc >= 3) {
     if (!strcmp(argv[2], "ONE_LINK")) {
@@ -49,16 +49,16 @@ int main(int argc, char **argv)
       for (i = 0; i < route_size; i++) {
       printf("  Link %s: latency = %f, bandwidth = %f\n",
            SD_link_get_name(route[i]),
-           SD_link_get_current_latency(route[i]),
-           SD_link_get_current_bandwidth(route[i]));
+           SD_link_get_latency(route[i]),
+           SD_link_get_bandwidth(route[i]));
       }
       printf("Route latency = %f, route bandwidth = %f\n",
-         SD_route_get_current_latency(w1, w2),
-         SD_route_get_current_bandwidth(w1, w2));
+         SD_route_get_latency(w1, w2),
+         SD_route_get_bandwidth(w1, w2));
     }
     if (!strcmp(argv[2], "FULL_LINK")) {
       workstations = SD_workstation_get_list();
-      list_size = SD_workstation_get_number();
+      list_size = SD_workstation_get_count();
       for (i = 0; i < list_size; i++) {
       w1 = workstations[i];
       name1 = SD_workstation_get_name(w1);
@@ -72,12 +72,12 @@ int main(int argc, char **argv)
         for (k = 0; k < route_size; k++) {
         printf("  Link %s: latency = %f, bandwidth = %f\n",
              SD_link_get_name(route[k]),
-             SD_link_get_current_latency(route[k]),
-             SD_link_get_current_bandwidth(route[k]));
+             SD_link_get_latency(route[k]),
+             SD_link_get_bandwidth(route[k]));
         }
         printf("  Route latency = %f, route bandwidth = %f\n",
-           SD_route_get_current_latency(w1, w2),
-           SD_route_get_current_bandwidth(w1, w2));
+           SD_route_get_latency(w1, w2),
+           SD_route_get_bandwidth(w1, w2));
       }
       }
     }