i23024/ProjektGraph
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: i23024:6206aa87917804892374484c6df85ca88c82518d
Branches Tags
i23024:main
i23024:Versuch_Christian
..
compare: i23024:dc371da1f2de56588cc3bb0c7f5b397bbec81408
Branches Tags
i23024:main
i23024:Versuch_Christian

2 Commits
6206aa8791 ... dc371da1f2

Author SHA1 Message Date
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
2 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

4
.idea/workspace.xml
View File

@ -4,11 +4,9 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="70f8ea87-9ffc-471a-8059-ebbfc323adcc" name="Changes" comment="LegendArea gestaltet">
<list default="true" id="70f8ea87-9ffc-471a-8059-ebbfc323adcc" name="Changes" comment="Weighting gefixt">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/OurApplication/OurApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/OurApplication/OurApplication.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/graph/ExampleGraphs.java" beforeDir="false" afterPath="$PROJECT_DIR$/graph/ExampleGraphs.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/ProjektGraph/graph/ExampleGraphs.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/ProjektGraph/graph/ExampleGraphs.class" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

2
graph/ExampleGraphs.java
View File

@ -16,6 +16,8 @@ public class ExampleGraphs {
*/
public DirectedGraph<VertexMarking, EdgeMarking> example1() {
/**
* Beispiel 1 zeigt ein Gitter aus Knoten und Kanten, bei dem jeder Knoten mit
/*
* Erstellt einen Beispielgraphen, der sich ideal für die Demonstration der Funktionsweise
* des Dijkstra- und A*-Algorithmus eignet. Der Graph enthält eine Vielzahl von Knoten, die durch