* Se agrega carga de lineas entre compuertas.

[z.facultad/75.42/plaqui.git] / Model / include / and.h

diff --git a/Model/include/and.h b/Model/include/and.h
index be71958e4e5a4f96b761dae551d8b640bd0b9edf..482576b46af79f77118c0f8ae9b08ef57a215f96 100644 (file)
--- a/Model/include/and.h
+++ b/Model/include/and.h
@@ -4,14 +4,15 @@
 
 #include "logiccontrol.h"
 #include <iostream>
 
 #include "logiccontrol.h"
 #include <iostream>

-#include <limits.g>
+#include <limits.h>

 
 namespace PlaQui {
 namespace Model {
 
 
 namespace PlaQui {
 namespace Model {
 

-class And:LogicControl {
+/** Función AND Lógica */
+class And:public LogicControl {

 public:
 public:

-       And():LogicControl(MAX_INT,1) {}
+       And():LogicControl(INT_MAX,1) {}

        virtual ~And() {}
 
        virtual bool get_output() {
        virtual ~And() {}
 
        virtual bool get_output() {


@@ -20,8 +21,8 @@ public:
                /* Si tengo alguien conectado */
                std::list<IConector *>::iterator it;
                for(it = in_list.begin(); it != in_list.end(); it++) {
                /* Si tengo alguien conectado */
                std::list<IConector *>::iterator it;
                for(it = in_list.begin(); it != in_list.end(); it++) {

-                       mi_entrada = *it;
-                       mi_salida &&= mi_entrada->get_output();
+                       mi_entrada = static_cast<LogicControl *>(*it);
+                       mi_salida = mi_salida && mi_entrada->get_output();

                }
                return mi_salida;
        }
                }
                return mi_salida;
        }