X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/dfabbe2822ffdfb241105cff491b4331096e4af3..78a6866a5076cee1015d8985b5bbbb84adf32576:/Model/src/union.cpp?ds=sidebyside diff --git a/Model/src/union.cpp b/Model/src/union.cpp index 0d2c18c..a9397dd 100644 --- a/Model/src/union.cpp +++ b/Model/src/union.cpp @@ -50,11 +50,20 @@ void Union::recieve_msg(int msg, IConector *who, void *data) in_on_zero++; tmp = 0.0f; who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp); - if (in_on_zero == 1) { - if (in_ready == 0) - tmp = max_flow; - else - tmp = actual_flow/2.0f; + switch (in_on_zero) { + case 1: + if (in_ready == 0) + tmp = max_flow; + else + tmp = actual_flow/2.0f; + break; + case 0: + if (in_ready == 1) { + tmp = actual_flow/2.0f; + } + break; + case 2: + tmp = 0.0f; } send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &tmp); } else { @@ -72,8 +81,7 @@ void Union::recieve_msg(int msg, IConector *who, void *data) case 2: actual_flow = 0; } - if (!updated) - send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &actual_flow); + send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &actual_flow); tmp = (in_on_zero==0)?actual_flow/2.0f:actual_flow; who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp); }