Correction a*, mauvaise compréhension de l'algo

Author: Gabriel Derrien

bin/.gitignore

@@ -67,9 +67,9 @@ public void solve(boolean manhattan)
 
 		//Compute F value of Starting square
 		if(manhattan)
-			this.maze.getStart().calcManhattanH(this.maze.getEnd());
+			this.maze.getStart().calcManhattanH();
 		else
-			this.maze.getStart().calcEuclidH(this.maze.getEnd());
+			this.maze.getStart().calcEuclidH();
 
 		this.maze.getStart().calcF();
 
@@ -88,13 +88,10 @@ public void solve(boolean manhattan)
 
 			else
 			{
-				//Square current = this.openNodes.remove();
 				Node<Maze> current = this.openNodes.remove();
 				this.maze = (Maze) current.getContent();
 				Square currState = this.maze.getCurrState();
 
-				//System.out.println(this.maze.printMaze());
-				
 				if(currState.getCol() == this.maze.getEnd().getCol() && currState.getLine() == this.maze.getEnd().getLine())
 				{
 					Node<Maze> temp = new Node<Maze>(this.maze);
@@ -149,24 +146,20 @@ public LinkedList<Node<Maze>> getNextSquares(Boolean manhattan)
 
 		//Get 4 next squares
 		LinkedList<Maze> nexts = this.maze.getCurrState().getNexts();
-		Square start = this.maze.getStart();
-		Square end = this.maze.getEnd();
+		
+		int gCurrent = this.maze.getCurrState().getG();
 
 		for(int i = 0; i < nexts.size(); i++)
 		{
 			Square tempSq = nexts.get(i).getCurrState();
 			if(!this.closedSquares.contains(tempSq))
 			{
 				if(manhattan)
-				{
-					nexts.get(i).getCurrState().calcManhattanG(start);
-					nexts.get(i).getCurrState().calcManhattanH(end);
-				}
+					nexts.get(i).getCurrState().calcManhattanH();
 				else
-				{
-					nexts.get(i).getCurrState().calcEuclidG(start);
-					nexts.get(i).getCurrState().calcEuclidH(end);
-				}
+					nexts.get(i).getCurrState().calcEuclidH();
+				
+				nexts.get(i).getCurrState().incG(gCurrent);
 
 				nexts.get(i).getCurrState().calcF();
 

bin/AStarSolver.class

@@ -29,16 +29,16 @@ public static void main(String[] args) throws IOException
 
 		//System.out.println(lab2.toString());
 
-		//BFS_Solver b2 = new BFS_Solver(lab2);
-		//DFS_Solver d2 = new DFS_Solver(lab2);
+		BFS_Solver b2 = new BFS_Solver(lab2);
+		DFS_Solver d2 = new DFS_Solver(lab2);
 		AStarSolver a2 = new AStarSolver(lab2);
 
-		//b2.solve();
-		//d2.solve();
+		b2.solve();
+		d2.solve();
 		a2.solve(true);
 
-		//System.out.println(b2.getResult());
-		//System.out.println(d2.getResult());
+		System.out.println(b2.getResult());
+		System.out.println(d2.getResult());
 		System.out.println(a2.getResult());
 
 		a2.solve(false);

bin/Main.class

@@ -229,8 +229,8 @@ public void setOrder(char[] newOrder)
 	 */
 	public void resetOrder()
 	{
-		char[] no = {'N', 'E', 'S', 'W'}; 
-		this.order = no;
+		char[] o = {'N', 'E', 'S', 'W'}; 
+		this.order = o;
 	}
 
 	/*

bin/Maze.class

@@ -10,7 +10,7 @@ public class Square
 	private boolean wall;
 	public int depth;
 
-	private double g;
+	private int g;
 	private double h;
 	private double f;
 
@@ -248,24 +248,22 @@ public double getH()
 	 * Computes the H value with the Manhattan distance
 	 * end: The ending Square in the maze
 	 */
-	public void calcManhattanH(Square end) 
+	public void calcManhattanH() 
 	{
-		if(end.getAttribute() == "E")
-			this.h = Math.abs( this.getLine() - end.getLine() ) 
-					 + Math.abs( this.getCol() - end.getCol() );
+		this.h = Math.abs( this.getLine() - this.maze.getEnd().getLine() ) 
+				 + Math.abs( this.getCol() - this.maze.getEnd().getCol() );
 	}
 
 	/*
 	 * Computes the H value with the Euclidean distance
 	 * end: The ending Square in the maze
 	 */
-	public void calcEuclidH(Square end)
+	public void calcEuclidH()
 	{
-		if(end.getAttribute() == "E")
-			this.h = Math.sqrt(
-						Math.pow( this.getLine() - end.getLine(), 2 ) 
-						+ Math.pow( this.getCol() - end.getCol(), 2 )
-					);
+		this.h = Math.sqrt(
+					Math.pow( this.getLine() - this.maze.getEnd().getLine(), 2 ) 
+					+ Math.pow( this.getCol() - this.maze.getEnd().getCol(), 2 )
+				);
 	}
 
 	//----------------------
@@ -275,33 +273,17 @@ public void calcEuclidH(Square end)
 	/*
 	 * Returns G value
 	 */
-	public double getG() 
+	public int getG() 
 	{
 		return g;
 	}
 
 	/*
-	 * Computes the G value with the Manhattan distance
-	 * start: The starting Square in the maze
+	 * Increases the G value
 	 */
-	public void calcManhattanG(Square start)
+	public void incG(int prev)
 	{
-		if(start.getAttribute() == "S")
-			this.g = Math.abs( this.getLine() - start.getLine() ) 
-					 + Math.abs( this.getCol() - start.getCol() );
-	}
-	
-	/*
-	 * Computes the G value with the Euclidean distance
-	 * start: The starting Square in the maze
-	 */
-	public void calcEuclidG(Square start)
-	{
-		if(start.getAttribute() == "S")
-			this.g = Math.sqrt( 
-						Math.pow( this.getLine() - start.getLine(), 2 ) 
-						+ Math.pow( this.getCol() - start.getCol(), 2 ) 
-					);
+		this.g = 1 + prev;
 	}
 
 	//----------------------