X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2c567c9f1d42d79dff5a40058f79f6bccc1bf75a..31129c80d17639ad106452ecac4eb924de7a2d22:/src/kernel/resource/profile/StochasticDatedValue.hpp diff --git a/src/kernel/resource/profile/StochasticDatedValue.hpp b/src/kernel/resource/profile/StochasticDatedValue.hpp index 4533bb304e..f4320390cc 100644 --- a/src/kernel/resource/profile/StochasticDatedValue.hpp +++ b/src/kernel/resource/profile/StochasticDatedValue.hpp @@ -14,22 +14,19 @@ namespace simgrid { namespace kernel { namespace profile { -enum Distribution { Dist_Exp, Dist_Norm, Dist_Unif, Dist_Det }; +enum class Distribution { EXP, NORM, UNIF, DET }; class XBT_PUBLIC StochasticDatedValue { public: - Distribution date_law; + Distribution date_law = Distribution::DET; std::vector date_params; - Distribution value_law; + Distribution value_law = Distribution::DET; std::vector value_params; DatedValue get_datedvalue(); double get_date(); double get_value(); explicit StochasticDatedValue() = default; - explicit StochasticDatedValue(double d, double v) - : date_law(Dist_Det), date_params({d}), value_law(Dist_Det), value_params({v}) - { - } + explicit StochasticDatedValue(double d, double v) : date_params({d}), value_params({v}) {} explicit StochasticDatedValue(Distribution dl, const std::vector& dp, Distribution vl, const std::vector& vp) : date_law(dl), date_params(dp), value_law(vl), value_params(vp) @@ -38,7 +35,7 @@ public: bool operator==(StochasticDatedValue const& e2) const; private: - double draw(Distribution law, std::vector params); + static double draw(Distribution law, std::vector params); }; } // namespace profile