X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4f39a8fc8ab9883ac58ae91eab8b165a684c1385..cb0db70b9d93d8569647145ad6833fe3fe03153f:/examples/lua/master_slave_bypass.lua

diff --git a/examples/lua/master_slave_bypass.lua b/examples/lua/master_slave_bypass.lua
index 52d57df44c..33a328dcd1 100644
--- a/examples/lua/master_slave_bypass.lua
+++ b/examples/lua/master_slave_bypass.lua
@@ -68,7 +68,10 @@ end
 --]]
 
 require "simgrid"
-  
+ 
+  --create new routing model
+  --simgrid.AS.new(AS_id,AS_mode)
+  simgrid.AS.new{id="AS0",mode="Full"}; 
   --simgrid.Host.new(host_id,power)
   simgrid.Host.new{id="Tremblay",power=98095000};
   simgrid.Host.new{id="Jupiter",power=76296000};
@@ -77,46 +80,47 @@ require "simgrid"
   simgrid.Host.new{id="Bourassa",power=48492000};
 
     -- create Links
-  for i=0,11 do
-    simgrid.Link.new{id=i,bandwidth=252750+ i*768,latency=0.000270544+i*0.087};   
+  for i=10,0,-1 do
+    --simgrid.Link.new{id=i,bandwidth=252750+ i*768,latency=0.000270544+i*0.087}; 
+    simgrid.Link.new{id=i,bandwidth=252750+ i*768,latency=0.000270544+i*0.087};  
   end
   -- simgrid.Route.new(src_id,des_id,links_nb,links_list)
-  simgrid.Route.new("Tremblay","Jupiter",{"1"});
-  simgrid.Route.new("Tremblay","Fafard",{"0","1","2","3","4","8"});
-  simgrid.Route.new("Tremblay","Ginette",{"3","4","5"});
-  simgrid.Route.new("Tremblay","Bourassa",{"0","1","3","2","4","6","7"});
-
-   simgrid.Route.new("Jupiter","Tremblay",{"1"});
-   simgrid.Route.new("Jupiter","Fafard",{"0","1","2","3","4","8","9"});
-   simgrid.Route.new("Jupiter","Ginette",{"3","4","5","9"});
-   simgrid.Route.new("Jupiter","Bourassa",{"0","1","2","3","4","6","7","9"});
+  simgrid.Route.new{src="Tremblay",dest="Jupiter",links="1"};
+  simgrid.Route.new{src="Tremblay",dest="Fafard",links="0,1,2,3,4,8"};
+  simgrid.Route.new{src="Tremblay",dest="Ginette",links="3,4,5"};
+  simgrid.Route.new{src="Tremblay",dest="Bourassa",links="0,1,3,2,4,6,7"};
+
+   simgrid.Route.new{src="Jupiter",dest="Tremblay",links="1"};
+   simgrid.Route.new{src="Jupiter",dest="Fafard",links="0,1,2,3,4,8,9"};
+   simgrid.Route.new{src="Jupiter",dest="Ginette",links="3,4,5,9"};
+   simgrid.Route.new{src="Jupiter",dest="Bourassa",links="0,1,2,3,4,6,7,9"};
  
-   simgrid.Route.new("Fafard","Tremblay",{"0","1","2","3","4","8"});
-   simgrid.Route.new("Fafard","Jupiter",{"0","1","2","3","4","8","9"});
-   simgrid.Route.new("Fafard","Ginette",{"0","1","2","5","8"});
-   simgrid.Route.new("Fafard","Bourassa",{"6","7","8"});
+   simgrid.Route.new{src="Fafard",dest="Tremblay",links="0,1,2,3,4,8"};
+   simgrid.Route.new{src="Fafard",dest="Jupiter",links="0,1,2,3,4,8,9"};
+   simgrid.Route.new{src="Fafard",dest="Ginette",links="0,1,2,5,8"};
+   simgrid.Route.new{src="Fafard",dest="Bourassa",links="6,7,8"};
   
-   simgrid.Route.new("Ginette","Tremblay",{"3","4","5"});
-   simgrid.Route.new("Ginette","Jupiter",{"3","4","5","9"});
-   simgrid.Route.new("Ginette","Fafard",{"0","1","2","5","8"});
-   simgrid.Route.new("Ginette","Bourassa",{"0","1","2","5","6","7"});
-
-   simgrid.Route.new("Bourassa","Tremblay",{"0","1","3","2","4","6","7"});
-   simgrid.Route.new("Bourassa","Jupiter",{"0","1","2","3","4","6","7","9"});
-   simgrid.Route.new("Bourassa","Fafard",{"6","7","8"});
-   simgrid.Route.new("Bourassa","Ginette",{"0","1","2","5","6","7"});
+   simgrid.Route.new{src="Ginette",dest="Tremblay",links="3,4,5"};
+   simgrid.Route.new{src="Ginette",dest="Jupiter",links="3,4,5,9"};
+   simgrid.Route.new{src="Ginette",dest="Fafard",links="0,1,2,5,8"};
+   simgrid.Route.new{src="Ginette",dest="Bourassa",links="0,1,2,5,6,7"};
+
+   simgrid.Route.new{src="Bourassa",dest="Tremblay",links="0,1,3,2,4,6,7"};
+   simgrid.Route.new{src="Bourassa",dest="Jupiter",links="0,1,2,3,4,6,7,9"};
+   simgrid.Route.new{src="Bourassa",dest="Fafard",links="6,7,8"};
+   simgrid.Route.new{src="Bourassa",dest="Ginette",links="0,1,2,5,6,7"};
   
    --Save Platform
-   simgrid.info("start registering platform");
+   --simgrid.info("start registering platform");
    simgrid.msg_register_platform();
-   simgrid.info("platform registered");
+   --simgrid.info("platform registered");
   
   --Set Application
-   simgrid.Host.setFunction("Tremblay","Master",{"20","550000000","1000000","4"});
-   simgrid.Host.setFunction("Bourassa","Slave",{"0"});
-   simgrid.Host.setFunction("Jupiter","Slave",{"1"});
-   simgrid.Host.setFunction("Fafard","Slave",{"2"});
-   simgrid.Host.setFunction("Ginette","Slave",{"3"});
+   simgrid.Host.setFunction{host="Tremblay",fct="Master",args="20,550000000,1000000,4"};
+   simgrid.Host.setFunction{host="Bourassa",fct="Slave",args="0"};
+   simgrid.Host.setFunction{host="Jupiter",fct="Slave",args="1"};
+   simgrid.Host.setFunction{host="Fafard",fct="Slave",args="2"};
+   simgrid.Host.setFunction{host="Ginette",fct="Slave",args="3"};
    
   --Save Application 
    simgrid.msg_register_application();