Whitespace cleanup.

diff --git a/Experimentations/grid16.xml b/Experimentations/grid16.xml
index df563430429acc493b9c82047f66d5744b621308..cef22d0a1bfd8470a91f6965e8265392476f4753 100644 (file)
--- a/Experimentations/grid16.xml
+++ b/Experimentations/grid16.xml
@@ -6,7 +6,7 @@
 <!-- ....................................................... 24/09/2010 ... -->
 <!-- ...................................................................... -->
 <!--
-     ../ AS file structure /............................................... 
+     ../ AS file structure /...............................................
 
    AS_grid5000(Floyd)
                                       _______________
@@ -17,10 +17,10 @@
                           |               |  |  |               |
                           | AS_chti       |  |  | AS_sagittaire |
                           |_______________|  .  |_______________|
-               _______________   |    _______________   |   _______________    
-              |               |  |   |               |  |  |               |   
-              | AS_chicon     |  |   | AS_chuque     |  |  | AS_capricorne |   
-              |_______________|  |   |_______________|  |  |_______________|   
+               _______________   |    _______________   |   _______________
+              |               |  |   |               |  |  |               |
+              | AS_chicon     |  |   | AS_chuque     |  |  | AS_capricorne |
+              |_______________|  |   |_______________|  |  |_______________|
   _______________           |    |     |     .          |    |       _______________
  |               |          |    |     |     |          |    |      |               |
  | AS_bordemer   |     _____|____|_____|_____|__________|____|_     | AS_grelon     |
@@ -37,25 +37,25 @@
  |               |    |                                        |    |               |
  | AS_borderline |____|                                        |____| AS_gdx2       |
  |_______________|    |                                        |    |_______________|
-  _______________     |                                        |     _______________ 
- |               |    |                                        |    |               | 
- | AS_pastel     |____|                                        |____| AS_azur       | 
- |_______________|    |                                        |    |_______________| 
+  _______________     |                                        |     _______________
+ |               |    |                                        |    |               |
+ | AS_pastel     |____|                                        |____| AS_azur       |
+ |_______________|    |                                        |    |_______________|
   _______________     |                                        |     _______________
  |               |____|                                        |    |               |
  | AS_violette   |    |________________________________________|____| AS_helios     |
- |_______________|       |     |     |     |               | |      |_______________| 
+ |_______________|       |     |     |     |               | |      |_______________|
                          |     |     |     |               | |      _______________
              ____________|__   |     |   __|____________   | |     |               |
             |               |  |     |  |               |  | \____-| AS_sol        |
-            | AS_paramount  |  |     |  | AS_paraquad   |  |       |_______________| 
-            |_______________|  |     |  |_______________|  |       _______________     
+            | AS_paramount  |  |     |  | AS_paraquad   |  |       |_______________|
+            |_______________|  |     |  |_______________|  |       _______________
                   _____________|_   _|_____________        |      |               |
                  |               | |               |       \______| AS_suno       |
                  | AS_paradent   | | AS_parapide   |              |_______________|
-                 |_______________| |_______________| 
-                 
-     ../ Cluster description /............................................. 
+                 |_______________| |_______________|
+
+     ../ Cluster description /.............................................
 
         bordemer   - bordeaux | nodes=4     power=1e9
         chicon     - lille    | nodes=4     power=1e9
@@ -68,22 +68,22 @@
   <cluster id="AS_bordemer" prefix="bordemer-" suffix=".bordeaux.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_grelon" prefix="grelon-" suffix=".nancy.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_azur" prefix="azur-" suffix=".sophia.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
-  
+
+
   <AS id="AS_network" routing="Floyd" >
-  
+
     <router id="Lille_sw"/>
     <router id="Paris_sw"/>
     <router id="Luxemburg_sw"/>
@@ -95,7 +95,7 @@
     <router id="Marseille_sw"/>
     <router id="Sophia_sw"/>
     <router id="Toulouse_sw"/>
-    
+
     <router id="Lille_gw"/>
     <router id="Orsay_gw"/>
     <router id="Luxemburg_gw"/>
@@ -106,7 +106,7 @@
     <router id="Grenoble_gw"/>
     <router id="Sophia_gw"/>
     <router id="Toulouse_gw"/>
-    
+
     <link id="Lille_Paris"        bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Luxemburg_Nancy"    bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Paris_Nancy"        bandwidth="1.25E9" latency="1.0E-4"/>
@@ -117,7 +117,7 @@
     <link id="Lyon_Marseille"     bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Marseille_Sophia"   bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Marseille_Toulouse" bandwidth="1.25E9" latency="1.0E-4"/>
-    
+
     <link id="Lille_sw_gw"     bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Orsay_sw_gw"     bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Luxemburg_sw_gw" bandwidth="1.25E9" latency="1.0E-4"/>
@@ -128,7 +128,7 @@
     <link id="Grenoble_sw_gw"  bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Sophia_sw_gw"    bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Toulouse_sw_gw"  bandwidth="1.25E9" latency="1.0E-4"/>
-    
+
     <route src="Lille_sw"     dst="Paris_sw"     ><link_ctn id="Lille_Paris"/></route>
     <route src="Paris_sw"     dst="Lille_sw"     ><link_ctn id="Lille_Paris"/></route>
     <route src="Luxemburg_sw" dst="Nancy_sw"     ><link_ctn id="Luxemburg_Nancy"/></route>
@@ -149,7 +149,7 @@
     <route src="Sophia_sw"    dst="Marseille_sw" ><link_ctn id="Marseille_Sophia"/></route>
     <route src="Marseille_sw" dst="Toulouse_sw"  ><link_ctn id="Marseille_Toulouse"/></route>
     <route src="Toulouse_sw"  dst="Marseille_sw" ><link_ctn id="Marseille_Toulouse"/></route>
-    
+
     <route src="Lille_gw"     dst="Lille_sw"     ><link_ctn id="Lille_sw_gw"/></route>
     <route src="Lille_sw"     dst="Lille_gw"     ><link_ctn id="Lille_sw_gw"/></route>
     <route src="Orsay_gw"     dst="Paris_sw"     ><link_ctn id="Orsay_sw_gw"/></route>
@@ -170,9 +170,9 @@
     <route src="Sophia_sw"    dst="Sophia_gw"    ><link_ctn id="Sophia_sw_gw"/></route>
     <route src="Toulouse_gw"  dst="Toulouse_sw"  ><link_ctn id="Toulouse_sw_gw"/></route>
     <route src="Toulouse_sw"  dst="Toulouse_gw"  ><link_ctn id="Toulouse_sw_gw"/></route>
-    
+
   </AS>
-  
+
   <link id="bordemer_gw"   bandwidth="1.25E8" latency="1.0E-4"/>
   <link id="bordeplage_gw" bandwidth="1.25E8" latency="1.0E-4"/>
   <link id="chicon_gw"     bandwidth="1.25E8" latency="1.0E-4"/>
@@ -189,7 +189,7 @@
   <link id="helios_gw"     bandwidth="1.25E8" latency="1.0E-4"/>
   <link id="pastel_gw"     bandwidth="1.25E8" latency="1.0E-4"/>
   <link id="violette_gw"   bandwidth="1.25E8" latency="1.0E-4"/>
-  
+
   <ASroute src="AS_bordemer"    dst="AS_network"     gw_src="bordemer-AS_bordemer_router.bordeaux.grid5000.fr"  gw_dst="Bordeaux_gw"    ><link_ctn id="bordemer_gw"/></ASroute>
   <ASroute src="AS_network"     dst="AS_bordemer"    gw_src="Bordeaux_gw"  gw_dst="bordemer-AS_bordemer_router.bordeaux.grid5000.fr"    ><link_ctn id="bordemer_gw"/></ASroute>
   <ASroute src="AS_chicon"      dst="AS_network"     gw_src="chicon-AS_chicon_router.lille.grid5000.fr"       gw_dst="Lille_gw"       ><link_ctn id="chicon_gw"/></ASroute>
