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

diff --git a/Model/src/conduct.cpp b/Model/src/conduct.cpp
index 495e94a..63cd7e9 100644
--- a/Model/src/conduct.cpp
+++ b/Model/src/conduct.cpp
@@ -1,6 +1,5 @@
 
 #include "conduct.h"
-#include <iostream>
 
 using namespace PlaQui::Model;
 
@@ -11,6 +10,7 @@ Conduct::Conduct(const std::string &_name):Transport(_name)
 	// Inicio los parametros de conectores
 	in_slots = 1;
 	out_slots = 1;
+	actual_flow = 9999;
 }
 
 Conduct::~Conduct()
@@ -20,14 +20,19 @@ Conduct::~Conduct()
 void Conduct::recieve_msg(int msg, IConector *who, void *data)
 {
 	switch (msg) {
-		case MSG_QUERY_MAX_FLOW: {
+		case MSG_QUERY_MAX_FLOW_OUT: {
 			// Me preguntan por el flujo máximo.
 			// Primero me actualizo, y luego respondo
-			update();
-			float tmp = (actual_flow>max_flow)?max_flow:actual_flow;
+			float tmp = *((float *)data);
+	//		update();
+			actual_flow = (actual_flow>max_flow)?max_flow:actual_flow;
+			actual_flow = (actual_flow<tmp)?actual_flow:tmp;
+
+			send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &actual_flow);
 			// FIXME : no tiene que ir
 			if (out_list.size() == 0) tmp = max_flow;
-			who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp);
+			who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &actual_flow);
+			updated = true;
 		}
 		break;
 		case MSG_RESPONSE_MAX_FLOW: {
@@ -43,15 +48,20 @@ void Conduct::recieve_msg(int msg, IConector *who, void *data)
 	}
 }
 
-void Conduct::update()
+void Conduct::update(int dir)
 {
 	// Si ya me actualice, no lo tengo que hacer de nuevo
 	if (updated) return;
 	// Seteo mi actualizar en true para evitar entrar de nuevo
-	actual_flow = 99999;
+//	actual_flow = 99999;
 	updated = true;
-	send_msg(IN, MSG_QUERY_MAX_FLOW);
-	send_msg(OUT, MSG_QUERY_MAX_FLOW);
+	switch (dir) {
+		case IN:
+			send_msg(IN, MSG_QUERY_MAX_FLOW_IN, (void *)&max_flow);
+		break;
+		case OUT:
+			send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, (void *)&max_flow);
+	}
 }
 
 void Conduct::simulate()
@@ -62,5 +72,13 @@ void Conduct::simulate()
 
 	std::cout << name << "::Flujo actual = " << actual_flow << std::endl;
 	updated = false;
+	actual_flow = 99999;
+}
+
+void Conduct::get_state_as_xml(std::stringstream &out)
+{
+	out << "\t<conduct name=\"" << name << "\">" << std::endl;
+	out << "\t\t<actual_flow>" << actual_flow << "</actual_flow>" << std::endl;
+	out << "\t</conduct>" << std::endl;
 }