From 731818535ab434885482c4778f20b27559ee59e6 Mon Sep 17 00:00:00 2001 From: Marc Michalsky Date: Fri, 10 Apr 2020 11:29:35 +0200 Subject: [PATCH] =?UTF-8?q?tern=C3=A4ren=20Operator=20in=20Methode=20freie?= =?UTF-8?q?Sitze()=20angewendet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/vcs.xml | 6 ++++++ Kino.iml | 12 ++++++++++++ src/gfn/marc/version1/Main_v1.java | 10 +++------- src/gfn/marc/version2/Main_v2.java | 6 +----- 4 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 .idea/vcs.xml create mode 100644 Kino.iml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Kino.iml b/Kino.iml new file mode 100644 index 0000000..d5c0743 --- /dev/null +++ b/Kino.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/gfn/marc/version1/Main_v1.java b/src/gfn/marc/version1/Main_v1.java index ab8a952..85059f2 100644 --- a/src/gfn/marc/version1/Main_v1.java +++ b/src/gfn/marc/version1/Main_v1.java @@ -136,19 +136,15 @@ public class Main_v1 { } static int freieSitze(int anzahlSitze) { - int zaehler = 0; + int zaehler; for (int i = 0; i < sitzplan.length; i++) { + zaehler = 0; for (int j = 0; j < sitzplan[i].length; j++) { - if (sitzplan[i][j].isStatus()) { - zaehler++; - } else { - zaehler = 0; - } + zaehler = sitzplan[i][j].isStatus() ? zaehler + 1 : 0; if (zaehler >= anzahlSitze) { return sitzplan[i][j - (zaehler - 1)].getNummer(); } } - zaehler = 0; } return 0; } diff --git a/src/gfn/marc/version2/Main_v2.java b/src/gfn/marc/version2/Main_v2.java index 5c4666f..6d538a6 100644 --- a/src/gfn/marc/version2/Main_v2.java +++ b/src/gfn/marc/version2/Main_v2.java @@ -129,11 +129,7 @@ public class Main_v2 { static int freieSitze(int anzahlSitze) { int zaehler = 0; for (int i = 0; i < sitzplan.size(); i++) { - if (sitzplan.get(i).isStatus()) { - zaehler++; - } else { - zaehler = 0; - } + zaehler = sitzplan.get(i).isStatus() ? zaehler + 1 : 0; if (zaehler == anzahlSitze) { return sitzplan.get(i - (zaehler - 1)).getNummer(); }