A* completo

Macro21 · Mar 10, 2018 · 3f68925 · 3f68925
1 parent 959301b
commit 3f68925
Show file tree

Hide file tree

Showing 12 changed files with 508 additions and 189 deletions.
diff --git a/Practica 1/bin/aStar/Board$1.class b/Practica 1/bin/aStar/Board$1.class
diff --git a/Practica 1/bin/aStar/Board$2.class b/Practica 1/bin/aStar/Board$2.class
diff --git a/Practica 1/bin/aStar/Board$3.class b/Practica 1/bin/aStar/Board$3.class
diff --git a/Practica 1/bin/aStar/Board.class b/Practica 1/bin/aStar/Board.class
diff --git a/Practica 1/bin/aStar/Star$2.class b/Practica 1/bin/aStar/Star$2.class
diff --git a/Practica 1/bin/aStar/Star.class b/Practica 1/bin/aStar/Star.class
diff --git a/Practica 1/bin/dataStructures/Cell.class b/Practica 1/bin/dataStructures/Cell.class
diff --git a/Practica 1/bin/dataStructures/Data.class b/Practica 1/bin/dataStructures/Data.class
diff --git a/Practica 1/src/aStar/Board.java b/Practica 1/src/aStar/Board.java
diff --git a/Practica 1/src/aStar/Star.java b/Practica 1/src/aStar/Star.java
diff --git a/Practica 1/src/dataStructures/Cell.java b/Practica 1/src/dataStructures/Cell.java
@@ -12,17 +12,21 @@ public class Cell {
 	private double g;
 	private double h;
 	private double f;
+	private Cell father;
+	private boolean isBarrier;
 
 	public Cell() {
 		this.cell = new JButton();
 		this.cell.setBackground(new Color(255,255,204));
+		isBarrier = false;
 	}
 
 	public Cell(int x, int y) {
 		this.x = x;
 		this.y = y;
 		this.cell = new JButton();
 		this.cell.setBackground(new Color(255,255,204));
+		isBarrier = false;
 	}
 
 	public void mark(Color c) {
@@ -41,15 +45,11 @@ public JButton getCell() {
 		return cell;
 	}
 
-	public void isBarrier() {
+	public void setBarrier() {
 		this.cell.setBackground(new java.awt.Color(0, 0, 0));
-		this.cell.setFont(new java.awt.Font("Verdana", 0, 16)); 
-		this.cell.setForeground(new java.awt.Color(255, 0, 0));
-		this.cell.setText("X");
-	}
-
-	public void setCell(JButton cell) {
-		this.cell = cell;
+		isBarrier = true;
+		//this.cell.setFont(new java.awt.Font("Verdana", 0, 16)); 
+		//this.cell.setForeground(new java.awt.Color(255, 0, 0));
 	}
 
 	public double getG() {
@@ -99,4 +99,26 @@ else if (this.h == c2.getH()) {
 	public void setDefaultColor() {
 		this.cell.setBackground(new Color(255,255,204));
 	}
+
+	public void setFather(Cell father) {
+		this.father = father;
+	}
+
+	public Cell getFather() {
+		return this.father;
+	}
+
+	public boolean isBarrier() {
+		return this.isBarrier;
+	}
+
+	public void setStart() {
+		// TODO Auto-generated method stub
+		this.cell.setBackground(new Color(0,0,153));
+	}
+
+	public void setGoal() {
+		// TODO Auto-generated method stub
+		this.cell.setBackground(new Color(128,255,0));
+	}
 }
diff --git a/Practica 1/src/dataStructures/Data.java b/Practica 1/src/dataStructures/Data.java
@@ -2,14 +2,12 @@
 
 public class Data {
 
-	private int index;
 	private boolean found;
 	private Cell cell;
 
-	public Data(boolean found, Cell cell, int index) {
+	public Data(boolean found, Cell cell) {
 		this.found = found;
 		this.cell = cell;
-		this.index = index;
 	}
 
 	public Cell getCell() {
@@ -20,10 +18,6 @@ public boolean isFound() {
 		return found;
 	}
 
-	public int getIndex() {
-		return index;
-	}
-
 	public void setCell(Cell cell) {
 		this.cell = cell;
 	}