@@ -198,7 +198,7 @@
   <ASroute src="AS_network"     dst="AS_grelon"      gw_src="Nancy_gw"     gw_dst="grelon-AS_grelon_router.nancy.grid5000.fr"         ><link_ctn id="grelon_gw"/></ASroute>
   <ASroute src="AS_azur"        dst="AS_network"     gw_src="azur-AS_azur_router.sophia.grid5000.fr"         gw_dst="Sophia_gw"     ><link_ctn id="azur_gw"/></ASroute>
   <ASroute src="AS_network"     dst="AS_azur"        gw_src="Sophia_gw"    gw_dst="azur-AS_azur_router.sophia.grid5000.fr"          ><link_ctn id="azur_gw"/></ASroute>
-    
+
 </AS>
 
 </platform>

diff --git a/Experimentations/grid256.xml b/Experimentations/grid256.xml
index e989e1337b0b33b4490d1c5895652699a6ba884b..bae7a2906108042f5cbbc782c066bcd31ecde7a3 100644 (file)
--- a/Experimentations/grid256.xml
+++ b/Experimentations/grid256.xml
@@ -6,7 +6,7 @@
 <!-- ....................................................... 24/09/2010 ... -->
 <!-- ...................................................................... -->
 <!--
-     ../ AS file structure /............................................... 
+     ../ AS file structure /...............................................
 
    AS_grid5000(Floyd)
                                       _______________
@@ -17,10 +17,10 @@
                           |               |  |  |               |
                           | AS_chti       |  |  | AS_sagittaire |
                           |_______________|  .  |_______________|
-               _______________   |    _______________   |   _______________    
-              |               |  |   |               |  |  |               |   
-              | AS_chicon     |  |   | AS_chuque     |  |  | AS_capricorne |   
-              |_______________|  |   |_______________|  |  |_______________|   
+               _______________   |    _______________   |   _______________
+              |               |  |   |               |  |  |               |
+              | AS_chicon     |  |   | AS_chuque     |  |  | AS_capricorne |
+              |_______________|  |   |_______________|  |  |_______________|
   _______________           |    |     |     .          |    |       _______________
  |               |          |    |     |     |          |    |      |               |
  | AS_bordemer   |     _____|____|_____|_____|__________|____|_     | AS_grelon     |
@@ -37,25 +37,25 @@
  |               |    |                                        |    |               |
  | AS_borderline |____|                                        |____| AS_gdx2       |
  |_______________|    |                                        |    |_______________|
-  _______________     |                                        |     _______________ 
- |               |    |                                        |    |               | 
- | AS_pastel     |____|                                        |____| AS_azur       | 
- |_______________|    |                                        |    |_______________| 
+  _______________     |                                        |     _______________
+ |               |    |                                        |    |               |
+ | AS_pastel     |____|                                        |____| AS_azur       |
+ |_______________|    |                                        |    |_______________|
   _______________     |                                        |     _______________
  |               |____|                                        |    |               |
  | AS_violette   |    |________________________________________|____| AS_helios     |
- |_______________|       |     |     |     |               | |      |_______________| 
+ |_______________|       |     |     |     |               | |      |_______________|
                          |     |     |     |               | |      _______________
              ____________|__   |     |   __|____________   | |     |               |
             |               |  |     |  |               |  | \____-| AS_sol        |
-            | AS_paramount  |  |     |  | AS_paraquad   |  |       |_______________| 
-            |_______________|  |     |  |_______________|  |       _______________     
+            | AS_paramount  |  |     |  | AS_paraquad   |  |       |_______________|
+            |_______________|  |     |  |_______________|  |       _______________
                   _____________|_   _|_____________        |      |               |
                  |               | |               |       \______| AS_suno       |
                  | AS_paradent   | | AS_parapide   |              |_______________|
