namespace simgrid {
namespace surf {
-Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint)
- : name_(xbt_strdup(name))
- , model_(model)
- , constraint_(constraint)
+Resource::Resource(Model* model, const char* name, lmm_constraint_t constraint)
+ : name_(name), model_(model), constraint_(constraint)
{}
-Resource::~Resource() {
- free(name_);
-}
+Resource::~Resource() = default;
bool Resource::isOn() const {
return isOn_;
}
const char *Resource::getName() const {
- return name_;
+ return name_.c_str();
}
bool Resource::operator==(const Resource &other) const {
- return strcmp(name_, other.name_);
+ return name_ == other.name_;
}
lmm_constraint_t Resource::getConstraint() const {
namespace simgrid {
namespace surf {
-void Action::initialize(simgrid::surf::Model *model, double cost, bool failed,
- lmm_variable_t var)
+Action::Action(simgrid::surf::Model* model, double cost, bool failed) : Action(model, cost, failed, nullptr)
+{
+}
+
+Action::Action(simgrid::surf::Model* model, double cost, bool failed, lmm_variable_t var)
+ : remains_(cost), start_(surf_get_clock()), cost_(cost), model_(model), variable_(var)
{
- remains_ = cost;
- start_ = surf_get_clock();
- cost_ = cost;
- model_ = model;
- variable_ = var;
if (failed)
stateSet_ = getModel()->getFailedActionSet();
else
stateSet_->push_back(*this);
}
-Action::Action(simgrid::surf::Model *model, double cost, bool failed)
-{
- initialize(model, cost, failed);
-}
-
-Action::Action(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var)
-{
- initialize(model, cost, failed, var);
-}
-
Action::~Action() {
xbt_free(category_);
}