small fix
This commit is contained in:
parent
ebd1173cbc
commit
4e6a9902bb
24
.idea/workspace.xml
generated
24
.idea/workspace.xml
generated
@ -4,10 +4,10 @@
|
|||||||
<option name="autoReloadType" value="SELECTIVE" />
|
<option name="autoReloadType" value="SELECTIVE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="70f8ea87-9ffc-471a-8059-ebbfc323adcc" name="Changes" comment="Stable Version 3.0">
|
<list default="true" id="70f8ea87-9ffc-471a-8059-ebbfc323adcc" name="Changes" comment="Tests with marking of Edges and Vertexes Adding Visualisation of Edge weight and Vertex name fixed AStar">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/graph/DirectedGraph.java" beforeDir="false" afterPath="$PROJECT_DIR$/graph/DirectedGraph.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/graph/DirectedGraph.java" beforeDir="false" afterPath="$PROJECT_DIR$/graph/DirectedGraph.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/out/production/ProjektGraph/graph/DirectedGraph.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/ProjektGraph/graph/DirectedGraph.class" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/graph/MarkedEdge.java" beforeDir="false" afterPath="$PROJECT_DIR$/graph/MarkedEdge.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/graph/MarkedVertex.java" beforeDir="false" afterPath="$PROJECT_DIR$/graph/MarkedVertex.java" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
@ -15,6 +15,11 @@
|
|||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="Git.Settings">
|
<component name="Git.Settings">
|
||||||
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
||||||
|
<map>
|
||||||
|
<entry key="$PROJECT_DIR$" value="ebd1173cbc514ede7aa65ba6be90702c92e0e8b4" />
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||||
<option name="RESET_MODE" value="HARD" />
|
<option name="RESET_MODE" value="HARD" />
|
||||||
</component>
|
</component>
|
||||||
@ -103,7 +108,15 @@
|
|||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1720182049903</updated>
|
<updated>1720182049903</updated>
|
||||||
</task>
|
</task>
|
||||||
<option name="localTasksCounter" value="7" />
|
<task id="LOCAL-00007" summary="Tests with marking of Edges and Vertexes Adding Visualisation of Edge weight and Vertex name fixed AStar">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1720291413659</created>
|
||||||
|
<option name="number" value="00007" />
|
||||||
|
<option name="presentableId" value="LOCAL-00007" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1720291413659</updated>
|
||||||
|
</task>
|
||||||
|
<option name="localTasksCounter" value="8" />
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="Vcs.Log.Tabs.Properties">
|
<component name="Vcs.Log.Tabs.Properties">
|
||||||
@ -121,6 +134,7 @@
|
|||||||
<MESSAGE value="Adding AStar Algorithm" />
|
<MESSAGE value="Adding AStar Algorithm" />
|
||||||
<MESSAGE value="Stable Version with finished visualisation" />
|
<MESSAGE value="Stable Version with finished visualisation" />
|
||||||
<MESSAGE value="Stable Version 3.0" />
|
<MESSAGE value="Stable Version 3.0" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="Stable Version 3.0" />
|
<MESSAGE value="Tests with marking of Edges and Vertexes Adding Visualisation of Edge weight and Vertex name fixed AStar" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value="Tests with marking of Edges and Vertexes Adding Visualisation of Edge weight and Vertex name fixed AStar" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
@ -24,7 +24,7 @@ public class MarkedEdge<U extends EdgeMarking> extends Edge{
|
|||||||
public MarkedEdge(String s, Vertex n1, Vertex n2, U u) {
|
public MarkedEdge(String s, Vertex n1, Vertex n2, U u) {
|
||||||
super(s, n1, n2);
|
super(s, n1, n2);
|
||||||
this.marking = u;
|
this.marking = u;
|
||||||
this.screenEdge = new visualizationElements.Edge(n1.getScreenVertex(), n2.getScreenVertex(), u.toString());
|
this.screenEdge = new visualizationElements.Edge(n1.getScreenVertex(), n2.getScreenVertex());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ public class MarkedVertex<T extends VertexMarking> extends Vertex{
|
|||||||
public MarkedVertex(String s, T t) {
|
public MarkedVertex(String s, T t) {
|
||||||
super(s);
|
super(s);
|
||||||
this.marking = t;
|
this.marking = t;
|
||||||
this.screenVertex = new visualizationElements.Vertex(0, 0, t.toString());
|
this.screenVertex = new visualizationElements.Vertex(0, 0);
|
||||||
this.xCord = 0;
|
this.xCord = 0;
|
||||||
this.yCord = 0;
|
this.yCord = 0;
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user