small change in communicating ok

Author: tle-huu

client/go.sh

@@ -1 +1,9 @@
-#~bin
+#!bin/sh
+
+INC="0"
+while [ $INC -lt $3 ]
+do
+	# ./execlient 10.114.12.13 8888 &
+	./execlient $1 $2 &
+	INC=$[$INC + 1]
+done

client/includes/Ai.class.hpp

@@ -8,8 +8,8 @@
 class Ai
 {
 	private:
-		Map&		_heatmap;
-		Graph		_graph;
+		const Map&		_heatmap;
+		Graph			_graph;
 		Ai();
 
 	public:

client/includes/CommunicationSocket.hpp

@@ -50,7 +50,7 @@ class CommunicationSocket
 		CommunicationSocket();
 
 		std::string		read(void) const;
-		void			get_datagram(void);
+		bool			get_datagram(void);
 		void			disconnect();
 		void			get_peer(std::string, Map &) const;
 		void			get_peers(Map &map) const;
@@ -66,6 +66,7 @@ class CommunicationSocket
 		void			wait_for_game(void) const;
 		void			wait_for_move(void);
 		bool			get_datagram(Datagram & datagram);
+
 };
 
 #endif

client/lol.cpp

@@ -65,7 +65,6 @@ int main(__attribute__((unused)) int argc, __attribute__((unused)) char *argv[])
 
 int main(int argc, char *argv[])
 {
-
 	if (argc != 3)
 		return 1;
 	Car car(argv[1], std::atoi(argv[2]));

client/srcs/Ai.class.cpp

@@ -24,15 +24,11 @@ Position		Ai::where_to(Position pos, Position dest, double &speed)
 	static std::vector<int> 		path;
 	static int 				i = 0;
 
-	std::cout << dest.x << " " << dest.y << std::endl;
-	std::cout << "current : " << current << std::endl;
-
 	/* calculating best path */
 	if (i == path.size())
 		i = 0;
-	if (i == 0)
+	if (i == 0 && path.size() == 0)
 		this->bfs(dest, pos, path);
-	std::cout << "after bfs" << std::endl;
 	// for (auto& n : _graph.getNode(current).adjacency_list)
 	// {
 	// 	if (color < 0 || _graph.nodes[n].color < color)
@@ -66,13 +62,18 @@ Position		Ai::where_to(Position pos, Position dest, double &speed)
 	// 		}
 	// 	}
 	// }
-	std::cout << "path size : " << path.size() << std::endl;
+	// std::cout << "path size : " << path.size() << std::endl;
 	Position printcurrent;
 	index_to_coor(current, printcurrent.x, printcurrent.y, _graph.getMapWidth());
-	std::cout << "i => " << i << "; current (" << printcurrent.x << "," << printcurrent.y << ") ;";
+	// std::cout << "i => " << i << "; current (" << printcurrent.x << "," << printcurrent.y << ") ;";
 	index_to_coor(path[i], pos.x, pos.y, _graph.getMapWidth());
-	std::cout << " next (" << pos.x << "," << pos.y << ") ;";
-	speed = 1;
+	// std::cout << " next (" << pos.x << "," << pos.y << ") ;";
+	srand (time(NULL));
+	// double  test = 0.5 + (rand() % 5) / 10;
+	speed = 0.5 +  abs(_heatmap[pos.x][pos.y].total_cars) * 0.5;
+	// speed = 1;
+	std::cout << "_heatmap[pos.x][pos.y].total_cars : " << _heatmap[pos.x][pos.y].total_cars << std::endl;
+	std::cout << " speed : " << speed << std::endl;
 	i++;
 	return (pos);
 }
@@ -96,14 +97,12 @@ void			Ai::bfs(Position &dest, Position &start, std::vector<int> &path)
 	/* launching the bfs from the end to get the next node */
 	s = coord_to_index(dest.x, dest.y, width, height);
 
-	std::cout << "starting node : ( " << dest.x << "," << dest.y << ")" << s << std::endl;
 	visited[s] = true;
 	queue.push(s);
 	(this->_graph.getNode(s)).color = level;
 	while (!queue.empty())
 	{
 		s = queue.front();
-		std::cout << "icibfs0" << std::endl;
 		queue.pop();
 		level = this->_graph.getNode(s).color;
 		for (auto& n : (_graph.getNode(s)).adjacency_list)
@@ -140,9 +139,8 @@ void			Ai::bfs(Position &dest, Position &start, std::vector<int> &path)
 		}
 		path.push_back(index);
 		current = index;
-		std::cout << "[" << index << "] => ";
+		// std::cout << "[" << index << "] => ";
 	}
-	std::cout << "ending bfs : " << path.size() << std::endl;;
 	// sleep(3);
 	return ;
 }

client/srcs/Car.cpp

@@ -9,6 +9,7 @@ Car::Car(const char* addr, int port) : _communicator(addr, port)
 		 ss >> from.x >> from.y >> to.x >> to.y;
 		 _map[from.x][from.y].total_cars -= 1;
 		 _map[to.x][to.y].total_cars += 1;
+		 // std::cout << <<
 	 };
 	_communicator.get_first_info(_map, _current_pos, _destination);
 	_ai = new Ai(_map);

client/srcs/CommunicationSocket.cpp

@@ -57,39 +57,50 @@ std::string			CommunicationSocket::read(void) const
 	if ((ret = recv(this->_socket, buffer, BUFF_SIZE - 1, 0)) < 0)
 		throw("CommunicationSocket:get_datagram(): recv error\n");
 	buffer[ret] = 0;
