* Se agrega directorio para ejemplos con el primer ejemplo exitoso. (traten de poner...

[z.facultad/75.42/plaqui.git] / Model / src / union.cpp

diff --git a/Model/src/union.cpp b/Model/src/union.cpp
index 0d2c18c85e8fc8798113c3fee616fe5fd41827ff..4e1a2acaf1546d6e6ef7d1cded5802d7651cda34 100644 (file)
--- a/Model/src/union.cpp
+++ b/Model/src/union.cpp
@@ -11,7 +11,7 @@ Union::Union(const std::string &_name):Transport(_name)
        max_flow = 0.0f;
        in_on_zero = 0;
        in_ready = 0;
        max_flow = 0.0f;
        in_on_zero = 0;
        in_ready = 0;

-       actual_flow = 999999;
+       actual_flow = INFINITO;

        updated = false;
 }
 
        updated = false;
 }
 


@@ -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);
                                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 {
                                }
                                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;
                                }
                                        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);
                        }
                                tmp = (in_on_zero==0)?actual_flow/2.0f:actual_flow;
                                who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp);
                        }


@@ -136,8 +144,7 @@ void Union::update(int dir)
        if (updated) return;
        
        // Seteo mi actualizar en true para evitar entrar de nuevo
        if (updated) return;
        
        // Seteo mi actualizar en true para evitar entrar de nuevo

-       // FIXME : 99999 == INFINITO!!
-       actual_flow = 99999;
+       actual_flow = INFINITO;

        updated = true;
        switch (dir) {
                case IN:
        updated = true;
        switch (dir) {
                case IN: