From 598e17827a63a65bce4278f1a398c3fe08a1ed10 Mon Sep 17 00:00:00 2001
From: id101010 <aaron@duckpond.ch>
Date: Thu, 16 Jun 2016 23:57:26 +0200
Subject: [PATCH] Refatored Vertex class and changed initialization

---
 src/ch/bfh/sevennotseven/Game.java   |  9 +++++++++
 src/ch/bfh/sevennotseven/Vertex.java | 22 ++++++++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/ch/bfh/sevennotseven/Game.java b/src/ch/bfh/sevennotseven/Game.java
index a4d376b..aeb459a 100644
--- a/src/ch/bfh/sevennotseven/Game.java
+++ b/src/ch/bfh/sevennotseven/Game.java
@@ -94,6 +94,15 @@ public class Game {
 		Vertex v = new Vertex(0, dst);
 		int tmp, tmp_i = 0;
 		int alt = 0;
+
+		// Get a verticies list from the field data
+		for(int i = 0; i < size; i++){
+			for(int j = 0; i < size; i++){
+				if(field[i][j] == 0){
+					vertices.add(new Vertex(Integer.MAX_VALUE, new Point(i, j)));		
+				}		
+			}
+		}
 		
 		for(int i = 0; i < size*size; i++){
 			vertices.add(new Vertex(Integer.MAX_VALUE, new Point(i%7,i%7))); // Initialize all vertices
diff --git a/src/ch/bfh/sevennotseven/Vertex.java b/src/ch/bfh/sevennotseven/Vertex.java
index 1a7cabc..8c375c8 100644
--- a/src/ch/bfh/sevennotseven/Vertex.java
+++ b/src/ch/bfh/sevennotseven/Vertex.java
@@ -5,26 +5,36 @@ import java.awt.Point;
 public class Vertex {
 	
 	private int dist;
-	private Point prev;
+	private Point pos;
+	private Vertex prev;
 	
-	public Vertex(int dist, Point prev) {
+	public Vertex(int dist, Point pos) {
 		this.dist = dist;
-		this.prev = prev;
+		this.pos = pos;
+		this.prev = new Vertex(0, new Point(0,0));
 	}
 	
 	public void setDist(int dist){
 		this.dist = dist;
 	}
 	
-	public void setPrev(Point prev){
-		this.prev = prev;
+	public void setPos(Point pos){
+		this.pos = pos;
+	}
+	
+	public void setPrev(Vertex prev){
+		this.prev = prev;		
 	}
 	
 	public int getDist(){
 		return this.dist;
 	}
 	
-	public Point getPrev(){
+	public Point getPos(){
+		return this.pos;
+	}
+	
+	public Vertex getPrev(){
 		return this.prev;
 	}