3010293
/
PR2-Gruppenprojekt
2
0
Fork 0
Code Issues 22 Pull Requests Packages Projects Releases Wiki Activity

testing git

main
Berat Kocak 2024-12-22 19:26:49 +01:00
parent 12c0c1fa30 567f7f13a3
commit fc875a069c
21 changed files with 58 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PR2Projekt/.classpath
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<<<<<<< HEAD
<!-- JRE System Library -->
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
<attributes>
@ -45,4 +46,14 @@
<!-- Output Folder -->
<classpathentry kind="output" path="target/classes"/>
=======
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="lib" path="src/main/java/de/hs_mannheim/informatik/mvn/domain/HitoriMain.java"/>
<classpathentry kind="output" path="bin"/>
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
</classpath>

4
PR2Projekt/pom.xml
View File

@ -61,7 +61,11 @@
<configuration>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<<<<<<< HEAD
<mainClass>src.main.java</mainClass>
=======
<mainClass>src.main.java.de.hs_mannheim.informatik.mvn.domain.HitoriMain</mainClass>
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
</transformer>
</transformers>
</configuration>

BIN
PR2Projekt/resources/Hitori_Highscores/Hitori10x10medium.txt
View File

Binary file not shown.

BIN
PR2Projekt/resources/Hitori_Highscores/Hitori15x15_medium.txt
View File

Binary file not shown.

2
PR2Projekt/resources/Hitori_Highscores/Hitori4x4_leicht.txt
View File

@ -1,2 +0,0 @@
emre
berat

BIN
PR2Projekt/resources/Hitori_Highscores/Hitori5x5leicht.txt
View File

Binary file not shown.

BIN
PR2Projekt/resources/Hitori_Highscores/Hitori8x8leicht.txt
View File

Binary file not shown.

BIN
PR2Projekt/resources/Hitori_Highscores/Hitori8x8medium.txt
View File

Binary file not shown.

41
PR2Projekt/resources/Hitori_Spielfelder/Hitori10x10medium.csv
View File

@ -1,41 +0,0 @@
5,8,2,6,3,7,7,5,1,8
8,4,2,2,1,9,9,3,7,5
3,2,7,8,2,5,5,4,3,10
10,2,3,1,7,8,6,9,9,9
3,3,3,7,6,2,4,10,4,1
4,5,9,10,6,10,1,7,8,8
2,7,5,9,1,10,3,1,3,6
9,5,4,3,8,10,2,9,10,4
9,6,10,8,5,3,10,2,5,8
9,10,2,2,4,7,9,8,5,7
// Lösung (schwarze Felder)
1,1
1,3
1,6
1,10
2,4
2,7
3,2
3,6
3,9
4,8
4,10
5,1
5,3
5,5
5,7
6,2
6,6
6,10
7,5
7,9
8,1
8,3
8,6
9,4
9,7
9,9
10,1
10,3
10,10
Can't render this file because it has a wrong number of fields in line 12.

83
PR2Projekt/resources/Hitori_Spielfelder/Hitori15x15_medium.csv
View File

@ -1,83 +0,0 @@
7,1,2,9,12,15,8,11,11,9,11,14,13,6,3
2,3,8,1,2,11,10,9,5,8,14,3,12,13,15
4,14,13,9,4,15,9,10,12,6,5,3,11,5,12
15,9,5,6,10,15,1,15,8,3,5,4,6,2,8
5,11,7,9,15,1,4,3,8,1,9,2,10,13,2
15,15,10,3,1,14,8,12,11,1,9,8,2,7,2
10,7,7,12,9,3,15,2,5,2,10,5,1,7,4
3,8,9,14,1,6,12,4,15,2,13,11,5,10,11
8,6,7,15,11,4,5,11,2,10,3,13,8,12,9
2,2,3,3,4,13,5,6,5,11,5,15,8,9,12
2,15,15,11,13,7,6,5,3,13,8,10,5,1,11
12,5,11,13,13,2,2,8,8,4,10,9,3,2,5
1,13,8,2,1,7,11,4,9,15,4,12,9,3,10
13,10,12,5,15,3,2,7,13,14,12,12,9,11,6
7,12,4,8,14,10,13,13,7,4,2,6,15,15,11
//Lösung
1,4
1,6
1,8
1,11
2,1
2,3
2,9
2,12
2,14
3,5
3,7
3,11
3,15
4,1
4,3
4,6
4,9
4,13
5,4
5,10
5,15
6,2
6,5
6,7
6,9
6,11
6,13
7,1
7,3
7,6
7,8
7,12
7,14
8,5
8,9
8,15
9,3
9,8
9,13
10,1
10,4
10,7
10,9
10,11
11,3
11,10
11,13
11,15
12,2
12,5
12,7
12,9
12,11
12,14
13,1
13,6
13,8
13,13
14,3
14,5
14,9
14,12
15,1
15,7
15,10
15,14
Can't render this file because it has a wrong number of fields in line 17.