-                 |_______________| |_______________| 
-                 
-     ../ Cluster description /............................................. 
+                 |_______________| |_______________|
+
+     ../ Cluster description /.............................................
 
         bordemer   - bordeaux | nodes=11    power=1e9
         bordeplage - bordeaux | nodes=11    power=1e9
@@ -88,102 +88,102 @@
   <cluster id="AS_bordemer" prefix="bordemer-" suffix=".bordeaux.grid5000.fr"
    radical="1-11" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeaux.grid5000.fr"
    radical="1-11" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_bordereau" prefix="bordereau-" suffix=".bordeaux.grid5000.fr"
    radical="1-11" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_borderline" prefix="borderline-" suffix=".bordeaux.grid5000.fr"
    radical="1-10" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr"
    radical="1-11" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_chti" prefix="chti-" suffix=".lille.grid5000.fr"
    radical="1-11" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_chuque" prefix="chuque-" suffix=".lille.grid5000.fr"
    radical="1-11" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_chinqchint" prefix="chinqchint-" suffix=".lille.grid5000.fr"
    radical="1-10" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_capricorne" prefix="capricorne-" suffix=".lyon.grid5000.fr"
    radical="1-11" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".lyon.grid5000.fr"
    radical="1-10" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_grelon" prefix="grelon-" suffix=".nancy.grid5000.fr"
    radical="1-11" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_griffon" prefix="griffon-" suffix=".nancy.grid5000.fr"
    radical="1-10" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_gdx" prefix="gdx-" suffix=".orsay.grid5000.fr"
    radical="1-11" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_gdx2" prefix="gdx2-" suffix=".orsay.grid5000.fr"
    radical="1-10" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_paramount" prefix="paramount-" suffix=".rennes.grid5000.fr"
    radical="1-11" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_paraquad" prefix="paraquad-" suffix=".rennes.grid5000.fr"
    radical="1-11" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-  
+
   <cluster id="AS_paradent" prefix="paradent-" suffix=".rennes.grid5000.fr"
    radical="1-11" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_parapide" prefix="parapide-" suffix=".rennes.grid5000.fr"
    radical="1-10" power="1e9" bw="1.25E8" lat="1.0E-4"
-   bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>   
-   
+   bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+
   <cluster id="AS_azur" prefix="azur-" suffix=".sophia.grid5000.fr"
    radical="1-11" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_helios" prefix="helios-" suffix=".sophia.grid5000.fr"
    radical="1-11" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_sol" prefix="sol-" suffix=".sophia.grid5000.fr"
    radical="1-11" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_suno" prefix="suno-" suffix=".sophia.grid5000.fr"
    radical="1-10" power="1e9" bw="1.25E8" lat="1.0E-4"
-   bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>  
-   
+   bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+
   <cluster id="AS_pastel" prefix="pastel-" suffix=".toulouse.grid5000.fr"
    radical="1-11" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_violette" prefix="violette-" suffix=".toulouse.grid5000.fr"
    radical="1-10" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
 
-  
+
   <AS id="AS_network" routing="Floyd" >
-  
+
     <router id="Lille_sw"/>
     <router id="Paris_sw"/>
     <router id="Luxemburg_sw"/>
@@ -195,7 +195,7 @@
     <router id="Marseille_sw"/>
     <router id="Sophia_sw"/>
     <router id="Toulouse_sw"/>
-    
+
     <router id="Lille_gw"/>
     <router id="Orsay_gw"/>
     <router id="Luxemburg_gw"/>
@@ -206,7 +206,7 @@
     <router id="Grenoble_gw"/>
     <router id="Sophia_gw"/>
     <router id="Toulouse_gw"/>
-    
+
     <link id="Lille_Paris"        bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Luxemburg_Nancy"    bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Paris_Nancy"        bandwidth="1.25E9" latency="1.0E-4"/>
