diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/LF05-Java.iml b/LF05-Java.iml index 6db0c46..836905e 100644 --- a/LF05-Java.iml +++ b/LF05-Java.iml @@ -7,5 +7,21 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/fussball/Ergebnis.java b/src/fussball/Ergebnis.java new file mode 100644 index 0000000..9942724 --- /dev/null +++ b/src/fussball/Ergebnis.java @@ -0,0 +1,36 @@ +package fussball; + +public class Ergebnis { + private int tore1; + private int tore2; + + + public Ergebnis(int tore1, int tore2) { + this.tore1 = tore1; + this.tore2 = tore2; + } + + public void addTor1(){ + this.tore1 += 1; + } + + public void addTor2(){ + this.tore2 += 1; + } + + public int getTore1() { + return tore1; + } + + public void setTore1(int tore1) { + this.tore1 = tore1; + } + + public int getTore2() { + return tore2; + } + + public void setTore2(int tore2) { + this.tore2 = tore2; + } +} diff --git a/src/fussball/Mannschaft.java b/src/fussball/Mannschaft.java new file mode 100644 index 0000000..4aac9f5 --- /dev/null +++ b/src/fussball/Mannschaft.java @@ -0,0 +1,72 @@ +package fussball; + +import java.util.ArrayList; + +public class Mannschaft { + private String name; + private Torwart torwart; + private Trainer trainer; + private ArrayList spielerList; + + + public Mannschaft(String name, Torwart torwart, Trainer trainer, ArrayList spielerList) { + this.name = name; + this.torwart = torwart; + this.trainer = trainer; + this.spielerList = spielerList; + } + + public int getMotivation(){ + int motivation = 0; + + for (Spieler spieler: spielerList) { + motivation += spieler.getMotivation(); + } + motivation += torwart.getMotivation(); + + return (motivation / (spielerList.size() + 1)); + } + + public int getStaerke(){ + int staerke = 0; + + for (Spieler spieler: spielerList) { + staerke += spieler.getStaerke(); + } + staerke += torwart.getStaerke(); + + return (staerke / (spielerList.size() + 1)); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Torwart getTorwart() { + return torwart; + } + + public void setTorwart(Torwart torwart) { + this.torwart = torwart; + } + + public Trainer getTrainer() { + return trainer; + } + + public void setTrainer(Trainer trainer) { + this.trainer = trainer; + } + + public ArrayList getSpielerList() { + return spielerList; + } + + public void setSpielerList(ArrayList spielerList) { + this.spielerList = spielerList; + } +} diff --git a/src/fussball/Person.java b/src/fussball/Person.java new file mode 100644 index 0000000..85c60fe --- /dev/null +++ b/src/fussball/Person.java @@ -0,0 +1,28 @@ +package fussball; + +public abstract class Person { + private String name; + private int alter; + + + public Person(String name, int alter){ + this.name = name; + this.alter = alter; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAlter() { + return alter; + } + + public void setAlter(int alter) { + this.alter = alter; + } +} diff --git a/src/fussball/Programm.java b/src/fussball/Programm.java new file mode 100644 index 0000000..1bcc0bc --- /dev/null +++ b/src/fussball/Programm.java @@ -0,0 +1,7 @@ +package fussball; + +public class Programm { + public static void main(String[] args) { + + } +} diff --git a/src/fussball/Spiel.java b/src/fussball/Spiel.java new file mode 100644 index 0000000..5095a13 --- /dev/null +++ b/src/fussball/Spiel.java @@ -0,0 +1,35 @@ +package fussball; + +public class Spiel { + private Mannschaft heim; + private Mannschaft gast; + private Ergebnis ergebnis; + private StringBuilder spielverlauf; + + public Spiel(Mannschaft heim, Mannschaft gast, Ergebnis ergebnis, StringBuilder spielverlauf) { + this.heim = heim; + this.gast = gast; + this.ergebnis = ergebnis; + this.spielverlauf = spielverlauf; + } + + public String toString(){ + return heim.getName() + ": " + ergebnis.getTore1() ; + } + + public Mannschaft getHeim() { + return heim; + } + + public Mannschaft getGast() { + return gast; + } + + public Ergebnis getErgebnis() { + return ergebnis; + } + + public StringBuilder getSpielverlauf() { + return spielverlauf; + } +} diff --git a/src/fussball/Spieler.java b/src/fussball/Spieler.java new file mode 100644 index 0000000..a390b4b --- /dev/null +++ b/src/fussball/Spieler.java @@ -0,0 +1,66 @@ +package fussball; + +public class Spieler { + private String name; + private int alter; + private int staerke; + private int torschuss; + private int motivation; + private int tore; + + void Spieler(String name, int staerke, int torschuss, int motivation, int tore){ + this.name = name; + this.staerke = staerke; + this.torschuss = torschuss; + this.motivation = motivation; + this.tore = tore; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAlter() { + return alter; + } + + public void setAlter(int alter) { + this.alter = alter; + } + + public int getStaerke() { + return staerke; + } + + public void setStaerke(int staerke) { + this.staerke = staerke; + } + + public int getTorschuss() { + return torschuss; + } + + public void setTorschuss(int torschuss) { + this.torschuss = torschuss; + } + + public int getMotivation() { + return motivation; + } + + public void setMotivation(int motivation) { + this.motivation = motivation; + } + + public int getTore() { + return tore; + } + + public void setTore(int tore) { + this.tore = tore; + } +} diff --git a/src/fussball/Torwart.java b/src/fussball/Torwart.java new file mode 100644 index 0000000..359248a --- /dev/null +++ b/src/fussball/Torwart.java @@ -0,0 +1,13 @@ +package fussball; + +public class Torwart extends Spieler{ + private int reaktion; + + public int getReaktion() { + return reaktion; + } + + public void setReaktion(int reaktion) { + this.reaktion = reaktion; + } +} diff --git a/src/fussball/Trainer.java b/src/fussball/Trainer.java new file mode 100644 index 0000000..e81cab3 --- /dev/null +++ b/src/fussball/Trainer.java @@ -0,0 +1,24 @@ +package fussball; + +public class Trainer extends Person{ + private int erfahrung; + + public Trainer(String name, int alter, int erfahrung){ + super(name, alter); + this.erfahrung = erfahrung; + } + + public int getErfahrung(){ + return this.erfahrung; + } + + public void setErfahrung(int newErfahrung){ + this.erfahrung = newErfahrung; + } + + public String toString(){ + String erfahrungStr = "Erfahrung: " + this.erfahrung + "\n"; + + return erfahrungStr; + } +} diff --git a/src/motorrad/Motorrad.java b/src/motorrad/Motorrad.java new file mode 100644 index 0000000..8d5ac35 --- /dev/null +++ b/src/motorrad/Motorrad.java @@ -0,0 +1,15 @@ +package motorrad; + +public class Motorrad extends Vehicle{ + + + @Override + public void bremsen() { + System.out.println("Bremsen"); + } + + @Override + public void beschleunigen() { + System.out.println("fahren"); + } +} diff --git a/src/motorrad/Programm.java b/src/motorrad/Programm.java new file mode 100644 index 0000000..2b9e104 --- /dev/null +++ b/src/motorrad/Programm.java @@ -0,0 +1,10 @@ +package motorrad; + +public class Programm { + + public static void main(String[] args) { + Motorrad motorrad = new Motorrad(); + + motorrad.bremsen(); + } +} diff --git a/src/motorrad/Vehicle.java b/src/motorrad/Vehicle.java new file mode 100644 index 0000000..ff6f712 --- /dev/null +++ b/src/motorrad/Vehicle.java @@ -0,0 +1,7 @@ +package motorrad; + +public abstract class Vehicle { + + public abstract void bremsen(); + public abstract void beschleunigen(); +} diff --git a/src/rekursion/Fakultaet.java b/src/rekursion/Fakultaet.java new file mode 100644 index 0000000..a770c26 --- /dev/null +++ b/src/rekursion/Fakultaet.java @@ -0,0 +1,10 @@ +package rekursion; + +public class Fakultaet { + public static void fak(){ + + } + public static void main(String[] args) { + + } +} diff --git a/src/rollenspiel/Character.java b/src/rollenspiel/Character.java new file mode 100644 index 0000000..cbe9e49 --- /dev/null +++ b/src/rollenspiel/Character.java @@ -0,0 +1,6 @@ +package rollenspiel; + +public class Character { + private String name; + +} \ No newline at end of file diff --git a/src/rollenspiel/Rollenspiel.java b/src/rollenspiel/Rollenspiel.java new file mode 100644 index 0000000..c91ba72 --- /dev/null +++ b/src/rollenspiel/Rollenspiel.java @@ -0,0 +1,4 @@ +package rollenspiel; + +public class Rollenspiel { +} diff --git a/src/singletonPattern/Singleton.java b/src/singletonPattern/Singleton.java new file mode 100644 index 0000000..2124418 --- /dev/null +++ b/src/singletonPattern/Singleton.java @@ -0,0 +1,25 @@ +package singletonPattern; + +public class Singleton { + private static Singleton instance; + private String speicherOrt; + + private Singleton(String speicherOrt){ + this.speicherOrt = speicherOrt; + } + + public static Singleton getInstance() { + if(instance == null){ + instance = new Singleton("test"); + } + return instance; + } + + public String getSpeicherOrt() { + return speicherOrt; + } + + public void setSpeicherOrt(String speicherOrt) { + this.speicherOrt = speicherOrt; + } +} diff --git a/src/singletonPattern/SingletonMain.java b/src/singletonPattern/SingletonMain.java new file mode 100644 index 0000000..31d4596 --- /dev/null +++ b/src/singletonPattern/SingletonMain.java @@ -0,0 +1,9 @@ +package singletonPattern; + +public class SingletonMain { + + public static void main(String[] args) { + System.out.println(Singleton.getInstance().getSpeicherOrt()); + } + +} diff --git a/src/spielwiese/DreiGewinnt.java b/src/spielwiese/DreiGewinnt.java new file mode 100644 index 0000000..6f975b7 --- /dev/null +++ b/src/spielwiese/DreiGewinnt.java @@ -0,0 +1,18 @@ +package spielwiese; + +public class DreiGewinnt { + public static void createGrid(int width, int height) { + System.out.print(" | "); + for (int i = 0; i < width; i++) { + System.out.print((i + 1) + " | "); + for (int a = 0; a < height; a++) { + System.out.println(); + } + } + System.out.print("\n"); + } + + public static void main(String[] args) { + createGrid(5, 10); + } +} \ No newline at end of file diff --git a/src/unit/Pq1.java b/src/unit/Pq1.java new file mode 100644 index 0000000..8ff7a55 --- /dev/null +++ b/src/unit/Pq1.java @@ -0,0 +1,22 @@ +package unit; + +public class Pq1 { + + public static double[] pq(double p, double q){ + double[] result = new double[2]; + + double d = Math.pow(p/2, 2) - q; + + result[0] = -(p/2) + Math.sqrt(d); + result[1] = -(p/2) - Math.sqrt(d); + + return result; + } + + public static void main(String[] args) { + double[] result = pq(1, -7); + + System.out.println(result[0]); + System.out.println(result[1]); + } +} diff --git a/src/unit/Test1.java b/src/unit/Test1.java new file mode 100644 index 0000000..e61b9ec --- /dev/null +++ b/src/unit/Test1.java @@ -0,0 +1,34 @@ +package unit; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class Test1 { + + @Test + void givenPQ_whenSingleSolution_solutionOk(){ + assertEquals(Double.NaN, unit.Pq1.pq(1,1)[0], "Sehr hilfreiche Message"); + assertEquals(Double.NaN, unit.Pq1.pq(1,1)[0], "Noch eine sehr hilfreiche Message"); + assertEquals(Double.NaN, unit.Pq1.pq(1,1)[0], "Eine weitere unglaublich hilfreiche Message"); + } + + @ParameterizedTest + @MethodSource("givenPQ_whenDoubleSolution_solutionOk") + void givenPQ_whenSingleSolution_solutionOk(double p, double q){ + assertEquals(Double.NaN, unit.Pq1.pq(1,1)[0], "Sehr hilfreiche Message"); + } + + static Stream givenPQ_whenDoubleSolution_solutionOk(){ + return Stream.of( + Arguments.of(4,4,-2), + Arguments.of(4,3,-2) + ); + } + +} diff --git a/src/zweidimnesionaleArrays/Wuerfeln.java b/src/zweidimnesionaleArrays/Wuerfeln.java index 9d41560..2907709 100644 --- a/src/zweidimnesionaleArrays/Wuerfeln.java +++ b/src/zweidimnesionaleArrays/Wuerfeln.java @@ -18,14 +18,11 @@ public class Wuerfeln { wuerfe[i][a] = (int)(Math.random()*6)+1; } } - - for(int i = 0; i < anzahlExperimente; i++){ for(int a = 0; a < anzahlWuerfe; a++){ System.out.print(wuerfe[i][a] +" "); } System.out.print("\n"); } - } }