Commit Graph

64 Commits

Author SHA1 Message Date
cmerkens
3c709ec120 Funktionierende Version 2024-07-08 22:30:55 +02:00
cmerkens
dd18dbd55e Nix funktioniert 2024-07-08 21:15:24 +02:00
cmerkens
dc371da1f2 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/i23024/ProjektGraph
# Conflicts:
#	.idea/workspace.xml
#	graph/ExampleGraphs.java
2024-07-08 18:54:37 +02:00
cmerkens
1fe25fac02 nichts 2024-07-08 18:52:37 +02:00
6206aa8791 JavaDoc ExampleGraphs 2024-07-08 18:26:18 +02:00
7014e9308c Window size and Example restructuring 2024-07-08 18:03:30 +02:00
deaffff595 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/i23024/ProjektGraph
# Conflicts:
#	graph/DirectedGraph.java
#	graph/Graph.java
#	graph/NameDoesNotExistException.java
#	graph/UndirectedGraph.java
#	out/production/ProjektGraph/graph/Graph.class
#	out/production/ProjektGraph/graph/WrapperComparator.class
#	out/production/ProjektGraph/graph/WrapperElement.class
2024-07-08 17:51:11 +02:00
5bab9b5992 Improved Algortihms and A Star Heuristik 2024-07-08 17:12:08 +02:00
cmerkens
d4e913b5e2 Java Doc für graph fertig 2024-07-08 00:11:04 +02:00
cmerkens
80d48d5335 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/i23024/ProjektGraph
# Conflicts:
#	graph/EdgeMarking.java
#	out/production/ProjektGraph/graph/EdgeWeightMarking.class
2024-07-07 23:41:01 +02:00
cmerkens
e510bebc21 Added Custom Graph 2024-07-07 23:39:17 +02:00
73d4a6b9aa JavaDoc anfang 2024-07-07 23:14:41 +02:00
3957fbba51 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	.idea/workspace.xml
#	graph/UndirectedGraph.java
#	out/production/ProjektGraph/OurApplication/OurApplication.class
#	out/production/ProjektGraph/graph/UndirectedGraph.class
2024-07-07 23:14:32 +02:00
f2b4876c71 JavaDoc anfang 2024-07-07 23:07:56 +02:00
cmerkens
8de3c54775 Weg Anzeige gefixt 2024-07-07 21:13:34 +02:00
cmerkens
1313402f07 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/i23024/ProjektGraph
# Conflicts:
#	OurApplication/OurAlgorithm.java
#	OurApplication/OurApplication.java
#	graph/ExampleGraphs.java
#	out/production/ProjektGraph/OurApplication/OurAlgorithm.class
#	out/production/ProjektGraph/OurApplication/OurApplication.class
#	out/production/ProjektGraph/OurApplication/OurParameterArea.class
#	out/production/ProjektGraph/graph/ExampleGraphs.class
2024-07-07 20:43:35 +02:00
cmerkens
ecf2bb8656 Endgültiger Weg wird angezeigt 2024-07-07 20:34:38 +02:00
b5730e1b18 Added option to chose between methods 2024-07-07 19:49:31 +02:00
e020e34d94 Beispiel 4 neu 2024-07-07 16:47:41 +02:00
cmerkens
1f67dde5c4 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/i23024/ProjektGraph 2024-07-07 16:32:51 +02:00
cmerkens
72181c9a39 Weighting gefixt 2024-07-07 16:32:27 +02:00
cmerkens
5e4eec4e5c Weighting gefixt 2024-07-07 16:29:45 +02:00
f00057ee6e Examples Visualisation, TextArea functionality 2024-07-07 16:27:22 +02:00
6060796ddd Added Description for each step 2024-07-07 14:02:19 +02:00
e2c2038531 ParameterArea Buttons für die Beispiele 2024-07-07 12:58:33 +02:00
c5d2060d37 LegendArea gestaltet 2024-07-07 12:17:28 +02:00
3629584d14 Beispiele überarbeitet 2024-07-07 02:24:27 +02:00
3c74497254 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/i23024/ProjektGraph
# Conflicts:
#	.idea/workspace.xml
2024-07-07 00:05:03 +02:00
245fa45606 Stable Version 4.0 2024-07-06 21:28:34 +02:00
4e6a9902bb small fix 2024-07-06 21:22:54 +02:00
ebd1173cbc Tests with marking of Edges and Vertexes
Adding Visualisation of Edge weight
and Vertex name
fixed AStar
2024-07-06 20:43:33 +02:00
cfcb6d4d40 Stable Version 3.0
3 Beispiele hinzugefügt
2024-07-06 01:34:51 +02:00
79198f4f4a Fixed start stop Color Bug 2024-07-06 00:51:44 +02:00
7180d7951a Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/i23024/ProjektGraph
# Conflicts:
#	.idea/workspace.xml
2024-07-06 00:30:53 +02:00
b2c8b4f54f OurApplication etwas sortiert und log zuweisung geändert
fix von Färbung
2024-07-05 17:06:51 +02:00
cmerkens
017bbe9307 Stable Version 3.0 2024-07-05 15:14:53 +02:00
cmerkens
42e9ca5ec8 lol 2024-07-05 15:12:42 +02:00
e07edf8b2b Beispiel1 hinzugefügt 2024-07-05 15:08:33 +02:00
cmerkens
e19a031a16 Stable Version 3.0 2024-07-05 14:20:39 +02:00
04d5175ab0 Added step to Algorithm to better display start and end vertex 2024-07-05 14:00:35 +02:00
bed270e7d2 Stable Version with finished visualisation 2024-07-04 21:18:57 +02:00
58ed89d78c Adding AStar Algorithm 2024-07-03 23:32:53 +02:00
cmerkens
26bd4bbb3a Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/i23024/ProjektGraph 2024-07-03 20:33:19 +02:00
cmerkens
e76564e204 Merge branch 'Versuch_Christian' 2024-07-03 20:19:26 +02:00
cmerkens
0904358705 Reset main
Revert "Für Christian"

This reverts commit 213638ad16.

Revert "Visualisation progress"

This reverts commit 12dbadf5e1.

Revert "OurApplication test"This reverts commit 6b0caa1a5e.

Revert "Visualisation tests"

This reverts commit cf63dddf51.
2024-07-03 20:18:47 +02:00
cmerkens
a34404e583 Stable Version 3.0 2024-07-03 19:44:08 +02:00
cmerkens
98edc9a28d Stable Version 3.0 2024-07-03 19:41:46 +02:00
cmerkens
0d5ff33a9d Christian Stable Version 2.0 2024-07-03 00:46:21 +02:00
cmerkens
5004b2ce7e Setup sitebranch 2024-07-02 21:13:30 +02:00
6036220c6a Visualisation progress reset 2024-07-02 17:51:22 +02:00