From: Navarrop <Pierre.Navarro@imag.fr>
Date: Wed, 9 Nov 2011 12:48:06 +0000 (+0100)
Subject: For radical it is "," and not ";"
X-Git-Tag: exp_20120216~393
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/806a5b5e183c163668ffc9b324608c706de0e88c

For radical it is "," and not ";"
---

diff --git a/buildtools/Cmake/generate_g5k_platform_cabinets.pl b/buildtools/Cmake/generate_g5k_platform_cabinets.pl
index f5009f3f33..08fdad0513 100644
--- a/buildtools/Cmake/generate_g5k_platform_cabinets.pl
+++ b/buildtools/Cmake/generate_g5k_platform_cabinets.pl
@@ -235,7 +235,7 @@ sub get_switch {
 						{
 							if(!($radical =~ /^$/))
 							{
-								$radical = $radical.";";
+								$radical = $radical.",";
 							}
 							$radical = $radical.$deb."-".$fin;
 							$deb = $num[$i];
@@ -243,7 +243,7 @@ sub get_switch {
 						}
 						else
 						{
-							$radical=$radical.";".$num[$i];
+							$radical=$radical.",".$num[$i];
 						}
 			
 					}
diff --git a/examples/platforms/One_cluster.xml b/examples/platforms/One_cluster.xml
index a638eae8f3..18db17a434 100644
--- a/examples/platforms/One_cluster.xml
+++ b/examples/platforms/One_cluster.xml
@@ -1,14 +1,14 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<!--              _________
-				|	       |
-				|  router  |
-	____________|__________|_____________ backbone
-	  |   |   |              |     |   |  	
-    l0|	l1|	l2|           l97| l96 |   | l99
-      |	  |	  |   ........   |     |   |
+<!--             _________
+                |          |
+                |  router  |
+    ____________|__________|_____________ backbone
+      |   |   |              |     |   |  	
+    l0|	l1| l2|           l97| l96 |   | l99
+      |   |   |   ........   |     |   |
       |                                |
-   c-0.me                             c-99.me	
+    c-0.me                             c-99.me	
 -->
 <platform version="3">
 <AS  id="AS0"  routing="Full">
diff --git a/examples/platforms/One_cluster_no_backbone.xml b/examples/platforms/One_cluster_no_backbone.xml
index 205433442c..a5ac5140b4 100644
--- a/examples/platforms/One_cluster_no_backbone.xml
+++ b/examples/platforms/One_cluster_no_backbone.xml
@@ -1,16 +1,16 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 
-<!--              _________
-				|	       |
-				|  router  |
-				|__________|
-					/ | \
-				   /  |  \
-			   l0 / l1|   \l2 
-				 /    |    \
-				/	  |     \
-			host0   host1   host2	
+<!--             _________
+                |          |
+                |  router  |
+                |__________|
+                    / | \
+                   /  |  \
+               l0 / l1|   \l2 
+                 /    |    \
+                /     |     \
+            host0   host1   host2	
 -->
 
 <platform version="3">
diff --git a/examples/platforms/g5k_cabinets.xml b/examples/platforms/g5k_cabinets.xml
index dfb95028a9..9d20e6c973 100644
--- a/examples/platforms/g5k_cabinets.xml
+++ b/examples/platforms/g5k_cabinets.xml
@@ -250,7 +250,7 @@
 
 			<AS id="AS_griffon" routing="RuleBased" >
 				<cluster id="AS_sgriffon1" prefix="griffon-" suffix=".nancy.grid5000.fr"
-					radical="1-29;58-60" power="20.678E9" bw="1.25E8" lat="1.0E-4"
+					radical="1-29,58-60" power="20.678E9" bw="1.25E8" lat="1.0E-4"
 					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
 				<cluster id="AS_sgriffon2" prefix="griffon-" suffix=".nancy.grid5000.fr"
 					radical="30-57" power="20.678E9" bw="1.25E8" lat="1.0E-4"