From 328707b7bd732ffe1603390390398f3a18284ad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <stu114708@informatik.uni-kiel.de>
Date: Tue, 2 Feb 2016 15:54:39 +0100
Subject: [PATCH] work on nested graph library
---
.../kieker/analysis/graph/GraphTester.java | 23 +++++++++++++++++--
.../kieker/analysis/graph/impl/GraphImpl.java | 2 ++
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/kieker/analysis/graph/GraphTester.java b/src/main/java/kieker/analysis/graph/GraphTester.java
index 03566b68..1fb4f3ce 100644
--- a/src/main/java/kieker/analysis/graph/GraphTester.java
+++ b/src/main/java/kieker/analysis/graph/GraphTester.java
@@ -12,9 +12,28 @@ public class GraphTester {
Vertex node2 = graph.addVertex("n2");
- Graph subgraph = node1.addChildGraph();
+ Vertex node3 = graph.addVertex("n3");
- Vertex node11 = subgraph.addVertex("n1::n1");
+ Vertex node4 = graph.addVertex("n4");
+
+ Edge edge12 = node1.addEdge(node2);
+ Edge edge11 = node1.addEdge(node1);
+
+ Edge edge23 = node2.addEdge("e23", node3);
+
+ graph.addEdge("e13", node1, node3);
+
+ Vertex node1snd = graph.getVertex("n1");
+
+ assert node1 == node1snd;
+
+ for (Vertex vertex : graph.getVertices()) {
+ System.out.println(vertex.getId());
+ }
+
+ for (Edge edge : graph.getEdges()) {
+ System.out.println(edge.getId());
+ }
// node2.addEdgeTo(node11);
diff --git a/src/main/java/kieker/analysis/graph/impl/GraphImpl.java b/src/main/java/kieker/analysis/graph/impl/GraphImpl.java
index 2ea50921..580a808d 100644
--- a/src/main/java/kieker/analysis/graph/impl/GraphImpl.java
+++ b/src/main/java/kieker/analysis/graph/impl/GraphImpl.java
@@ -78,6 +78,8 @@ public class GraphImpl implements Graph {
}
}
+ // TODO Maybe: Check whether both vertices are in the same graph
+
final Edge edge = new EdgeImpl(idString, outVertex, inVertex, this);
this.edges.put(edge.getId().toString(), edge);
((VertexImpl) outVertex).addOutEdge(edge);
--
GitLab