Debug network model

1 files changed, 11 insertions, 3 deletions

diff --git a/src/Inputs.cc b/src/Inputs.cc
index 9220e36..8c3ac9c 100644
--- a/src/Inputs.cc
+++ b/src/Inputs.cc
@@ -20,6 +20,7 @@ Inputs::Inputs(std::string node_name){
     seed=d["seed"].GetInt();
     hint_size=d["hint_size"].GetInt();
     n_nodes=d["nodes"].MemberCount();
+    latency=d["latency"].GetDouble();
 
     // Instantiate wake_ts
     for(auto& v:d["nodes"][node_name.c_str()]["wake_ts"].GetArray()){
@@ -155,8 +156,8 @@ void Inputs::GeneratePlatform(std::string p){
     pf.open (p);
     pf << "<?xml version='1.0'?>\n";
     pf << "<!DOCTYPE platform SYSTEM \"http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\">\n";
-    pf << "<platform version=\"4.1\">\n    <AS id=\"AS0\" routing=\"Cluster\">\n";
-    pf << "    <link id=\"link\" bandwidth=\""<<d["bitrate"].GetString()<<"\" latency=\""<<d["latency"].GetString()<<"\" sharing_policy=\"SHARED\"></link>\n";
+    pf << "<platform version=\"4.1\">\n    <AS id=\"AS0\" routing=\"Full\">\n";
+    pf << "    <link id=\"link\" bandwidth=\""<<d["bitrate"].GetString()<<"\" latency=\"0ms\" sharing_policy=\"SHARED\"></link>\n";
     for (Value::ConstMemberIterator itr = d["nodes"].MemberBegin(); itr != d["nodes"].MemberEnd(); ++itr)
     {
         std::string name=itr->name.GetString();
@@ -169,7 +170,14 @@ void Inputs::GeneratePlatform(std::string p){
         pf << "    <host id=\""<<name<<"\" speed=\"100.0f,100.0f,100.0f,100.0f\" pstate=\"0\">\n";
         pf << "        <prop id=\"wattage_per_state\" value=\""<< power_off<<":"<<power_off<<", "<< power_on<<":"<<power_on<<", "<<power_rx<<":"<<power_rx<<", "<<power_tx<<":"<<power_tx<<"\" />\n";
         pf << "        <prop id=\"wattage_off\" value=\"0\" />\n    </host>\n";
-        pf << "    <host_link id=\""<<name<<"\" up=\"link\" down=\"link\"/>\n";
+    }
+    for (Value::ConstMemberIterator src = d["nodes"].MemberBegin(); src != d["nodes"].MemberEnd(); ++src)
+    {
+        for (Value::ConstMemberIterator dst = d["nodes"].MemberBegin(); dst != d["nodes"].MemberEnd(); ++dst)
+        {
+            if(src->name.GetString() != dst->name.GetString())
+                pf << "    <route src=\""<<src->name.GetString()<<"\" dst=\""<<dst->name.GetString()<<"\" symmetrical=\"no\"><link_ctn id=\"link\"/></route>\n";
+        }
     }
     pf << "    </AS>\n</platform>\n";
     pf.close();