Se elimina el directorio tests del server del configure.in y Makefile.am para

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

diff --git a/Model/src/union.cpp b/Model/src/union.cpp
index 5f22ef59d7c726b9f508de17329d4e0d25c7d170..36ae347b7e1ad6ad716d46181a8c9cec701e170e 100644 (file)
--- a/Model/src/union.cpp
+++ b/Model/src/union.cpp
@@ -43,7 +43,7 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
                                        if (in_ready == 0)
                                                tmp = max_flow;
                                        else
-                                               tmp = max_flow/2.0f;
+                                               tmp = actual_flow/2.0f;
                                }
                                send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &tmp);
                        } else {
@@ -62,7 +62,6 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
                                                actual_flow = 0;
                                }
                                send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &actual_flow);
-                               std::cout << in_on_zero << " " << actual_flow << std::endl;
                                tmp = (in_on_zero==0)?actual_flow/2.0f:actual_flow;
                                who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp);
                        }
@@ -76,8 +75,10 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
                                if (max < actual_flow)  actual_flow = max;
                                if (in_on_zero == 2) actual_flow = 0;
                        } else {
-                                       if (((2*max) < actual_flow) && (max != 0))
+                                       if (((2*max) < actual_flow) && (max != 0)) {
                                                actual_flow = 2*max;
+                                               if (in_on_zero == 1) actual_flow /= 2.0;
+                                       }
                        }
                }
                break;
@@ -106,7 +107,8 @@ void Union::update(int dir)
 void Union::simulate()
 {
        RGB c_in1, c_in2;
-       unsigned r,g,b;
+       unsigned r=0,g=0,b=0;
+       float c_f1, c_f2; // para ver los flujos de cada uno
 
        if (!updated) {
                return;
@@ -115,15 +117,30 @@ void Union::simulate()
        if (i != in_list.end()) {
                PlantItem *o = (PlantItem *)(*i);
                c_in1 = o->get_color();
+               c_f1 = o->get_actual_flow();
                i++;
                o = (PlantItem *)(*i);
                c_in2 = o->get_color();
+               c_f2 = o->get_actual_flow();
        }
 
-       r = ((c_in1.r()+c_in2.r())/2)%256;
-       g = ((c_in1.g()+c_in2.g())/2)%256;
-       b = ((c_in1.b()+c_in2.b())/2)%256;
-       set_color(RGB(r,g,b));
+       set_color( RGB(r,g,b) );
+       if ((c_f1 != 0) && (c_f2 != 0)) {
+               // Si ambas entradas traen flujo, sumo sus colores
+               r = ((c_in1.r()+c_in2.r())/2)%256;
+               g = ((c_in1.g()+c_in2.g())/2)%256;
+               b = ((c_in1.b()+c_in2.b())/2)%256;
+               set_color(RGB(r,g,b));
+       } else {
+               // Veo que entrada trae color
+               if (c_f1 != 0) {
+                       set_color( c_in1 );
+               }
+               if (c_f2 != 0) {
+                       set_color( c_in2 );
+               }
+       }
+               
        std::cout << name << "::Flujo actual = " << actual_flow << std::endl;
        updated = false;
        in_on_zero = 0;