Unterschiede

Hier werden die Unterschiede zwischen zwei Versionen angezeigt.

--- bwinf:bwinf40ju2:start [2023/06/18 18:39] – Martin Pabst
+++ bwinf:bwinf40ju2:start [2023/06/18 18:56] (aktuell) – Martin Pabst
@@ Zeile 16: / Zeile 16: @@
 class Data {
-   int numberOfHouses;
+   int personenAnzahl;
-   int numberOfWindTurbines;
+   int terminAnzahl;
-   Vector2[] housePositions;
+   int[][] praeferenzen;
-   Vector2[] turbinePositions;
    void readFromFile(String filename) {
@@ Zeile 27: / Zeile 26: @@
       String[] firstLine = lines[0].split(" ");
-      numberOfHouses = Integer.parseInt(firstLine[0]);
+      personenAnzahl = Integer.parseInt(firstLine[0]);
-      numberOfWindTurbines = Integer.parseInt(firstLine[1]);
+      terminAnzahl = Integer.parseInt(firstLine[1]);
-      println("Found " + numberOfHouses + " Houses, " + numberOfWindTurbines + " wind turbines");
+      println(personenAnzahl + " Personen und " + terminAnzahl + " Termine werden gelesen...");
-      housePositions = new Vector2[numberOfHouses];
+      praeferenzen = new int[personenAnzahl][terminAnzahl];
-      turbinePositions = new Vector2[numberOfWindTurbines];
-      int lineNumber = 1;
+      for (int i = 0; i < personenAnzahl; i++) {
-      for (int i = 0; i < numberOfHouses; i++) {
+         String[] line = lines[i + 1].split(" ");
-         String[] line = lines[lineNumber].split(" ");
+         for (int j = 0; j < terminAnzahl; j++) {
-         housePositions[i] = new Vector2(Double.parseDouble(line[0]), Double.parseDouble(line[1]));
+            praeferenzen[i][j] = Integer.parseInt(line[j]);
-         lineNumber++;
+         }
       }
-      for (int i = 0; i < numberOfWindTurbines; i++) {
-         String[] line = lines[lineNumber].split(" ");
-         turbinePositions[i] = new Vector2(Double.parseDouble(line[0]), Double.parseDouble(line[1]));
-         lineNumber++;
-      }
    }