Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Test for parsing file.
authornavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Tue, 28 Sep 2010 08:54:24 +0000 (08:54 +0000)
committernavarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Tue, 28 Sep 2010 08:54:24 +0000 (08:54 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8279 48e7efb5-ca39-0410-a469-dd3cf9ba447f

examples/platforms/vivaldi.xml
teshsuite/simdag/platforms/basic_parsing_test.c

index 6fde4c8..f816e67 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
 <platform version="2">
+ <AS  id="AS0"  routing="Full">
        <host id="100030591" vivaldi="25.5 9.4 1.4" power="1500000000.0" />
        <host id="100036570" vivaldi="-12.7 -9.9 2.1" power="730000000.0" />
        <host id="100041334" vivaldi="-15.7 9.9 14.7" power="2800000000.0" />
@@ -41,4 +42,5 @@
        <host id="100422926" vivaldi="-23.1 -7.6 39.9" power="1600000000.0" />
        <host id="100427449" vivaldi="135.5 -21.0 83.4" power="1400000000.0" />
        <host id="100429957" vivaldi="17.5 6.7 18.8" power="830000000.0" />
+       </AS>
 </platform>
\ No newline at end of file
index 22d012d..f7ed304 100644 (file)
@@ -24,7 +24,7 @@ int main(int argc, char **argv)
   /* creation of the environment */
   SD_create_environment(argv[1]);
 
-  printf("\n\nWorkstation number: %d, link number: %d\n\n",
+  printf("Workstation number: %d, link number: %d\n",
          SD_workstation_get_number(), SD_link_get_number());
 
   workstations = SD_workstation_get_list();
@@ -36,12 +36,13 @@ int main(int argc, char **argv)
   printf("Route between %s and %s\n", name1, name2);
   route = SD_route_get_list(w1, w2);
   route_size = SD_route_get_size(w1, w2);
+  printf("Route size %d\n", route_size);
   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]));
   }
-  printf("Route latency = %f, route bandwidth = %fn",
+  printf("Route latency = %f, route bandwidth = %f\n",
         SD_route_get_current_latency(w1, w2),
         SD_route_get_current_bandwidth(w1, w2));