X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f0534a5e2af72c36c12d55f7ea323040e6e9bf36..8052f28d5b5a9d88b6724dff2e5e81dee10065d7:/src/dag/loaders.cpp

diff --git a/src/dag/loaders.cpp b/src/dag/loaders.cpp
index 218aa71b36..09591b1e83 100644
--- a/src/dag/loaders.cpp
+++ b/src/dag/loaders.cpp
@@ -92,7 +92,7 @@ static ExecPtr current_job;
 
 /** @brief loads a JSON file describing a DAG
  *
- * See https://github.com/wfcommons/wfformat for more details.
+ * See https://github.com/wfcommons/wfformat for more details. We support wfformat 1.4.
  */
 std::vector<ActivityPtr> create_DAG_from_json(const std::string& filename)
 {
@@ -107,7 +107,7 @@ std::vector<ActivityPtr> create_DAG_from_json(const std::string& filename)
   for (auto const& task: data["workflow"]["tasks"]) {
     if (task["type"] == "compute") {
       current =
-          Exec::init()->set_name(task["name"].get<std::string>())->set_flops_amount(task["runtime"].get<double>());
+          Exec::init()->set_name(task["name"].get<std::string>())->set_flops_amount(task["runtimeInSeconds"].get<double>());
       if (task.contains("machine"))
         dynamic_cast<Exec*>(current.get())
             ->set_host(simgrid::s4u::Engine::get_instance()->host_by_name(task["machine"].get<std::string>()));
@@ -115,7 +115,7 @@ std::vector<ActivityPtr> create_DAG_from_json(const std::string& filename)
     else if (task["type"] == "transfer"){
       current = Comm::sendto_init()
                     ->set_name(task["name"].get<std::string>())
-                    ->set_payload_size(task["bytesWritten"].get<double>());
+                    ->set_payload_size(task["writtenBytes"].get<double>());
       if (task.contains("machine"))
         comms_destinations[current] =
             simgrid::s4u::Engine::get_instance()->host_by_name(task["machine"].get<std::string>());
@@ -156,7 +156,7 @@ std::vector<ActivityPtr> create_DAG_from_json(const std::string& filename)
 
   // Start only Activities with dependencies solved
   for (auto const& activity: dag) {
-    if (dynamic_cast<Exec*>(activity.get()) != nullptr and activity->dependencies_solved())
+    if (dynamic_cast<Exec*>(activity.get()) != nullptr && activity->dependencies_solved())
       activity->start();
   }
   return dag;