Se leen bien los valores de punto flotante y la simulacion es mas coherente

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

diff --git a/Model/src/splitter.cpp b/Model/src/splitter.cpp
index cd3ccad169eb7d057e291ae15c9c763bf7b71df1..38742f66e708d832b1f3b318b87b957bc9010645 100644 (file)
--- a/Model/src/splitter.cpp
+++ b/Model/src/splitter.cpp
@@ -10,6 +10,7 @@ Splitter::Splitter(const std::string &_name):Transport(_name)
        out_slots = 2;
        max_flow = actual_flow = 0.0f;
        updated = true;
        out_slots = 2;
        max_flow = actual_flow = 0.0f;
        updated = true;

+       out_on_zero = out_ready = 0;

 }
 
 Splitter::~Splitter()
 }
 
 Splitter::~Splitter()


@@ -37,7 +38,8 @@ void Splitter::recieve_msg(int msg, IConector *who, void *data)
 
                        if (max_flow < actual_flow) actual_flow = max_flow;
 
 
                        if (max_flow < actual_flow) actual_flow = max_flow;
 

-                       actual_flow /= 2.0f;
+                       if (out_on_zero == 0)
+                               actual_flow /= 2.0f;

 
                        send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &actual_flow);
 
 
                        send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &actual_flow);
 


@@ -54,8 +56,22 @@ void Splitter::recieve_msg(int msg, IConector *who, void *data)
                        std::cout << name << ":Split " << max << std::endl;
 #endif
                        if (pos == OUT) {
                        std::cout << name << ":Split " << max << std::endl;
 #endif
                        if (pos == OUT) {

-                               if (max < actual_flow)  actual_flow = max;
-                               if (max_flow < actual_flow) actual_flow = max_flow;
+                               if (max == 0) {
+                                       out_on_zero++;
+                                       switch (out_on_zero) {
+                                               case 1:
+                                                       if (out_ready == 0) {
+                                                               actual_flow = max_flow;
+                                                       }
+                                               break;
+                                               case 2:
+                                                       actual_flow = 0.0;
+                                       }
+                               } else {
+                                       if (max < actual_flow)  actual_flow = max;
+                                       if (max_flow < actual_flow) actual_flow = max_flow;
+                               }
+                               out_ready++;

                        } else {
                                        if (((2*max) < actual_flow) && (max != 0))
                                                actual_flow = 2*max;
                        } else {
                                        if (((2*max) < actual_flow) && (max != 0))
                                                actual_flow = 2*max;


@@ -94,5 +110,6 @@ void Splitter::simulate()
 #endif
        updated = false;
        color_updated = false;
 #endif
        updated = false;
        color_updated = false;

+       out_on_zero = out_ready = 0;

 }
 
 }