update generation script to v4

diff --git a/examples/platforms/syscoord/generate_peer_platform.pl b/examples/platforms/syscoord/generate_peer_platform.pl
index 7b530e3..a866f87 100755 (executable)
--- a/examples/platforms/syscoord/generate_peer_platform.pl
+++ b/examples/platforms/syscoord/generate_peer_platform.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 
 #!/usr/bin/env perl
 

-# Copyright (c) 2011, 2014. The SimGrid Team.
+# Copyright (c) 2011, 2014, 2016. The SimGrid Team.

 # All rights reserved.
 
 # This program is free software; you can redistribute it and/or modify it
 # All rights reserved.
 
 # This program is free software; you can redistribute it and/or modify it


@@ -9,34 +9,31 @@
 use strict;
 use warnings;
 
 use strict;
 use warnings;
 

-my $toversion=3;
+my $toversion=4;

 my $nb_peer = $ARGV[0];
 my $i;
 
 print "<?xml version='1.0'?>\n";
 my $nb_peer = $ARGV[0];
 my $i;
 
 print "<?xml version='1.0'?>\n";

-print "<!DOCTYPE platform SYSTEM \"http://simgrid.gforge.inria.fr/simgrid.dtd\">\n";
+print "<!DOCTYPE platform SYSTEM \"http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\">\n";

 print "<platform version=\"$toversion\">\n";
 
 print "\n<config id=\"General\">\n";
 print "\t<prop id=\"coordinates\" value=\"yes\"></prop>\n";
 print "</config>\n\n";
 
 print "<platform version=\"$toversion\">\n";
 
 print "\n<config id=\"General\">\n";
 print "\t<prop id=\"coordinates\" value=\"yes\"></prop>\n";
 print "</config>\n\n";
 

-print "\t<AS  id=\"AS0\"  routing=\"Vivaldi\">\n";
+print "\t<AS id=\"AS0\" routing=\"Vivaldi\">\n";

 
 my $line;
 
 open SITES_LIGNE, $ARGV[0] or die "Unable to open $ARGV[1]\n";
 while(defined($line=<SITES_LIGNE>))
 {
 
 my $line;
 
 open SITES_LIGNE, $ARGV[0] or die "Unable to open $ARGV[1]\n";
 while(defined($line=<SITES_LIGNE>))
 {

-       #278 7.2 -9.4 h 2.3 
-               if($line =~ /^(.*) (.*) (.*) h (.*)$/)
-               {
-               print "\t\t<peer id=\"peer-$1\" coordinates=\"$2 $3 $4\" power=\"730000000.0\"\n";
-               print "\t\tbw_in=\"13380000\" bw_out=\"1024000\" lat=\"5E-4\" />\n\n";
-               }
-}
-                       
+    #278 7.2 -9.4 h 2.3 
+    if($line =~ /^(.*) (.*) (.*) h (.*)$/)
+    {
+       print "\t\t<peer id=\"peer-$1\" coordinates=\"$2 $3 $4\" speed=\"730Mf\" ";
+       print "bw_in=\"13.38MBps\" bw_out=\"1.024MBps\" lat=\"500us\"/>\n";
+    }
+}                      

 print "\t</AS>\n";
 print "\t</AS>\n";

-print "</platform>";
-
-print " \n";
+print "</platform>\n";