Commit 43938832 authored by Sonja Happ's avatar Sonja Happ

changed AgentIO to work with one proto file for all prosumers, NOT tested yet

parent 1551b988
......@@ -21,6 +21,7 @@ private:
void set_result_file_header() override; /*This method sets the header of the csv log file based on the agent type*/
void set_result_types(); //!< This method adds all result types of an agent to the database depending on the agent type
void save_result_csv_prosumer(void *_model_data); //!< Write prosumer data to csv result stream
void save_result_csv(void *_model_data); //!< This method saves results in the csv result file
void save_result_db(void *_model_data, bool first_step); //!< This method saves results in the database
};
......
......@@ -2,7 +2,6 @@ syntax = "proto3";
option go_package = "agentsProtobuf";
message BatteryResult {
double P_min = 1;
double P_optimal = 2;
double P_max = 3;
......@@ -16,7 +15,8 @@ message BatteryResult {
uint32 swarm_size_p = 11;
uint32 swarm_size_q = 12;
double v_meas = 13;
double SOC = 14;
bool used = 15;
double SOC_el = 14;
double Eth = 15;
bool connected = 16;
bool used = 17;
}
syntax = "proto3";
option go_package = "agentsProtobuf";
message BiofuelResult {
double P_min = 1;
......@@ -14,5 +15,8 @@ message BiofuelResult {
uint32 swarm_size_p = 11;
uint32 swarm_size_q = 12;
double v_meas = 13;
bool used = 14;
double SOC_el = 14;
double Eth = 15;
bool connected = 16;
bool used = 17;
}
......@@ -15,7 +15,8 @@ message ChpResult {
uint32 swarm_size_p = 11;
uint32 swarm_size_q = 12;
double v_meas = 13;
double sec_heater_p_gen_el = 14;
double E_th = 15;
bool used = 16;
double SOC_el = 14;
double Eth = 15;
bool connected = 16;
bool used = 17;
}
......@@ -2,13 +2,21 @@ syntax = "proto3";
option go_package = "agentsProtobuf";
message CompensatorResult {
double Q_min = 1;
double Q_optimal = 2;
double Q_max = 3;
double Q = 4;
uint32 msg_sent = 5;
uint32 msg_received = 6;
uint32 swarm_size_q = 7;
double v_meas = 8;
bool used = 9;
double P_min = 1;
double P_optimal = 2;
double P_max = 3;
double P = 4;
double Q_min = 5;
double Q_optimal = 6;
double Q_max = 7;
double Q = 8;
uint32 msg_sent = 9;
uint32 msg_received = 10;
uint32 swarm_size_p = 11;
uint32 swarm_size_q = 12;
double v_meas = 13;
double SOC_el = 14;
double Eth = 15;
bool connected = 16;
bool used = 17;
}
......@@ -15,7 +15,8 @@ message ElectricVehicleResult {
uint32 swarm_size_p = 11;
uint32 swarm_size_q = 12;
double v_meas = 13;
double connected = 14;
double SOC = 15;
bool used = 16;
double SOC_el = 14;
double Eth = 15;
bool connected = 16;
bool used = 17;
}
syntax = "proto3";
option go_package = "agentsProtobuf";
message HPResult {
double P_min = 1;
......@@ -14,7 +15,8 @@ message HPResult {
uint32 swarm_size_p = 11;
uint32 swarm_size_q = 12;
double v_meas = 13;
double sec_heater_p_gen_el = 14;
double E_th = 15;
bool used = 16;
double SOC_el = 14;
double Eth = 15;
bool connected = 16;
bool used = 17;
}
......@@ -2,13 +2,21 @@ syntax = "proto3";
option go_package = "agentsProtobuf";
message LoadResult {
double P = 1;
double Q = 2;
uint32 msg_sent = 3;
uint32 msg_received = 4;
uint32 swarm_size_p = 5;
uint32 swarm_size_q = 6;
double v_meas = 7;
bool used = 8;
double P_min = 1;
double P_optimal = 2;
double P_max = 3;
double P = 4;
double Q_min = 5;
double Q_optimal = 6;
double Q_max = 7;
double Q = 8;
uint32 msg_sent = 9;
uint32 msg_received = 10;
uint32 swarm_size_p = 11;
uint32 swarm_size_q = 12;
double v_meas = 13;
double SOC_el = 14;
double Eth = 15;
bool connected = 16;
bool used = 17;
}
syntax = "proto3";
option go_package = "agentsProtobuf";
message ProsumerResult {
double P_min = 1;
double P_optimal = 2;
double P_max = 3;
double P = 4;
double Q_min = 5;
double Q_optimal = 6;
double Q_max = 7;
double Q = 8;
uint32 msg_sent = 9;
uint32 msg_received = 10;
uint32 swarm_size_p = 11;
uint32 swarm_size_q = 12;
double v_meas = 13;
double SOC_el = 14;
double Eth = 15;
bool connected = 16;
bool used = 17;
}
......@@ -15,5 +15,8 @@ message PvResult {
uint32 swarm_size_p = 11;
uint32 swarm_size_q = 12;
double v_meas = 13;
bool used = 14;
double SOC_el = 14;
double Eth = 15;
bool connected = 16;
bool used = 17;
}
......@@ -15,5 +15,8 @@ message WecResult {
uint32 swarm_size_p = 11;
uint32 swarm_size_q = 12;
double v_meas = 13;
bool used = 14;
double SOC_el = 14;
double Eth = 15;
bool connected = 16;
bool used = 17;
}
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment