Correct a few a/an.

[simgrid.git] / src / instr / instr_interface.cpp

diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp
index 824af31..0f353c7 100644 (file)
--- a/src/instr/instr_interface.cpp
+++ b/src/instr/instr_interface.cpp
@@ -9,9 +9,9 @@
 #include "src/surf/network_interface.hpp"
 #include "src/surf/surf_private.hpp"
 #include "surf/surf.hpp"
+#include "xbt/random.hpp"
 #include <algorithm>
 #include <cmath>
-#include <random>
 
 enum class InstrUserVariable { DECLARE, SET, ADD, SUB };
 
@@ -58,7 +58,7 @@ void TRACE_category(const char *category)
 /** @ingroup TRACE_category
  *  @brief Declare a new category with a color.
  *
- *  Same as #TRACE_category, but let user specify a color encoded as a RGB-like string with three floats from 0 to 1.
+ *  Same as #TRACE_category, but let user specify a color encoded as an RGB-like string with three floats from 0 to 1.
  *  So, to specify a red color, pass "1 0 0" as color parameter. A light-gray color can be specified using "0.7 0.7 0.7"
  *   as color. This function has no effect if a category with the same name has been already declared.
  *
@@ -89,11 +89,9 @@ void TRACE_category_with_color (const char *category, const char *color)
   std::string final_color;
   if (not color) {
     //generate a random color
-    static std::default_random_engine rnd_engine;
-    std::uniform_real_distribution<double> prng(0.0, std::nextafter(1.0, 2.0));
-    double red   = prng(rnd_engine);
-    double green = prng(rnd_engine);
-    double blue  = prng(rnd_engine);
+    double red   = simgrid::xbt::random::uniform_real(0.0, std::nextafter(1.0, 2.0));
+    double green = simgrid::xbt::random::uniform_real(0.0, std::nextafter(1.0, 2.0));
+    double blue  = simgrid::xbt::random::uniform_real(0.0, std::nextafter(1.0, 2.0));
     final_color  = std::to_string(red) + " " + std::to_string(green) + " " + std::to_string(blue);
   }else{
     final_color = std::string(color);
@@ -316,7 +314,7 @@ static void instr_user_srcdst_variable(double time, const char *src, const char
  *
  *  The graph topology will have the following properties: all hosts, links and routers of the platform file are mapped
  *  to graph nodes; routes are mapped to edges.
- *  The platform's AS are not represented in the output.
+ *  The platform's zones are not represented in the output.
  *
  *  @param filename The name of the file that will hold the graph.
  *
@@ -324,14 +322,7 @@ static void instr_user_srcdst_variable(double time, const char *src, const char
  */
 int TRACE_platform_graph_export_graphviz (const char *filename)
 {
-  /* returns 1 if successful, 0 otherwise */
-  if (not TRACE_is_enabled())
-    return 0;
-  xbt_graph_t g = instr_routing_platform_graph();
-  if (g == nullptr)
-    return 0;
-  instr_routing_platform_graph_export_graphviz (g, filename);
-  xbt_graph_free_graph(g, xbt_free_f, xbt_free_f, nullptr);
+  simgrid::instr::platform_graph_export_graphviz(filename);
   return 1;
 }