X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/87b29dcfb2c7d0b3b6df20a2cc055efa1f4b4be3..544079e0f098e38c191623fde08e05a931685273:/teshsuite/simdag/platforms/random.xml

diff --git a/teshsuite/simdag/platforms/random.xml b/teshsuite/simdag/platforms/random.xml
index eb4bc877e5..573c4246f3 100644
--- a/teshsuite/simdag/platforms/random.xml
+++ b/teshsuite/simdag/platforms/random.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
 
 <config id="General">
   <prop id="rngstream/seed" value="12345;12345;12345;12345;12345;12345"></prop>
@@ -26,40 +26,27 @@
 
 <!--  tentative de description de variables linéairement corrélées. À revoir et confirmer... -->
 <random_law_type id="white" type="Gaussion" mean="1000" max="10000"/>
-<random_core_and_power_type 
-id_core="foo" 
-id_power="Core2010" 
-mode="linear" base="NBcore" linear_a="0.5" linear_b="1000" noise="white"/>
+<random_core_and_power_type id_core="foo"id_power="Core2010" mode="linear" base="NBcore" 
+                            linear_a="0.5" linear_b="1000" noise="white"/>
 
 <AS  id="AS0"  routing="Full">
   <!-- Horizontal streams -->
-  <host id="foo" power="123121" state_trace="mystate" availability_trace="mypow_avail"/> 
+  <host id="foo" speed="123.121kf" state_trace="mystate" availability_trace="mypow_avail"/> 
   <link id="bar" bandwidth=""   bandwidth_trace="mybw" latency_trace="mylat"/>
-  <cluster  id="bob_cluster"
-        prefix="bob"
-        suffix=".hamburger.edu"
-        radical="0-1"
-        power="100000"
-        bw=""
-        lat="5e-5"
-        bb_bw="2250000000.00"
-        bb_lat="5e-4"
+  <cluster  id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0-1" speed="100kf"
+        bw="" lat="50us" bb_bw="2.25GBps"  bb_lat="500us"
         bw_trace="mybw"
         availability_trace="mywpow_avail"
         state_trace="mystate"
-        />
-        
+   />
+
   <!-- Vertical stream ? -->
-  <peer_set id="peer_home"
-        prefix="home"
-        suffix=".edu"
-        radical="1-10000"
-        power="CustomPower"
+  <peer_set id="peer_home" prefix="home" suffix=".edu" radical="1-10000"
+        speed="CustomPower"
         bw_in_trace="mybw"
         bw_out="CustomBWval"
-        lat="5e-5"
-        />
-   <peer_set 
-     />
-</AS>	
+        lat="50us"
+  />
+  <peer_set/>
+</AS>
 </platform>