X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b9d349f4e630752232d93f23b5cb3c33e02e0d05..5ed37babb2fa9097abe82df299c0aa259ed84d5a:/include/simgrid/kernel/resource/Model.hpp

diff --git a/include/simgrid/kernel/resource/Model.hpp b/include/simgrid/kernel/resource/Model.hpp
index 4f3b471421..c5c09e4050 100644
--- a/include/simgrid/kernel/resource/Model.hpp
+++ b/include/simgrid/kernel/resource/Model.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2023. 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. */
@@ -28,7 +28,7 @@ public:
                    gets recomputed anyway. In that case, you'd better not try to be cleaver with lazy and go for
                    a simple full update.  */
   };
-  Model()             = default;
+  explicit Model(const std::string& name);
   Model(const Model&) = delete;
   Model& operator=(const Model&) = delete;
 
@@ -61,12 +61,6 @@ public:
   /** @brief Set the maxmin system of the current Model */
   void set_maxmin_system(lmm::System* system);
 
-  /** @brief Get the update algorithm of the current Model */
-  XBT_ATTRIB_DEPRECATED_v329("Please use is_update_lazy()") UpdateAlgo get_update_algorithm() const
-  {
-    return update_algorithm_;
-  }
-
   /** @brief Get Action heap */
   ActionHeap& get_action_heap() { return action_heap_; }
 
@@ -80,21 +74,6 @@ public:
   virtual double next_occurring_event_lazy(double now);
   virtual double next_occurring_event_full(double now);
 
-  XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event()") virtual double next_occuring_event(double now) final
-  {
-    return next_occurring_event(now);
-  }
-  XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event_lazy()") virtual double next_occuring_event_lazy(
-      double now) final
-  {
-    return next_occurring_event_lazy(now);
-  }
-  XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event_full()") virtual double next_occuring_event_full(
-      double now) final
-  {
-    return next_occurring_event_full(now);
-  }
-
 private:
   Action* extract_action(Action::StateSet* list);
 
@@ -119,16 +98,8 @@ public:
    */
   virtual bool next_occurring_event_is_idempotent() { return true; }
 
-  XBT_ATTRIB_DEPRECATED_v329(
-      "Please use next_occurring_event_is_idempotent()") virtual bool next_occuring_event_is_idempotent() final
-  {
-    return next_occurring_event_is_idempotent();
-  }
-
   /** @brief Gets the model name */
   std::string get_name() const { return name_; }
-  /** @brief Sets the model name */
-  Model* set_name(const std::string& name);
 
 private:
   UpdateAlgo update_algorithm_ = UpdateAlgo::FULL;
@@ -138,7 +109,7 @@ private:
   Action::StateSet failed_action_set_;   /**< Done with failure */
   Action::StateSet finished_action_set_; /**< Done successful */
   Action::StateSet ignored_action_set_;  /**< not considered (failure detectors?) */
-  std::string name_ = "Unnamed";         /**< Model name */
+  const std::string name_;               /**< Model name */
 
   ActionHeap action_heap_;
 };