-	std::cout << "I have read " << ret << " bytes [" << buffer << "]\n";
+	// std::cout << "I have read " << ret << " bytes [" << buffer << "]\n";
 	return (std::string(buffer));
 }
 
 /* the private get_datagram has to be rewritten depending on the format of a datagram */
 
-void				CommunicationSocket::get_datagram(void)
+
+bool				CommunicationSocket::get_datagram(void)
 {
 	Datagram			datagram;
 	std::size_t			spliter;
 	std::string			raw;
+	bool				hasok = false;
 
 	raw = this->read();
 	std::stringstream ss(raw);
-
 	for (std::string line; std::getline(ss, line);)
 	{
-		std::cout << "raw_message : [" << line << "]" << std::endl;
 		if ((spliter = line.find(" ")) == std::string::npos)
-			throw(std::runtime_error("CommunicationSocket(): get_datagram line.find error"));
-		std::cout << " spliter : " << spliter << std::endl;
+		{
+			std::cout << "CommunicationSocket(): get_datagram line.find error" << std::endl;
+			return false;
+		}
 		datagram.setHeader(line.substr(0, spliter));
 		datagram.setMessage(line.substr(spliter));
-		std::cout << datagram.getHeader() << "| === |" << datagram.getMessage() << std::endl;
-		try
+		// std::cout << datagram.getHeader() << "| === |" << datagram.getMessage() << std::endl;
+		if (datagram.getHeader() == "ok")
 		{
-			this->_datagram_stack.push(datagram);
+			std::cout << KYEL << " OK " << KNRM << std::endl;
+			hasok = true;
 		}
-		catch (std::exception &e)
+		else
 		{
-			std::cout << "CommunicationSocket::getDatagram(): " << e.what() << std::endl;
+			try
+			{
+				this->_datagram_stack.push(datagram);
+			}
+			catch (std::exception &e)
+			{
+				std::cout << "CommunicationSocket::getDatagram(): " << e.what() << std::endl;
+			}
 		}
 	}
+	return hasok;
 }
 
 void	CommunicationSocket::get_peer(std::string data, Map &map) const
@@ -150,7 +161,7 @@ void		CommunicationSocket::send_datagram(std::string header, std::string message
 void		CommunicationSocket::send_datagram(Datagram const & datagram) const
 {
 	std::string			data(datagram.getHeader() + datagram.getMessage());
-
+	// std::cout << "sending datagram : [" << data << "]" << std::endl;;
 	if (send(this->_socket, data.c_str(), data.length(), 0) < 0)
 		throw("CommunicationSocket:send_datagram(): send error\n");
 }
@@ -237,8 +248,6 @@ Map		CommunicationSocket::get_first_info(Map &map, Position& start, Position &en
 		ss >> header >> id >> x >> y;
 		map[x][y].total_cars++;
 	};
-
-
 	while (!done)
 	{
 		raw = this->read();
@@ -292,7 +301,7 @@ bool		CommunicationSocket::get_datagram(Datagram & datagram)
 	{
 		if (!this->_datagram_stack.empty())
 		{
-			this->_datagram_stack.top();
+			datagram = this->_datagram_stack.top();
 			this->_datagram_stack.pop();
 			return (true);
 		}
@@ -326,18 +335,11 @@ void				CommunicationSocket::wait_for_move(void)
 	FD_COPY(&_rfds, &copy);
 
 	/* Need to think about the structure, multithreaded or not */
-	std::cout << "Entering move" << std::endl;
-	while (!moved && select(_socket + 1, &_rfds, NULL, NULL, &_tv) >= 0)
+	while (!moved && select(_socket + 1, &_rfds, NULL, NULL, NULL) >= 0)
 	{
 		if (FD_ISSET(_socket, &copy))
 		{
-			this->get_datagram();
-			data = this->_datagram_stack.top();
-			if (data.getHeader() == "ok")
-			{
-				moved = true;
-				this->_datagram_stack.pop();
-			}
+			moved = this->get_datagram();
 			FD_ZERO(&_rfds);
 			FD_COPY(&copy, &_rfds);
 		}

client/srcs/Graph.class.cpp

@@ -11,9 +11,6 @@ Graph::Graph(Map & map)
 	_mapHeight = map[0].size();
 	_vertexNumber = _mapHeight * _mapWidth;
 
-	std::cout << _mapWidth << " -- " << _mapHeight << std::endl;
-	std::cout << "vertex number : " << _vertexNumber;
-
 	this->_nodes.resize(_vertexNumber);
 	// this->_graph.resize(_vertexNumber);
 

servertest.py

@@ -1,17 +1,32 @@
 import socket
 import sys
 import time
+import random
+
+def choose():
+    n = random.randint(0, 10)
+    if n < 2:
+        return 0
+    return 1
 
 def send_map(conn):
-    conn.sendall("msz 10 5\n")
-    conn.sendall("bct 0 0 1\n")
-    conn.sendall("bct 0 1 0\n")
-    conn.sendall("bct 1 1 0\n")
-    conn.sendall("bct 1 0 0\n")
-    conn.sendall("ppo 1 0\n")
-    conn.sendall("des 0 1\n")
+    conn.sendall("WELCOME\n")
+    time.sleep(1)
+    conn.sendall("msz 4 4\n")
+    for i in range(4):
+        for j in range(4):
+            msg = "bct "
+            msg += str(i) + " " + str(j) + " " + str(choose()) + "\n"
+            conn.sendall(msg)
+
+    conn.sendall("ppo 0 0\n")
+    conn.sendall("des 3 3\n")
+    conn.sendall("done\n")
     time.sleep(1)
+    conn.sendall("pnw 1 1\n")
+    conn.sendall("pnw 0 0\n")
     conn.sendall("done\n")
+    time.sleep(1)
     conn.sendall("start\n")
 
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)