MoonsideGames
/
MoonTools.Graph
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

directed graph throws exceptions like other classes

master
evan 2019-10-22 19:37:18 -07:00
parent df320194f1
commit 68efeb9712
2 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
Graph/DirectedGraph.cs
View File

@ -30,18 +30,8 @@ namespace MoonTools.Core.Graph
} }
} }
public IEnumerable<TNode> Nodes { get { return nodes; } } public IEnumerable<TNode> Nodes => nodes;
public IEnumerable<(TNode, TNode)> Edges { get { return edges; } } public IEnumerable<(TNode, TNode)> Edges => edges;
public bool Exists(TNode node)
{
return nodes.Contains(node);
}
public bool Exists((TNode, TNode) edge)
{
return edges.Contains(edge);
}
public void AddNode(TNode node) public void AddNode(TNode node)
{ {
@ -60,8 +50,31 @@ namespace MoonTools.Core.Graph
} }
} }
public bool Exists(TNode node)
{
return nodes.Contains(node);
}
public bool Exists(TNode v, TNode u)
{
return edges.Contains((v, u));
}
private void CheckNodes(params TNode[] givenNodes)
{
foreach (var node in givenNodes)
{
if (!Exists(node))
{
throw new ArgumentException($"Vertex {node} does not exist in the graph");
}
}
}
public void RemoveNode(TNode node) public void RemoveNode(TNode node)
{ {
CheckNodes(node);
var edgesToRemove = new List<(TNode, TNode)>(); var edgesToRemove = new List<(TNode, TNode)>();
if (Exists(node)) if (Exists(node))
@ -86,13 +99,12 @@ namespace MoonTools.Core.Graph
public void AddEdge(TNode v, TNode u, TEdgeData edgeData) public void AddEdge(TNode v, TNode u, TEdgeData edgeData)
{ {
if (Exists(v) && Exists(u)) CheckNodes(v, u);
{
neighbors[v].Add(u); neighbors[v].Add(u);
edges.Add((v, u)); edges.Add((v, u));
this.edgesToEdgeData.Add((v, u), edgeData); this.edgesToEdgeData.Add((v, u), edgeData);
} }
}
public void AddEdges(params (TNode, TNode, TEdgeData)[] edges) public void AddEdges(params (TNode, TNode, TEdgeData)[] edges)
{ {
@ -102,27 +114,30 @@ namespace MoonTools.Core.Graph
} }
} }
private void CheckEdge(TNode v, TNode u)
{
CheckNodes(v, u);
if (!Exists(v, u)) { throw new ArgumentException($"Edge between vertex {v} and vertex {u} does not exist in the graph"); }
}
public void RemoveEdge(TNode v, TNode u) public void RemoveEdge(TNode v, TNode u)
{ {
CheckEdge(v, u);
neighbors[v].Remove(u); neighbors[v].Remove(u);
} }
public TEdgeData EdgeData((TNode, TNode) edge) public TEdgeData EdgeData(TNode v, TNode u)
{ {
return edgesToEdgeData[edge]; CheckEdge(v, u);
return edgesToEdgeData[(v, u)];
} }
public IEnumerable<TNode> Neighbors(TNode node) public IEnumerable<TNode> Neighbors(TNode node)
{ {
if (Exists(node)) CheckNodes(node);
{
return neighbors[node]; return neighbors[node];
} }
else
{
return Enumerable.Empty<TNode>();
}
}
public Dictionary<TNode, Dictionary<SearchSymbol, uint>> NodeDFS() public Dictionary<TNode, Dictionary<SearchSymbol, uint>> NodeDFS()
{ {
@ -393,7 +408,7 @@ namespace MoonTools.Core.Graph
{ {
foreach (var n in Neighbors(v)) foreach (var n in Neighbors(v))
{ {
clone.AddEdge(v, n, EdgeData((v, n))); clone.AddEdge(v, n, EdgeData(v, n));
} }
} }
@ -414,7 +429,7 @@ namespace MoonTools.Core.Graph
{ {
if (subVertices.Contains(u)) if (subVertices.Contains(u))
{ {
subGraph.AddEdge(n, u, EdgeData((n, u))); subGraph.AddEdge(n, u, EdgeData(n, u));
} }
} }
} }
@ -427,6 +442,8 @@ namespace MoonTools.Core.Graph
{ {
nodes.Clear(); nodes.Clear();
neighbors.Clear(); neighbors.Clear();
edges.Clear();
edgesToEdgeData.Clear();
} }
} }
} }

4
test/DirectedGraphTest.cs
View File

@ -394,7 +394,7 @@ namespace Tests
myGraph.AddNodes(1, 2); myGraph.AddNodes(1, 2);
myGraph.AddEdge(1, 2, dummyEdgeData); myGraph.AddEdge(1, 2, dummyEdgeData);
myGraph.Exists((1, 2)).Should().BeTrue(); myGraph.Exists(1, 2).Should().BeTrue();
} }
[Test] [Test]
@ -404,7 +404,7 @@ namespace Tests
myGraph.AddNodes(1, 2); myGraph.AddNodes(1, 2);
myGraph.AddEdge(1, 2, new NumEdgeData { testNum = 4 }); myGraph.AddEdge(1, 2, new NumEdgeData { testNum = 4 });
myGraph.EdgeData((1, 2)).testNum.Should().Be(4); myGraph.EdgeData(1, 2).testNum.Should().Be(4);
} }
} }
} }