From 9b8d284981fa0e0a3b4634fec9ae58b04ac10450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= <anton@sijanec.eu>
Date: Tue, 19 Dec 2023 23:47:39 +0100
Subject: dn07p1

---
 "\305\241ola/p1/dn/7/Blok.java" | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'šola/p1/dn/7/Blok.java')

diff --git "a/\305\241ola/p1/dn/7/Blok.java" "b/\305\241ola/p1/dn/7/Blok.java"
index 2ac1863..a646dc9 100644
--- "a/\305\241ola/p1/dn/7/Blok.java"
+++ "b/\305\241ola/p1/dn/7/Blok.java"
@@ -1,11 +1,23 @@
 import java.util.*;
 public class Blok {
-	private Stanovanje stanovanje;
+	public Stanovanje stanovanje;
 	public Blok(Stanovanje stanovanje) {
 		this.stanovanje = stanovanje;
 	}
 	public Oseba starosta() {
-		return this.stanovanje.starostaSosescine();
+		Oseba r = null;
+		for (Oseba[] os : this.stanovanje.staroste()) {
+			if (os[0] == null)
+				continue;
+			if (r == null) {
+				r = os[0];
+				continue;
+			}
+			if (os[0].jeStarejsaOd(r))
+				r = os[0];
+				
+		}
+		return r;
 	}
 	public int[][] razporeditev() {
 		int minx = Integer.MAX_VALUE;
@@ -22,12 +34,12 @@ public class Blok {
 			if (tuple[2] < miny)
 				miny = tuple[2];
 		}
-		int[][] r = new int[maxx-minx+1][maxy-miny+1];
+		int[][] r = new int[maxy-miny+1][maxx-minx+1];
 		for (int i = 0; i < r.length; i++)
 			for (int j = 0; j < r[i].length; j++)
 				r[i][j] = -1;
 		for (int[] tuple : stanovanje.pozicije())
-			r[tuple[1]-minx][tuple[2]-miny] = tuple[0]; // TODO think again
+			r[maxy-miny-(tuple[2]-miny)][tuple[1]-minx] = tuple[0]; // TODO think again
 		return r;
 	}
 }
-- 
cgit v1.2.3