#define INSTR_PAJE_TYPES_HPP
#include "src/instr/instr_private.hpp"
+#include <memory>
#include <sstream>
#include <string>
#include <vector>
Type* father_;
public:
- std::map<std::string, Type*> children_;
+ std::map<std::string, std::unique_ptr<Type>> children_;
Container* issuer_ = nullptr;
std::stringstream stream_;
- Type(std::string name, std::string alias, std::string color, Type* father);
- virtual ~Type();
+ Type(const std::string& name, const std::string& alias, const std::string& color, Type* father);
+ virtual ~Type() = default;
const std::string& get_name() const { return name_; }
const char* get_cname() { return name_.c_str(); }
Type* by_name(const std::string& name);
LinkType* by_name_or_create(const std::string& name, Type* source, Type* dest);
- VariableType* by_name_or_create(const std::string& name, std::string color);
+ VariableType* by_name_or_create(const std::string& name, const std::string& color);
template <class T> T* by_name_or_create(const std::string& name)
{
auto cont = children_.find(name);
- return cont == children_.end() ? new T(name, this) : static_cast<T*>(cont->second);
+ return cont == children_.end() ? new T(name, this) : static_cast<T*>(cont->second.get());
}
void set_calling_container(Container* container) { issuer_ = container; }
class VariableType : public Type {
std::vector<VariableEvent*> events_;
public:
- VariableType(const std::string& name, std::string color, Type* father);
- ~VariableType();
+ VariableType(const std::string& name, const std::string& color, Type* father);
void instr_event(double now, double delta, const char* resource, double value);
void set_event(double timestamp, double value);
void add_event(double timestamp, double value);
class ValueType : public Type {
public:
- std::map<std::string, EntityValue*> values_;
- ValueType(std::string name, std::string alias, Type* father) : Type(std::move(name), std::move(alias), "", father){};
+ std::map<std::string, EntityValue> values_;
+ ValueType(const std::string& name, const std::string& alias, Type* father) : Type(name, alias, "", father){};
ValueType(const std::string& name, Type* father) : Type(name, name, "", father){};
- virtual ~ValueType();
- void add_entity_value(const std::string& name, std::string color);
+ virtual ~ValueType() = default;
+ void add_entity_value(const std::string& name, const std::string& color);
void add_entity_value(const std::string& name);
EntityValue* get_entity_value(const std::string& name);
};
class LinkType : public ValueType {
public:
- LinkType(std::string name, std::string alias, Type* father);
- void start_event(Container* startContainer, std::string value, std::string key);
- void start_event(Container* startContainer, std::string value, std::string key, int size);
- void end_event(Container* endContainer, std::string value, std::string key);
+ LinkType(const std::string& name, const std::string& alias, Type* father);
+ void start_event(Container* startContainer, const std::string& value, const std::string& key);
+ void start_event(Container* startContainer, const std::string& value, const std::string& key, int size);
+ void end_event(Container* endContainer, const std::string& value, const std::string& key);
};
class EventType : public ValueType {
public:
- EventType(std::string name, Type* father);
+ EventType(const std::string& name, Type* father);
};
class StateType : public ValueType {
std::vector<StateEvent*> events_;
public:
- StateType(std::string name, Type* father);
- ~StateType();
+ StateType(const std::string& name, Type* father);
void set_event(const std::string& value_name);
void push_event(const std::string& value_name);
void push_event(const std::string& value_name, TIData* extra);