Merge branch 'dev-unit_test_cleanup' into 'master'

[simgrid.git] / src / kernel / resource / profile / ProfileBuilder.cpp

diff --git a/src/kernel/resource/profile/ProfileBuilder.cpp b/src/kernel/resource/profile/ProfileBuilder.cpp
index 23fb0db..bbfb98d 100644 (file)
--- a/src/kernel/resource/profile/ProfileBuilder.cpp
+++ b/src/kernel/resource/profile/ProfileBuilder.cpp
@@ -14,11 +14,9 @@
 #include <cstddef>
 #include <fstream>
 #include <sstream>
+#include <string_view>
 
-
-namespace simgrid {
-namespace kernel {
-namespace profile {
+namespace simgrid::kernel::profile {
 
 bool DatedValue::operator==(DatedValue const& e2) const
 {
@@ -68,29 +66,26 @@ std::ostream& operator << (std::ostream& out, const DatedValue& dv) {
 
 class LegacyUpdateCb {
   std::vector<StochasticDatedValue> pattern;
-
-  bool stochastic;
-
+  bool stochastic = false;
   bool loop;
+  double loop_delay = 0.0;
 
-  double loop_delay;
-
-  static bool is_comment_or_empty_line(const std::string& val)
+  static bool is_comment_or_empty_line(std::string_view val)
   {
-    return (val[0] == '#' || val[0] == '\0' || val[0] == '%');
+    return (val.empty() || val.front() == '#' || val.front() == '%');
   }
 
-  static bool is_normal_distribution(const std::string& val)
+  static bool is_normal_distribution(std::string_view val)
   {
     return (val == "NORM" || val == "NORMAL" || val == "GAUSS" || val == "GAUSSIAN");
   }
 
-  static bool is_exponential_distribution(const std::string& val) { return (val == "EXP" || val == "EXPONENTIAL"); }
+  static bool is_exponential_distribution(std::string_view val) { return (val == "EXP" || val == "EXPONENTIAL"); }
 
-  static bool is_uniform_distribution(const std::string& val) { return (val == "UNIF" || val == "UNIFORM"); }
+  static bool is_uniform_distribution(std::string_view val) { return (val == "UNIF" || val == "UNIFORM"); }
 
 public:
-  LegacyUpdateCb(const std::string& input, double periodicity) : stochastic(false), loop(periodicity > 0), loop_delay(0)
+  LegacyUpdateCb(const std::string& input, double periodicity) : loop(periodicity > 0)
   {
     int linecount = 0;
     std::vector<std::string> list;
@@ -147,7 +142,7 @@ public:
       }
 
       xbt_assert(splittedval.size() > i, "Invalid profile line");
-      if (i == 1 or i == 2) {
+      if (i == 1 || i == 2) {
         stochevent.date_params = {std::stod(splittedval[i - 1])};
       } else if (i == 3) {
         stochevent.date_params = {std::stod(splittedval[1]), std::stod(splittedval[2])};
@@ -172,7 +167,7 @@ public:
       }
 
       xbt_assert(splittedval.size() > i + j, "Invalid profile line");
-      if (j == 0 or j == 1) {
+      if (j == 0 || j == 1) {
         stochevent.value_params = {std::stod(splittedval[i + j])};
       } else if (j == 2) {
         stochevent.value_params = {std::stod(splittedval[i + 1]), std::stod(splittedval[i + 2])};
@@ -191,32 +186,34 @@ public:
       pattern.emplace_back(stochevent);
     }
 
-    xbt_assert(not stochastic or periodicity <= 0, "If you want periodicity with stochastic profiles, use LOOP_AFTER");
+    xbt_assert(not stochastic || periodicity <= 0, "If you want periodicity with stochastic profiles, use LOOP_AFTER");
     if (periodicity > 0) {
-      xbt_assert(loop and loop_delay == 0);
+      xbt_assert(loop && loop_delay == 0);
       loop_delay = periodicity - last_date;
     }
 
     xbt_assert(loop_delay >= 0, "Profile loop conditions are not realizable!");
   }
 
-  double get_repeat_delay()
+  double get_repeat_delay() const
   {
-    if (not stochastic and loop)
+    if (not stochastic && loop)
       return loop_delay;
     return -1.0;
   }
 
-  void operator()(std::vector<DatedValue>& event_list)
+  void operator()(std::vector<DatedValue>& event_list) const
   {
     size_t initial_size = event_list.size();
-    if (loop or not initial_size) {
-      for (auto dv : pattern)
+    if (loop || not initial_size) {
+      for (auto const& dv : pattern)
         event_list.emplace_back(dv.get_datedvalue());
       if (initial_size)
         event_list.at(initial_size).date_ += loop_delay;
     }
   }
+
+  std::vector<StochasticDatedValue> get_pattern() { return pattern; } 
 };
 
 Profile* ProfileBuilder::from_string(const std::string& name, const std::string& input, double periodicity)
@@ -240,7 +237,7 @@ Profile* ProfileBuilder::from_file(const std::string& path)
 
 
 Profile* ProfileBuilder::from_void() {
-  static Profile void_profile("__void__",[](std::vector<DatedValue>&){},-1.0);
+  static Profile void_profile("__void__", nullptr, -1.0);
   return &void_profile;
 }
 
@@ -248,7 +245,12 @@ Profile* ProfileBuilder::from_callback(const std::string& name, const std::funct
   return new Profile(name, cb, repeat_delay);
 }
 
+} // namespace simgrid::kernel::profile
+
+std::vector<simgrid::kernel::profile::StochasticDatedValue> trace2selist( const char*  c_str) {
+  std::string str(c_str);
+  simgrid::kernel::profile::LegacyUpdateCb cb(str,0);
+  return cb.get_pattern();
+}
+
 
-} // namespace profile
-} // namespace kernel
-} // namespace simgrid