X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=spa2-materijali.git;a=blobdiff_plain;f=PretrazivanjeSaVracanjem%2FLavirint%2FNajboljiPut%2FMapa.java;h=d90f1f26ea3fa746b9597cdf118b9138a23fa847;hp=a5e8a1574e305c25da47fc73967029f737240d43;hb=5d2538154a96eacb64e24e362003bbe8c61711d7;hpb=d75e70fd4e3deb018ee29b445e9a8ff5e2b19487

diff --git a/PretrazivanjeSaVracanjem/Lavirint/NajboljiPut/Mapa.java b/PretrazivanjeSaVracanjem/Lavirint/NajboljiPut/Mapa.java
index a5e8a15..d90f1f2 100644
--- a/PretrazivanjeSaVracanjem/Lavirint/NajboljiPut/Mapa.java
+++ b/PretrazivanjeSaVracanjem/Lavirint/NajboljiPut/Mapa.java
@@ -1,78 +1,89 @@
 public class Mapa {
- public final static int IZLAZ = -99;
- public final static int ZID = -11;
- public final static int ERROR = Integer.MIN_VALUE;
+	public final static int IZLAZ = -99;
+	public final static int ZID = -11;
+	public final static int ERROR = Integer.MIN_VALUE;
 
- private int visina, sirina;
- private int[][] mat;
- private boolean[][] pos;
+	private int visina, sirina;
+	private int[][] mat;
+	private boolean[][] pos;
 
- public int getSirina() {
-  return sirina;
- }
+	public int getSirina() {
+		return sirina;
+	}
 
- public int getVisina() {
-  return visina;
- }
+	public int getVisina() {
+		return visina;
+	}
 
- public void setPos(int x, int y, boolean b) {
-  if (0 <= x && x < sirina && 0 <= y && y < visina) {
-   pos[x][y] = b;
-  }
- }
+	public void setPos(int x, int y, boolean b) {
+		if (0 <= x && x < sirina && 0 <= y && y < visina) {
+			pos[x][y] = b;
+		}
+	}
 
- public boolean getPos(int x, int y) {
-  if (0 <= x && x < sirina && 0 <= y && y < visina) {
-   return pos[x][y];
-  } else {
-   return true;
-  }
- }
+	public boolean getPos(int x, int y) {
+		if (0 <= x && x < sirina && 0 <= y && y < visina) {
+			return pos[x][y];
+		} else {
+			return true;
+		}
+	}
 
- public int getMat(int x, int y) {
-  if (0 <= x && x < sirina && 0 <= y && y < visina) {
-   return mat[x][y];
-  } else {
-   return ERROR;
-  }
- }
+	public int getMat(int x, int y) {
+		if (0 <= x && x < sirina && 0 <= y && y < visina) {
+			return mat[x][y];
+		} else {
+			return ERROR;
+		}
+	}
 
- public Mapa(int sirina, int visina) {
-  this.sirina = sirina;
-  this.visina = visina;
-  mat = new int[sirina][visina];
-  pos = new boolean[sirina][visina];
- }
+	public Mapa(int sirina, int visina) {
+		this.sirina = sirina;
+		this.visina = visina;
+		mat = new int[sirina][visina];
+		pos = new boolean[sirina][visina];
+	}
 
- public static Mapa ucitajIzFajla(String imeFajla) {
-  if (!Svetovid.testIn(imeFajla)) {
-   return null;
-  }
+	public Mapa(String imeFajla) {
+		if (!Svetovid.testIn(imeFajla)) {
+			throw new RuntimeException("Fajl za kreiranje mape ("
+				+ imeFajla + ") nije prisupacan");
+		}
 
-  int sirina = Svetovid.in(imeFajla).readInt();
-  int visina = Svetovid.in(imeFajla).readInt();
-  if (sirina >= 0 && visina >= 0) {
-   Mapa res = new Mapa(sirina, visina);
-   for (int j = 0; j < visina; j++)
-    for (int i = 0; i < sirina; i++)
-     res.mat[i][j] = Svetovid.in(imeFajla).readInt();
-   Svetovid.closeIn(imeFajla);
-   return res;
-  } else {
-   Svetovid.closeIn(imeFajla);
-   return null;
-  }
- }
+		sirina = Svetovid.in(imeFajla).readInt();
+		visina = Svetovid.in(imeFajla).readInt();
+		mat = new int[sirina][visina];
+		pos = new boolean[sirina][visina];
+		for (int j = 0; j < visina; j++) {
+			for (int i = 0; i < sirina; i++) {
+				mat[i][j] = Svetovid.in(imeFajla).readInt();
+			}
+		}
+		Svetovid.closeIn(imeFajla);
+	}
 
- public void stampaj() {
-  if (visina != 0 && sirina != 0) {
-   System.out.println(visina + " " + sirina);
-   for (int j = 0; j < visina; j++) {
-    for (int i = 0; i < sirina; i++) {
-     System.out.print(mat[i][j] + "\t");
-    }
-    System.out.println();
-   }
-  }
- }
+	public static Mapa ucitajIzFajla(String imeFajla) {
+		if (!Svetovid.testIn(imeFajla)) {
+			return null;
+		}
+		
+		return new Mapa(imeFajla);
+
+	}
+
+	public void stampaj() {
+		if (visina != 0 && sirina != 0) {
+			System.out.println(visina + " " + sirina);
+			for (int j = 0; j < visina; j++) {
+				for (int i = 0; i < sirina; i++) {
+					System.out.print(mat[i][j] + "\t");
+				}
+				System.out.println();
+			}
+		}
+	}
+	
+	public String toString() {
+		return "Mapa velicine " + sirina + " x " + visina;
+	}
 }