@@ -217,7 +217,7 @@
     <link id="Lyon_Marseille"     bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Marseille_Sophia"   bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Marseille_Toulouse" bandwidth="1.25E9" latency="1.0E-4"/>
-    
+
     <link id="Lille_sw_gw"     bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Orsay_sw_gw"     bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Luxemburg_sw_gw" bandwidth="1.25E9" latency="1.0E-4"/>
@@ -228,7 +228,7 @@
     <link id="Grenoble_sw_gw"  bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Sophia_sw_gw"    bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Toulouse_sw_gw"  bandwidth="1.25E9" latency="1.0E-4"/>
-    
+
     <route src="Lille_sw"     dst="Paris_sw"     ><link_ctn id="Lille_Paris"/></route>
     <route src="Paris_sw"     dst="Lille_sw"     ><link_ctn id="Lille_Paris"/></route>
     <route src="Luxemburg_sw" dst="Nancy_sw"     ><link_ctn id="Luxemburg_Nancy"/></route>
@@ -249,7 +249,7 @@
     <route src="Sophia_sw"    dst="Marseille_sw" ><link_ctn id="Marseille_Sophia"/></route>
     <route src="Marseille_sw" dst="Toulouse_sw"  ><link_ctn id="Marseille_Toulouse"/></route>
     <route src="Toulouse_sw"  dst="Marseille_sw" ><link_ctn id="Marseille_Toulouse"/></route>
-    
+
     <route src="Lille_gw"     dst="Lille_sw"     ><link_ctn id="Lille_sw_gw"/></route>
     <route src="Lille_sw"     dst="Lille_gw"     ><link_ctn id="Lille_sw_gw"/></route>
     <route src="Orsay_gw"     dst="Paris_sw"     ><link_ctn id="Orsay_sw_gw"/></route>
@@ -270,9 +270,9 @@
     <route src="Sophia_sw"    dst="Sophia_gw"    ><link_ctn id="Sophia_sw_gw"/></route>
     <route src="Toulouse_gw"  dst="Toulouse_sw"  ><link_ctn id="Toulouse_sw_gw"/></route>
     <route src="Toulouse_sw"  dst="Toulouse_gw"  ><link_ctn id="Toulouse_sw_gw"/></route>
-    
+
   </AS>
-  
+
   <link id="bordemer_gw"   bandwidth="1.25E8" latency="1.0E-4"/>
   <link id="bordeplage_gw" bandwidth="1.25E8" latency="1.0E-4"/>
   <link id="bordereau_gw"  bandwidth="1.25E8" latency="1.0E-4"/>
@@ -297,7 +297,7 @@
   <link id="suno_gw"       bandwidth="1.25E8" latency="1.0E-4"/>
   <link id="pastel_gw"     bandwidth="1.25E8" latency="1.0E-4"/>
   <link id="violette_gw"   bandwidth="1.25E8" latency="1.0E-4"/>
-  
+
   <ASroute src="AS_bordemer"    dst="AS_network"     gw_src="bordemer-AS_bordemer_router.bordeaux.grid5000.fr"  gw_dst="Bordeaux_gw"    ><link_ctn id="bordemer_gw"/></ASroute>
   <ASroute src="AS_network"     dst="AS_bordemer"    gw_src="Bordeaux_gw"  gw_dst="bordemer-AS_bordemer_router.bordeaux.grid5000.fr"    ><link_ctn id="bordemer_gw"/></ASroute>
   <ASroute src="AS_bordeplage"  dst="AS_network"     gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr"   gw_dst="Bordeaux_gw" ><link_ctn id="bordeplage_gw"/></ASroute>