11
PR2Projekt/resources/Hitori_Spielfelder/Hitori4x4_leicht.csv
View File

@ -1,11 +0,0 @@
3,3,1,4
4,3,2,2
1,3,4,2
3,4,3,2
//Lösung (schwarze Felder)
1,2
2,4
3,2
4,1
4,4
1 3,3,1,4
2 4,3,2,2
3 1,3,4,2
4 3,4,3,2
5 //Lösung (schwarze Felder)
6 1,2
7 2,4
8 3,2
9 4,1
10 4,4

15
PR2Projekt/resources/Hitori_Spielfelder/Hitori5x5leicht.csv
View File

@ -1,15 +0,0 @@
3,4,5,5,2
3,2,3,5,4
2,1,4,5,5
2,3,1,4,1
2,5,2,3,2
//Lösung (schwarze Felder)
1,1
1,4
2,3
3,1
3,4
4,3
5,1
5,5
1 3,4,5,5,2
2 3,2,3,5,4
3 2,1,4,5,5
4 2,3,1,4,1
5 2,5,2,3,2
6 //Lösung (schwarze Felder)
7 1,1
8 1,4
9 2,3
10 3,1
11 3,4
12 4,3
13 5,1
14 5,5

29
PR2Projekt/resources/Hitori_Spielfelder/Hitori8x8leicht.csv
View File

@ -1,29 +0,0 @@
2,7,2,1,5,8,3,5
6,6,1,6,2,4,4,7
7,5,8,2,6,6,6,1
3,6,8,8,4,2,1,8
6,4,7,7,8,2,6,3
1,6,4,5,1,3,5,8
8,1,3,3,6,4,2,6
5,3,6,4,3,4,8,2
// Lösung (schwarze Felder)
1,1
1,8
2,2
2,4
2,6
3,5
3,7
4,3
4,8
5,1
5,4
5,6
6,2
6,5
6,7
7,4
7,8
8,2
8,6
1 2,7,2,1,5,8,3,5
2 6,6,1,6,2,4,4,7
3 7,5,8,2,6,6,6,1
4 3,6,8,8,4,2,1,8
5 6,4,7,7,8,2,6,3
6 1,6,4,5,1,3,5,8
7 8,1,3,3,6,4,2,6
8 5,3,6,4,3,4,8,2
9 // Lösung (schwarze Felder)
10 1,1
11 1,8
12 2,2
13 2,4
14 2,6
15 3,5
16 3,7
17 4,3
18 4,8
19 5,1
20 5,4
21 5,6
22 6,2
23 6,5
24 6,7
25 7,4
26 7,8
27 8,2
28 8,6

30
PR2Projekt/resources/Hitori_Spielfelder/Hitori8x8medium.csv
View File

@ -1,30 +0,0 @@
4,4,3,5,6,5,7,7
8,5,7,6,8,4,7,1
7,2,1,2,4,6,2,3
8,6,5,2,7,7,3,6
3,1,2,7,3,8,6,4
1,2,4,1,5,7,3,2
5,8,2,4,3,4,1,5
2,4,5,1,8,3,8,1
//Lösung (schwarze Zahlen)
1,2
1,4
1,8
2,5
2,7
3,2
3,4
4,1
4,6
4,8
5,3
5,5
6,2
6,4
6,7
7,1
7,6
8,3
8,5
8,8
1 4,4,3,5,6,5,7,7
2 8,5,7,6,8,4,7,1
3 7,2,1,2,4,6,2,3
4 8,6,5,2,7,7,3,6
5 3,1,2,7,3,8,6,4
6 1,2,4,1,5,7,3,2
7 5,8,2,4,3,4,1,5
8 2,4,5,1,8,3,8,1
9 //Lösung (schwarze Zahlen)
10 1,2
11 1,4
12 1,8
13 2,5
14 2,7
15 3,2
16 3,4
17 4,1
18 4,6
19 4,8
20 5,3
21 5,5
22 6,2
23 6,4
24 6,7
25 7,1
26 7,6
27 8,3
28 8,5
29 8,8

