X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1703c9a9f5a27f040e38c51bb7801af8c6ad40c1..23d57f61bb2af9b8300606e977cae854a15a12bb:/include/simgrid/kernel/resource/Model.hpp

diff --git a/include/simgrid/kernel/resource/Model.hpp b/include/simgrid/kernel/resource/Model.hpp
index 48e1175688..3a5affb668 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. */
@@ -10,25 +10,10 @@
 #include <simgrid/kernel/resource/Action.hpp>
 #include <unordered_map>
 
-namespace simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid::kernel::resource {
 
-/** @ingroup SURF_interface
- * @brief SURF model interface class
- * @details A model is an object which handle the interactions between its Resources and its Actions
- */
 class XBT_PUBLIC Model {
 public:
-  /** @brief Possible model types */
-  enum class Type {
-    HOST,    /**< Host models: see surf_host_model_description for more details */
-    NETWORK, /**< Network models: see surf_network_model_description for more details */
-    CPU,     /**< CPU models: see surf_cpu_model_description for more details */
-    DISK,    /**< Disk models: see surf_disk_model_description for more details */
-    VM       /**< VM model */
-  };
-
   /** @brief Possible update mechanisms */
   enum class UpdateAlgo {
     FULL, /**< Full update mechanism: the remaining time of every action is recomputed at each step */
@@ -37,14 +22,14 @@ public:
                    gets recomputed anyway. In that case, you'd better not try to be cleaver with lazy and go for
                    a simple full update.  */
   };
-
-  explicit Model(Model::UpdateAlgo algo);
+  explicit Model(const std::string& name);
   Model(const Model&) = delete;
   Model& operator=(const Model&) = delete;
 
   virtual ~Model();
 
   bool is_update_lazy() const { return update_algorithm_ == UpdateAlgo::LAZY; }
+  Model* set_update_algorithm(UpdateAlgo algo);
 
   /** @brief Get the set of [actions](@ref Action) in *inited* state */
   Action::StateSet* get_inited_action_set() { return &inited_action_set_; }
@@ -70,12 +55,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_; }
 
@@ -89,21 +68,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);
 
@@ -128,37 +92,22 @@ 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_; }
 
 private:
+  UpdateAlgo update_algorithm_ = UpdateAlgo::FULL;
   std::unique_ptr<lmm::System> maxmin_system_;
-  const UpdateAlgo update_algorithm_;
   Action::StateSet inited_action_set_;   /**< Created not started */
   Action::StateSet started_action_set_;  /**< Started not done */
   Action::StateSet failed_action_set_;   /**< Done with failure */
   Action::StateSet finished_action_set_; /**< Done successful */
   Action::StateSet ignored_action_set_;  /**< not considered (failure detectors?) */
+  const std::string name_;               /**< Model name */
 
   ActionHeap action_heap_;
 };
 
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
-
-/** @ingroup SURF_models
- *  @brief List of initialized models
- */
-XBT_PUBLIC_DATA std::vector<simgrid::kernel::resource::Model*> all_existing_models;
-/** @ingroup SURF_models
- *  @brief Map of initialized models by category
- */
-XBT_PUBLIC_DATA
-std::unordered_map<simgrid::kernel::resource::Model::Type, std::vector<simgrid::kernel::resource::Model*>>
-    models_by_type;
+} // namespace simgrid::kernel::resource
 
 #endif