@@ -346,7 +346,7 @@
   <ASroute src="AS_network"     dst="AS_pastel"      gw_src="Toulouse_gw"  gw_dst="pastel-AS_pastel_router.toulouse.grid5000.fr"      ><link_ctn id="pastel_gw"/></ASroute>
   <ASroute src="AS_violette"    dst="AS_network"     gw_src="violette-AS_violette_router.toulouse.grid5000.fr"     gw_dst="Toulouse_gw" ><link_ctn id="violette_gw"/></ASroute>
   <ASroute src="AS_network"     dst="AS_violette"    gw_src="Toulouse_gw"  gw_dst="violette-AS_violette_router.toulouse.grid5000.fr"    ><link_ctn id="violette_gw"/></ASroute>
-    
+
 </AS>
 
 </platform>

diff --git a/Experimentations/grid64.xml b/Experimentations/grid64.xml
index 9bcab4594029b075cebff64d248fad732703a35a..7338ac558f80924c73dc627417f5907cd5816b78 100644 (file)
--- a/Experimentations/grid64.xml
+++ b/Experimentations/grid64.xml
@@ -6,7 +6,7 @@
 <!-- ....................................................... 24/09/2010 ... -->
 <!-- ...................................................................... -->
 <!--
-     ../ AS file structure /............................................... 
+     ../ AS file structure /...............................................
 
    AS_grid5000(Floyd)
                                       _______________
@@ -17,10 +17,10 @@
                           |               |  |  |               |
                           | AS_chti       |  |  | AS_sagittaire |
                           |_______________|  .  |_______________|
-               _______________   |    _______________   |   _______________    
-              |               |  |   |               |  |  |               |   
-              | AS_chicon     |  |   | AS_chuque     |  |  | AS_capricorne |   
-              |_______________|  |   |_______________|  |  |_______________|   
+               _______________   |    _______________   |   _______________
+              |               |  |   |               |  |  |               |
+              | AS_chicon     |  |   | AS_chuque     |  |  | AS_capricorne |
+              |_______________|  |   |_______________|  |  |_______________|
   _______________           |    |     |     .          |    |       _______________
  |               |          |    |     |     |          |    |      |               |
  | AS_bordemer   |     _____|____|_____|_____|__________|____|_     | AS_grelon     |
@@ -37,25 +37,25 @@
  |               |    |                                        |    |               |
  | AS_borderline |____|                                        |____| AS_gdx2       |
  |_______________|    |                                        |    |_______________|
-  _______________     |                                        |     _______________ 
- |               |    |                                        |    |               | 
- | AS_pastel     |____|                                        |____| AS_azur       | 
- |_______________|    |                                        |    |_______________| 
+  _______________     |                                        |     _______________
+ |               |    |                                        |    |               |
+ | AS_pastel     |____|                                        |____| AS_azur       |
+ |_______________|    |                                        |    |_______________|
   _______________     |                                        |     _______________
  |               |____|                                        |    |               |
  | AS_violette   |    |________________________________________|____| AS_helios     |
- |_______________|       |     |     |     |               | |      |_______________| 
+ |_______________|       |     |     |     |               | |      |_______________|
                          |     |     |     |               | |      _______________
              ____________|__   |     |   __|____________   | |     |               |
             |               |  |     |  |               |  | \____-| AS_sol        |
-            | AS_paramount  |  |     |  | AS_paraquad   |  |       |_______________| 
-            |_______________|  |     |  |_______________|  |       _______________     
+            | AS_paramount  |  |     |  | AS_paraquad   |  |       |_______________|
+            |_______________|  |     |  |_______________|  |       _______________
                   _____________|_   _|_____________        |      |               |
                  |               | |               |       \______| AS_suno       |
                  | AS_paradent   | | AS_parapide   |              |_______________|
-                 |_______________| |_______________| 
-                 
-     ../ Cluster description /............................................. 
+                 |_______________| |_______________|
+
+     ../ Cluster description /.............................................
 
         bordemer   - bordeaux | nodes=4     power=1e9
         bordeplage - bordeaux | nodes=4     power=1e9
