X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/f29a7129de56edca96ea8ef58576898c1e52ed6f..6983220ff84632481c1628720fe15b8f3ac1c9cb:/Model/src/main.cpp?ds=sidebyside

diff --git a/Model/src/main.cpp b/Model/src/main.cpp
index ab4f7f6..a656492 100644
--- a/Model/src/main.cpp
+++ b/Model/src/main.cpp
@@ -9,34 +9,20 @@
 #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[])
 {
-	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;
 	while (i<10) {
 		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++;
 	}