Correctly disable DPOR when StateEq reduction is enabled

[simgrid.git] / src / surf / cpu_cas01.cpp

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 04539e4..8112b6a 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -34,6 +34,9 @@ static simgrid::config::Flag<std::string>
                                "Cannot change the optimization algorithm after the initialization");
                   });
 
+static simgrid::config::Flag<std::string> cfg_cpu_solver("cpu/solver", "Set linear equations solver used by CPU model",
+                                                         "maxmin", &simgrid::kernel::lmm::System::validate_solver);
+
 /*********
  * Model *
  *********/
@@ -50,9 +53,7 @@ void surf_cpu_model_init_Cas01()
   engine->get_netzone_root()->set_cpu_pm_model(cpu_model_pm);
 }
 
-namespace simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid::kernel::resource {
 
 CpuCas01Model::CpuCas01Model(const std::string& name) : CpuModel(name)
 {
@@ -67,7 +68,7 @@ CpuCas01Model::CpuCas01Model(const std::string& name) : CpuModel(name)
     select = true;
   }
 
-  set_maxmin_system(new lmm::System(select));
+  set_maxmin_system(lmm::System::build(cfg_cpu_solver, select));
 }
 
 CpuImpl* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
@@ -202,6 +203,4 @@ CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double sp
   model->get_maxmin_system()->expand(constraint, get_variable(), 1.0);
 }
 
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::resource