@@ -80,7 +80,7 @@
   <cluster id="AS_bordemer" prefix="bordemer-" suffix=".bordeaux.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeaux.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
@@ -88,62 +88,62 @@
   <cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_chti" prefix="chti-" suffix=".lille.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_capricorne" prefix="capricorne-" suffix=".lyon.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".lyon.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_grelon" prefix="grelon-" suffix=".nancy.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_griffon" prefix="griffon-" suffix=".nancy.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_gdx" prefix="gdx-" suffix=".orsay.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_gdx2" prefix="gdx2-" suffix=".orsay.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_paramount" prefix="paramount-" suffix=".rennes.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_paraquad" prefix="paraquad-" suffix=".rennes.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-  
+
   <cluster id="AS_azur" prefix="azur-" suffix=".sophia.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_helios" prefix="helios-" suffix=".sophia.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_pastel" prefix="pastel-" suffix=".toulouse.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-   
+
   <cluster id="AS_violette" prefix="violette-" suffix=".toulouse.grid5000.fr"
    radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
    bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
 
-  
+
   <AS id="AS_network" routing="Floyd" >
-  
+
     <router id="Lille_sw"/>
     <router id="Paris_sw"/>
     <router id="Luxemburg_sw"/>
@@ -155,7 +155,7 @@
     <router id="Marseille_sw"/>
     <router id="Sophia_sw"/>
     <router id="Toulouse_sw"/>
-    
+
     <router id="Lille_gw"/>
     <router id="Orsay_gw"/>
     <router id="Luxemburg_gw"/>
@@ -166,7 +166,7 @@
     <router id="Grenoble_gw"/>
     <router id="Sophia_gw"/>
     <router id="Toulouse_gw"/>
-    
+
     <link id="Lille_Paris"        bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Luxemburg_Nancy"    bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Paris_Nancy"        bandwidth="1.25E9" latency="1.0E-4"/>
@@ -177,7 +177,7 @@
     <link id="Lyon_Marseille"     bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Marseille_Sophia"   bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Marseille_Toulouse" bandwidth="1.25E9" latency="1.0E-4"/>
-    
+
     <link id="Lille_sw_gw"     bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Orsay_sw_gw"     bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Luxemburg_sw_gw" bandwidth="1.25E9" latency="1.0E-4"/>
@@ -188,7 +188,7 @@
     <link id="Grenoble_sw_gw"  bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Sophia_sw_gw"    bandwidth="1.25E9" latency="1.0E-4"/>
     <link id="Toulouse_sw_gw"  bandwidth="1.25E9" latency="1.0E-4"/>
-    
+
     <route src="Lille_sw"     dst="Paris_sw"     ><link_ctn id="Lille_Paris"/></route>
     <route src="Paris_sw"     dst="Lille_sw"     ><link_ctn id="Lille_Paris"/></route>
     <route src="Luxemburg_sw" dst="Nancy_sw"     ><link_ctn id="Luxemburg_Nancy"/></route>
@@ -209,7 +209,7 @@
     <route src="Sophia_sw"    dst="Marseille_sw" ><link_ctn id="Marseille_Sophia"/></route>
     <route src="Marseille_sw" dst="Toulouse_sw"  ><link_ctn id="Marseille_Toulouse"/></route>
     <route src="Toulouse_sw"  dst="Marseille_sw" ><link_ctn id="Marseille_Toulouse"/></route>
-    
+
     <route src="Lille_gw"     dst="Lille_sw"     ><link_ctn id="Lille_sw_gw"/></route>
     <route src="Lille_sw"     dst="Lille_gw"     ><link_ctn id="Lille_sw_gw"/></route>
     <route src="Orsay_gw"     dst="Paris_sw"     ><link_ctn id="Orsay_sw_gw"/></route>
