X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2b564f86aa3a75bc55e6610087f79145019708b2..4de2a148bea34f550b79c07fb5e80ac36e6aa0e9:/src/kernel/lmm/bmf.hpp diff --git a/src/kernel/lmm/bmf.hpp b/src/kernel/lmm/bmf.hpp index afe62cb247..d039d247b7 100644 --- a/src/kernel/lmm/bmf.hpp +++ b/src/kernel/lmm/bmf.hpp @@ -7,8 +7,7 @@ #define SURF_BMF_HPP #include "src/kernel/lmm/maxmin.hpp" -#include -#include +#include #include namespace simgrid { @@ -177,7 +176,7 @@ private: std::vector C_shared_; //!< shared_j Resource j is shared or not Eigen::VectorXd phi_; //!< phi_i bound for each player - std::unordered_set, boost::hash>> allocations_; + std::set> allocations_; //!< set of already tested allocations, since last identified loop AllocationGenerator gen_; std::vector allocations_age_; static constexpr int NO_RESOURCE = -1; //!< flag to indicate player has selected no resource @@ -248,7 +247,7 @@ private: * @param maxA Max subflow consumption matrix (OUTPUT) * @param phi Bounds for variables */ - void get_flows_data(int number_cnsts, Eigen::MatrixXd& A, Eigen::MatrixXd& maxA, Eigen::VectorXd& phi); + void get_flows_data(Eigen::Index number_cnsts, Eigen::MatrixXd& A, Eigen::MatrixXd& maxA, Eigen::VectorXd& phi); /** * @brief Builds the vector C_ with resource's capacity * @@ -268,4 +267,4 @@ private: } // namespace kernel } // namespace simgrid -#endif \ No newline at end of file +#endif