X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9104957deccc59e0e804215d5db498fabfd40d29..83f0364920918d0380a5d538216193bfe00ddc47:/src/kernel/lmm/maxmin.hpp diff --git a/src/kernel/lmm/maxmin.hpp b/src/kernel/lmm/maxmin.hpp index d7de61e329..b820202c09 100644 --- a/src/kernel/lmm/maxmin.hpp +++ b/src/kernel/lmm/maxmin.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -10,11 +10,13 @@ #include "simgrid/s4u/Link.hpp" #include "src/surf/surf_interface.hpp" #include "xbt/asserts.h" +#include "xbt/ex.h" #include "xbt/mallocator.h" #include #include #include +#include #include namespace simgrid { @@ -313,7 +315,7 @@ public: Constraint* get_constraint(unsigned num) const { return num < cnsts_.size() ? cnsts_[num].constraint : nullptr; } /** - * @brief Get the weigth of the numth constraint associated to the variable + * @brief Get the weight of the numth constraint associated to the variable * @param num The rank of constraint we want to get * @return The numth constraint */ @@ -529,11 +531,11 @@ public: &Constraint::saturated_constraint_set_hook_>> saturated_constraint_set; - resource::Action::ModifiedSet* modified_set_ = nullptr; + std::unique_ptr modified_set_ = nullptr; private: - typedef std::vector dyn_light_t; - + using dyn_light_t = std::vector; + //Data used in lmm::solve std::vector cnst_light_vec; dyn_light_t saturated_constraints; @@ -553,16 +555,13 @@ private: class XBT_PUBLIC FairBottleneck : public System { public: - explicit FairBottleneck(bool selective_update) : System(selective_update) {} + using System::System; void solve() final { bottleneck_solve(); } private: void bottleneck_solve(); }; -XBT_PUBLIC System* make_new_maxmin_system(bool selective_update); -XBT_PUBLIC System* make_new_fair_bottleneck_system(bool selective_update); - /** @} */ } // namespace lmm } // namespace kernel