add wrappers with scalars on the user side

diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp
index 4964591..ac1c545 100644 (file)
--- a/include/simgrid/s4u/NetZone.hpp
+++ b/include/simgrid/s4u/NetZone.hpp
@@ -104,12 +104,14 @@ public:
    * @param speed_per_state Vector of CPU's speeds
    */
   s4u::Host* create_host(const std::string& name, const std::vector<double>& speed_per_pstate);
+  s4u::Host* create_host(const std::string& name, double speed);
   /**
    * @brief Create a Host (string version)
    *
    * @throw std::invalid_argument if speed format is incorrect.
    */
   s4u::Host* create_host(const std::string& name, const std::vector<std::string>& speed_per_pstate);
+  s4u::Host* create_host(const std::string& name, const std::string& speed);
 
   /**
    * @brief Create a link
@@ -119,9 +121,11 @@ public:
    * @throw std::invalid_argument if bandwidth format is incorrect.
    */
   s4u::Link* create_link(const std::string& name, const std::vector<double>& bandwidths);
+  s4u::Link* create_link(const std::string& name, double bandwidth);
 
   /** @brief Create a link (string version) */
   s4u::Link* create_link(const std::string& name, const std::vector<std::string>& bandwidths);
+  s4u::Link* create_link(const std::string& name, const std::string& bandwidth);
 
   /**
    * @brief Make a router within that NetZone

diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp
index 2298be5..ce45cb1 100644 (file)
--- a/src/s4u/s4u_Netzone.cpp
+++ b/src/s4u/s4u_Netzone.cpp
@@ -143,21 +143,42 @@ NetZone* NetZone::seal()
   return this;
 }
 
+s4u::Host* NetZone::create_host(const std::string& name, double speed)
+{
+  return create_host(name, {speed});
+}
+
 s4u::Host* NetZone::create_host(const std::string& name, const std::vector<double>& speed_per_pstate)
 {
   return kernel::actor::simcall(
       [this, &name, &speed_per_pstate] { return pimpl_->create_host(name, speed_per_pstate); });
 }
+
+s4u::Host* NetZone::create_host(const std::string& name, const std::string& speed)
+{
+  return create_host(name, {speed});
+}
+
 s4u::Host* NetZone::create_host(const std::string& name, const std::vector<std::string>& speed_per_pstate)
 {
   return create_host(name, Host::convert_pstate_speed_vector(speed_per_pstate));
 }
 
+s4u::Link* NetZone::create_link(const std::string& name, double bandwidth)
+{
+  return create_link(name, {bandwidth});
+}
+
 s4u::Link* NetZone::create_link(const std::string& name, const std::vector<double>& bandwidths)
 {
   return kernel::actor::simcall([this, &name, &bandwidths] { return pimpl_->create_link(name, bandwidths); });
 }
 
+s4u::Link* NetZone::create_link(const std::string& name, const std::string& bandwidth)
+{
+  return create_link(name, {bandwidth});
+}
+
 s4u::Link* NetZone::create_link(const std::string& name, const std::vector<std::string>& bandwidths)
 {
   std::vector<double> bw;