@@ -230,9 +230,9 @@
     <route src="Sophia_sw"    dst="Sophia_gw"    ><link_ctn id="Sophia_sw_gw"/></route>
     <route src="Toulouse_gw"  dst="Toulouse_sw"  ><link_ctn id="Toulouse_sw_gw"/></route>
     <route src="Toulouse_sw"  dst="Toulouse_gw"  ><link_ctn id="Toulouse_sw_gw"/></route>
-    
+
   </AS>
-  
+
   <link id="bordemer_gw"   bandwidth="1.25E8" latency="1.0E-4"/>
   <link id="bordeplage_gw" bandwidth="1.25E8" latency="1.0E-4"/>
   <link id="chicon_gw"     bandwidth="1.25E8" latency="1.0E-4"/>
@@ -249,7 +249,7 @@
   <link id="helios_gw"     bandwidth="1.25E8" latency="1.0E-4"/>
   <link id="pastel_gw"     bandwidth="1.25E8" latency="1.0E-4"/>
   <link id="violette_gw"   bandwidth="1.25E8" latency="1.0E-4"/>
-  
+
   <ASroute src="AS_bordemer"    dst="AS_network"     gw_src="bordemer-AS_bordemer_router.bordeaux.grid5000.fr"  gw_dst="Bordeaux_gw"    ><link_ctn id="bordemer_gw"/></ASroute>
   <ASroute src="AS_network"     dst="AS_bordemer"    gw_src="Bordeaux_gw"  gw_dst="bordemer-AS_bordemer_router.bordeaux.grid5000.fr"    ><link_ctn id="bordemer_gw"/></ASroute>
   <ASroute src="AS_bordeplage"  dst="AS_network"     gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr"   gw_dst="Bordeaux_gw" ><link_ctn id="bordeplage_gw"/></ASroute>
@@ -282,7 +282,7 @@
   <ASroute src="AS_network"     dst="AS_pastel"      gw_src="Toulouse_gw"  gw_dst="pastel-AS_pastel_router.toulouse.grid5000.fr"      ><link_ctn id="pastel_gw"/></ASroute>
   <ASroute src="AS_violette"    dst="AS_network"     gw_src="violette-AS_violette_router.toulouse.grid5000.fr"     gw_dst="Toulouse_gw" ><link_ctn id="violette_gw"/></ASroute>
   <ASroute src="AS_network"     dst="AS_violette"    gw_src="Toulouse_gw"  gw_dst="violette-AS_violette_router.toulouse.grid5000.fr"    ><link_ctn id="violette_gw"/></ASroute>
-    
+
 </AS>
 
 </platform>

diff --git a/loba_bulk.cpp b/loba_bulk.cpp
index f5ec64ecfc0ffe9520e735364ebe75402f14d4bf..44d54ab0cdf4d417d453adec633a438400b91150 100644 (file)
--- a/loba_bulk.cpp
+++ b/loba_bulk.cpp
@@ -14,7 +14,7 @@ void loba_bulk::load_balance()
        unsigned NbNeighbours = pneigh.size();
 
        double *S = new double[NbNeighbours];
-       for (unsigned i = 0; i < NbNeighbours; i++) 
+       for (unsigned i = 0; i < NbNeighbours; i++)
                S[i] = 0.0;
        //What is the minimum and maximum load under myLoad?
        float minLoad = myLoad;

diff --git a/loba_lln.cpp b/loba_lln.cpp
index fa762c853c1589f758fca11dbfe40b69abb62b94..35acb265cd1fb325d9dd453b167eea237e0d0875 100644 (file)
--- a/loba_lln.cpp
+++ b/loba_lln.cpp
@@ -17,7 +17,7 @@ void loba_lln::load_balance()
        listLessLoadedNeighbors.clear();
                for(i=0;i<size;++i) {
                        S[i]=0.0;
-                       if( pneigh[i]->get_load()< lessLoad ) 
+                       if( pneigh[i]->get_load()< lessLoad )
                                        listLessLoadedNeighbors.push_back(i);
                }
                int nbLessLoadedNeighbors=listLessLoadedNeighbors.size();