Version RENDUE finale

Author: Gabriel Derrien

bin/AStarSolver$1.class

@@ -19,13 +19,22 @@ public AStarSolver(Maze m, Boolean manhattan)
 		{
 			public int compare(Node<Maze> s1, Node<Maze> s2) 
 		    {
-		    	Double cs1 = s1.getContent().getCurrState().getF();
-		    	Double cs2 = s2.getContent().getCurrState().getF();
+		    	Double sf1 = s1.getContent().getCurrState().getF();
+		    	Double sf2 = s2.getContent().getCurrState().getF();
+		    	Double sh1 = s1.getContent().getCurrState().getH();
+		    	Double sh2 = s2.getContent().getCurrState().getH();
 
-		    	if(cs1 > cs2)
+		    	if(sf1 > sf2)
 		    		return 1;
-		    	else if(cs1 == cs2)
-		    		return 0;
+		    	else if(sf1 == sf2)
+		    	{
+		    		if(sh1 > sh2)
+		    			return 1;
+		    		else if(sh1 == sh2)
+		    			return 0;
+		    		else
+		    			return -1;
+		    	}
 		    	else
 		    		return -1;
 		    }
@@ -34,13 +43,22 @@ else if(cs1 == cs2)
 		{
 			public int compare(Square s1, Square s2) 
 		    {
-		    	Double cs1 = s1.getF();
-		    	Double cs2 = s2.getF();
+				Double sf1 = s1.getF();
+		    	Double sf2 = s2.getF();
+		    	Double sh1 = s1.getH();
+		    	Double sh2 = s2.getH();
 
-		    	if(cs1 > cs2)
+		    	if(sf1 > sf2)
 		    		return 1;
-		    	else if(cs1 == cs2)
-		    		return 0;
+		    	else if(sf1 == sf2)
+		    	{
+		    		if(sh1 > sh2)
+		    			return 1;
+		    		else if(sh1 == sh2)
+		    			return 0;
+		    		else
+		    			return -1;
+		    	}
 		    	else
 		    		return -1;
 		    }

bin/AStarSolver$2.class

@@ -89,9 +89,10 @@ public String solve()
 
 		if(endfound)
 		{
-			this.maze.initMaze();
+			this.maze.resetGrid();
 			Node<Maze> revertedTree = ((Stack<Node<Maze>>) this.frontier).pop();
 
+			revertedTree = revertedTree.getFather().getFather();
 			this.result += "Path: " + this.maze.getEnd().toString() + "(End) <- ";
 			this.pathLength++;
 

bin/AStarSolver.class

@@ -22,9 +22,9 @@ public static void main(String[] args) throws IOException
 		//====================
 		//====================
 
-		Maze lab2 = new Maze("./data/test.txt");
+		Maze lab2 = new Maze("./data/lab.txt");
 
-		//char[] order = {'N', 'W', 'S', 'E'};
+		//char[] order = {'W', 'E', 'N', 'S'};
 		//lab2.setOrder(order);
 
 		//System.out.println(lab2.toString());