Algunos cambios menores

diff --git a/Model/include/condition.h b/Model/include/condition.h
index 38da2a47a56d3292eb24e0ce84fec93895662a24..9dc9539a9148d180af15e1f3fe85831b92dc32cd 100644 (file)
--- a/Model/include/condition.h
+++ b/Model/include/condition.h
@@ -35,9 +35,9 @@ public:
                tmp = litros / capac;
                switch (cond) {
                        case LT:
-                               return (tmp < percent);
+                               return (tmp <= percent);
                        case GT:
-                               return (tmp > percent);
+                               return (tmp >= percent);
                }
        }
 protected:

diff --git a/Model/include/exclusa.h b/Model/include/exclusa.h
index 818ccb42be981b05a055f0b0f61b33d459f6aad0..b4ea3e2fba3237355fb850b9dedb50116be14066 100644 (file)
--- a/Model/include/exclusa.h
+++ b/Model/include/exclusa.h
@@ -20,7 +20,7 @@ public:
        virtual void simulate();
        virtual void recieve_msg(int msg, IConector *who, void *data);
        
-       virtual bool get_output() { return is_open; }
+       virtual bool get_output() { return is_open = input->get_output(); }
 
        void open() { is_open = true; }
        void close() { is_open = false; }