Added maze deallocation.

Author: Jacob Priddy

PathFinder/Globals.h

@@ -19,7 +19,7 @@ struct Coordinate
 struct Branch
 {
 
-	Branch(Coordinate a)
+	Branch(Coordinate a = Coordinate())
 	{
 		Left = NULL;
 		Right = NULL;
@@ -30,14 +30,6 @@ struct Branch
 		Pos = a;
 	}
 
-	~Branch()
-	{
-		delete Left;
-		delete Right;
-		delete Up;
-		delete Down;
-	}
-
 	//Points to the left branch
 	Branch* Left;
 
@@ -54,7 +46,7 @@ struct Branch
 	int Data = -1;
 
 	//Coordinate of the branch.
-	Coordinate Pos = Coordinate();
+	Coordinate Pos;
 };
 
 #endif

PathFinder/PathFinder.cpp

@@ -1,50 +1,39 @@
 #include "PathFinder.h"
 #include "Globals.h"
 
-
-PathFinder::PathFinder()
-{
-}
-
-
 PathFinder::~PathFinder()
 {
-
-	
-
+	this->NavDeepDelete(this->TreeRoot);
 }
 
 bool PathFinder::NavDeepDelete(Branch *Check)
 {
-	// this deallocates the memory
-
-	bool u = false;
-	bool d = false;;
-	bool l = false;
-	bool r = false;;
-
-	while (true)
+	if (Check)
 	{
-		NavDeepDelete(Check->Up);
-		NavDeepDelete(Check->Down);
-		NavDeepDelete(Check->Left);
-		NavDeepDelete(Check->Right);
+		if(
+			this->NavDeepDelete(Check->Up) && 
+			this->NavDeepDelete(Check->Down) && 
+			this->NavDeepDelete(Check->Left) && 
+			this->NavDeepDelete(Check->Right)
+			)
+		{
+			delete Check;
+			return true;
+		}
+		return false;
 	}
-
-	if (u == true && d == true && l == true && r == true)
+	else
 	{
-		std::cout << "Deleted a branch!" << std::endl;
-		delete Check;
 		return true;
 	}
-
 }
 
-PathFinder::PathFinder(std::vector<std::vector<int>> maze, Coordinate start, Coordinate end)
+PathFinder::PathFinder(std::vector<std::vector<int>> maze, Coordinate start, Coordinate end, Branch * Root)
 {
 	Maze = maze;
 	StartOfMaze = start;
 	EndOfMaze = end;
+	this->TreeRoot = Root;
 }
 
 

PathFinder/PathFinder.h

@@ -6,10 +6,10 @@
 
 class PathFinder
 {
+protected:
+	Branch * TreeRoot;
 public:
-	PathFinder();
-	~PathFinder();
-	PathFinder(std::vector<std::vector<int>> maze, Coordinate start, Coordinate end);
+	PathFinder(std::vector<std::vector<int>> maze, Coordinate start, Coordinate end, Branch * Root);
 
 
 	std::vector<std::vector<int>> Maze;
@@ -34,6 +34,6 @@ class PathFinder
 
 	//Checks if coordinates are indeed inside maze
 	bool CheckValidCoordinates(Coordinate a);
-	
+	~PathFinder();
 };
 

PathFinder/PathFinder.vcxproj.filters

@@ -27,7 +27,7 @@
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Globals.h">
-      <Filter>Source Files</Filter>
+      <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
 </Project>

PathFinder/Source.cpp

@@ -40,19 +40,17 @@ int main()
 	Coordinate BeginMaze = Coordinate(0,0);
 	Coordinate EndMaze = Coordinate(6,21);
 
-	PathFinder A = PathFinder(Maze, BeginMaze, EndMaze);
+	// This gets automatically deallocated when the program ends.
+	Branch * Root = new Branch(BeginMaze);
 
-	
-	Branch Root(BeginMaze);
-
-	Branch *RealRoot = &Root;
+	PathFinder MazeSolver = PathFinder(Maze, BeginMaze, EndMaze, Root);
 
 	vector<Coordinate> Path;
 	Path.push_back(BeginMaze);
 
-	A.BranchAll(BeginMaze, Path, RealRoot);
+	MazeSolver.BranchAll(BeginMaze, Path, Root);
 
-	Path = A.GetShortest(EndMaze);
+	Path = MazeSolver.GetShortest(EndMaze);
 
 	cout << "Path Size:" << endl;
 	cout << Path.size() << endl;
@@ -91,7 +89,6 @@ int main()
 		}
 	}
 
-	A.NavDeepDelete(RealRoot);
 
 	//Pauses Program
 	system("PAUSE");