Display start and target locations

main.cc

@@ -13,6 +13,18 @@
 
 using namespace std;
 
+// Tile codes
+#define FREE 0
+#define WALL 1
+#define ORIGIN 2
+#define TARGET 3
+#define DISCOVERED 4
+#define TRACE 5
+
+unsigned int identifyTile(unsigned int y, unsigned int x, unsigned int l) {
+	return y * l + x;
+}
+
 class World
 {
 	private:
@@ -38,15 +50,15 @@ class World
 			// Add walls to the first and last columns
 			for (unsigned int i = 0; i < h; i++)
 			{
-				board[i * l] = 1;
-				board[i * l + l - 1] = 1;
+				board[i * l] = WALL;
+				board[i * l + l - 1] = WALL;
 			}
 
 			// Add walls to the first and last lines
 			for (unsigned int j = 0; j < l; j++)
 			{
-				board[j] = 1;
-				board[(h - 1) * l + j] = 1;
+				board[j] = WALL;
+				board[(h - 1) * l + j] = WALL;
 			}
 
 			for (unsigned int i = 0; i < h; i++)
@@ -57,7 +69,7 @@ class World
 					// the starting tile nor the goal tile 
 					if ((double) rand() / RAND_MAX < p && !(i == 1 && j == 1) && !(i == h - 2 && j == l - 2))
 					{
-						board[i * l + j] = 1;
+						board[i * l + j] = WALL;
 					}
 				}
 			}
@@ -70,17 +82,26 @@ class World
 			{
 				for (unsigned int j = 0; j < l; j++)
 				{
-					switch (board[i * l + j])
+					switch (board[identifyTile(i, j, l)])
 					{
-						case 0:
+						case FREE:
 							cout << " ";
 							break;
-						case 1:
+						case WALL:
 							cout << "#";
 							break;
-						case 2:
+						case ORIGIN:
+							cout << "o";
+							break;
+						case TARGET:
+							cout << "T";
+							break;
+						case DISCOVERED:
 							cout << "+";
 							break;
+						case TRACE:
+							cout << "*";
+							break;
 					}
 				}
 				cout << endl;
@@ -95,7 +116,7 @@ class World
 		{
 			unsigned int n = 0;
 
-			if (i >= 0 && i < size && board[i] != 1)
+			if (i >= 0 && i < size && board[i] != WALL)
 			{
 				// if i is a correct tile number (inside the array and not on a wall)
 				// look in the four adjacent tiles and keep only those with no wall
@@ -103,7 +124,7 @@ class World
 
 				for (unsigned int k = 0; k < 4; k++)
 				{
-					if (board[moves[k]] != 1)
+					if (board[moves[k]] != WALL)
 					{
 						r[n] = moves[k];
 						n++;
@@ -115,12 +136,17 @@ class World
 		}
 
 		// Mark a list of points in the world
-		void mark(const list<unsigned int>& path, int value = 2) {
+		void markAll(const list<unsigned int>& path, int value = 2) {
 			for (auto tile : path) {
-				board[tile] = value;
+				markOne(tile, value);
 			}
 		}
 
+		// Mark a point in the world
+		void markOne(unsigned int tile, int value = 3) {
+			board[tile] = value;
+		}
+
 
 
 		// Depth-first search
@@ -180,10 +206,13 @@ int main()
 
 	World w(l, h, wallProbability);
 
-	unsigned int start(1), end(5);
+	unsigned int start(identifyTile(1, 1, l));
+	unsigned int end(identifyTile(h - 2, l - 2, l));
 
 	// Display it
 	cout << endl << "Generated world" << endl;
+	w.markOne(start, ORIGIN);
+	w.markOne(end, TARGET);
 	w.display();
 
 	// Find a path with Depth-First Search
@@ -193,7 +222,7 @@ int main()
 	// Display DFS
 	cout << endl << "Depth-First Search" << endl;
 
-	w.mark(dfsPath);
+	w.markAll(dfsPath);
 	w.display();
 
 	return 0;