6
PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/domain/HitoriMain.java
View File

@ -1,4 +1,4 @@
package de.hs_mannheim.informatik.pr2projekt.domain;
package domain;
import java.awt.CardLayout;
import java.awt.event.ActionEvent;
@ -20,8 +20,8 @@ import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JPanel;
import de.hs_mannheim.informatik.pr2projekt.gui.GameGUI;
import de.hs_mannheim.informatik.pr2projekt.gui.MenuGUI;
import gui.GameGUI;
import gui.MenuGUI;
public class HitoriMain extends JFrame implements ActionListener{

4
PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/domain/LogHighscores.java
View File

@ -1,4 +1,8 @@
<<<<<<< HEAD
package de.hs_mannheim.informatik.mvn.domain;
=======
package src.main.java.de.hs_mannheim.informatik.mvn.domain;
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
import java.io.BufferedWriter;
import java.io.FileNotFoundException;

9
PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/GameGUI.java
View File

@ -1,4 +1,8 @@
<<<<<<< HEAD
package de.hs_mannheim.informatik.mvn.gui;
=======
package src.test.java.de.hs_mannheim.informatik.mvn.gui;
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
import java.awt.BorderLayout;
import java.awt.CardLayout;
@ -19,7 +23,12 @@ import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.SwingUtilities;
<<<<<<< HEAD
import de.hs_mannheim.informatik.mvn.domain.*;
=======
import src.main.java.de.hs_mannheim.informatik.mvn.domain.HitoriMain;
import src.main.java.de.hs_mannheim.informatik.mvn.domain.LogHighscores;
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
public class GameGUI extends JFrame implements ActionListener {

8
PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/HighscoreGUI.java
View File

@ -1,4 +1,8 @@
<<<<<<< HEAD
package de.hs_mannheim.informatik.mvn.gui;
=======
package src.test.java.de.hs_mannheim.informatik.mvn.gui;
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
import java.awt.BorderLayout;
import java.awt.CardLayout;
@ -16,7 +20,11 @@ import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
<<<<<<< HEAD
import de.hs_mannheim.informatik.mvn.domain.*;
=======
import src.main.java.de.hs_mannheim.informatik.mvn.domain.HitoriMain;
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
public class HighscoreGUI extends JFrame implements ActionListener {

8
PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/MenuGUI.java
View File

@ -1,4 +1,8 @@
<<<<<<< HEAD
package de.hs_mannheim.informatik.mvn.gui;
=======
package src.test.java.de.hs_mannheim.informatik.mvn.gui;
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
import java.awt.BorderLayout;
import java.awt.CardLayout;
@ -13,7 +17,11 @@ import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
<<<<<<< HEAD
import de.hs_mannheim.informatik.mvn.domain.*;
=======
import src.main.java.de.hs_mannheim.informatik.mvn.domain.HitoriMain;
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
public class MenuGUI extends JFrame implements ActionListener {

2
PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Highscores/Hitori4x4_leicht.txt
View File

@ -0,0 +1,2 @@
emre
berat

9
PR2Projekt/src/test/java/java/de/hs_mannheim/informatik/mvn/test/HitoriTest.java
View File

@ -1,9 +1,18 @@
<<<<<<< HEAD
package java.de.hs_mannheim.informatik.mvn.test;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
import de.hs_mannheim.informatik.mvn.domain.HitoriMain2;
import de.hs_mannheim.informatik.mvn.gui.GameGUI;
=======
package src.test.java.de.hs_mannheim.informatik.mvn.test;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
import src.java.main.de.hs_mannheim.informatik.domain.HitoriMain;
import src.java.main.de.hs_mannheim.informatik.gui.GameGUI;
>>>>>>> 567f7f13a3ed23a066095e0325ac4273c1cf0342
import java.io.FileNotFoundException;
import java.util.Arrays;