* Se agregan #ifdef DEBUG a los simulate() del modelo, para poder sacar

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

diff --git a/Model/src/main.cpp b/Model/src/main.cpp
index ab4f7f648407301aa4fa424a93f35fa5074102c3..e6e52b555e14a7ddc4d26f27fe0e5dc158287c5b 100644 (file)
--- a/Model/src/main.cpp
+++ b/Model/src/main.cpp
@@ -9,34 +9,20 @@
 #include "exclusa.h"
 #include <unistd.h>
 #include <iostream>
 #include "exclusa.h"
 #include <unistd.h>
 #include <iostream>

-#include "simulador.h"
+#include "simulator.h"

 
 using namespace std;
 using namespace PlaQui::Model;
 
 int main(int argc, char *argv[])
 {
 
 using namespace std;
 using namespace PlaQui::Model;
 
 int main(int argc, char *argv[])
 {

-       Simulador *sim = new Simulador();
-
-       sim->add_pump("bomba1");
-       sim->add_conduct("c");
-       sim->add_conduct("c1");
-       sim->add_drainage("d");
-       sim->add_tank("tanque");
-
-       sim->connect("bomba1", "c", IConector::OUT);
-       sim->connect("c", "tanque", IConector::OUT);
-       sim->connect("tanque", "c1", IConector::OUT);
-       sim->connect("c1", "d", IConector::OUT);
+       Simulator *sim = new Simulator(argv[1]);

 
        int i=0;
 
        int i=0;

-       while (i<10) {
+       while (i<2) {

                sim->simulate();
                sim->simulate();

-               if (i == 4) {
-                       if (!sim->pump_deactivate("bomba1")) {
-                               std::cout << "c no es pump :-)" << std::endl;
-                       }
-               }
+
+               std::cout << sim->get_state_as_xml() << std::endl << std::endl;

                i++;
        }
 
                i++;
        }