diff options
Diffstat (limited to 'src/Inputs.cc')
| -rw-r--r-- | src/Inputs.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Inputs.cc b/src/Inputs.cc index bef8b6f..9220e36 100644 --- a/src/Inputs.cc +++ b/src/Inputs.cc @@ -156,14 +156,14 @@ void Inputs::GeneratePlatform(std::string 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=\"0ms\" sharing_policy=\"SHARED\"></link>\n"; + pf << " <link id=\"link\" bandwidth=\""<<d["bitrate"].GetString()<<"\" latency=\""<<d["latency"].GetString()<<"\" sharing_policy=\"SHARED\"></link>\n"; for (Value::ConstMemberIterator itr = d["nodes"].MemberBegin(); itr != d["nodes"].MemberEnd(); ++itr) { std::string name=itr->name.GetString(); double power_off=d["nodes"][itr->name.GetString()]["power_off"].GetDouble(); double power_on=d["nodes"][itr->name.GetString()]["power_on"].GetDouble(); - double power_rx=d["nodes"][itr->name.GetString()]["power_rx"].GetDouble(); - double power_tx=d["nodes"][itr->name.GetString()]["power_tx"].GetDouble(); + double power_rx=power_on+d["nodes"][itr->name.GetString()]["power_rx"].GetDouble(); + double power_tx=power_on+d["nodes"][itr->name.GetString()]["power_tx"].GetDouble(); // Create node pf << " <host id=\""<<name<<"\" speed=\"100.0f,100.0f,100.0f,100.0f\" pstate=\"0\">\n"; |