Merge pull request #197 from Orace/codeclean/redundantdelegateconstru…

…ctor Remove redundant delegate constructor call.
YaccConstructor · Nov 22, 2019 · 1bc1a1c · 1bc1a1c
2 parents 0416692 + 0fd03c4
commit 1bc1a1c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git a/src/QuickGraph.Data/DataSetGraphvizAlgorithm.cs b/src/QuickGraph.Data/DataSetGraphvizAlgorithm.cs
@@ -33,8 +33,8 @@ GraphvizImageType imageType
 
         private void InitializeFormat()
         {
-            this.FormatVertex += new FormatVertexEventHandler<DataTable>(FormatTable);
-            this.FormatEdge += new FormatEdgeAction<DataTable, DataRelationEdge>(FormatRelationEdge);
+            this.FormatVertex += FormatTable;
+            this.FormatEdge += FormatRelationEdge;
 
             this.CommonVertexFormat.Style = GraphvizVertexStyle.Solid;
             this.CommonVertexFormat.Shape = GraphvizVertexShape.Record;

diff --git a/src/QuickGraph.Graphviz/CondensatedGraphRenderer.cs b/src/QuickGraph.Graphviz/CondensatedGraphRenderer.cs
@@ -17,8 +17,8 @@ public CondensatedGraphRenderer(
         protected override void Initialize()
         {
             base.Initialize();
-            this.Graphviz.FormatVertex+=new FormatVertexEventHandler<TGraph>(Graphviz_FormatVertex);
-            this.Graphviz.FormatEdge += new FormatEdgeAction<TGraph, CondensedEdge<TVertex, TEdge, TGraph>>(Graphviz_FormatEdge);
+            this.Graphviz.FormatVertex += Graphviz_FormatVertex;
+            this.Graphviz.FormatEdge += Graphviz_FormatEdge;
         }
 
 

diff --git a/src/QuickGraph.Graphviz/EdgeMergeCondensatedGraphRenderer.cs b/src/QuickGraph.Graphviz/EdgeMergeCondensatedGraphRenderer.cs
@@ -16,8 +16,8 @@ public EdgeMergeCondensatedGraphRenderer(
         protected override void Initialize()
         {
             base.Initialize();
-            this.Graphviz.FormatVertex += new FormatVertexEventHandler<TVertex>(Graphviz_FormatVertex);
-            this.Graphviz.FormatEdge += new FormatEdgeAction<TVertex, MergedEdge<TVertex, TEdge>>(Graphviz_FormatEdge);
+            this.Graphviz.FormatVertex += Graphviz_FormatVertex;
+            this.Graphviz.FormatEdge += Graphviz_FormatEdge;
         }
 
         void Graphviz_FormatEdge(object sender, FormatEdgeEventArgs<TVertex, MergedEdge<TVertex, TEdge>> e)

diff --git a/src/QuickGraph/Algorithms/ConnectedComponents/IncrementalConnectedComponentsAlgorithm.cs b/src/QuickGraph/Algorithms/ConnectedComponents/IncrementalConnectedComponentsAlgorithm.cs
@@ -33,10 +33,10 @@ protected override void InternalCompute()
                 this.ds.Union(e.Source, e.Target);
 
             // unhook/hook to graph event
-            this.VisitedGraph.EdgeAdded += new EdgeAction<TVertex, TEdge>(VisitedGraph_EdgeAdded);
-            this.VisitedGraph.EdgeRemoved += new EdgeAction<TVertex, TEdge>(VisitedGraph_EdgeRemoved);
-            this.VisitedGraph.VertexAdded += new VertexAction<TVertex>(VisitedGraph_VertexAdded);
-            this.VisitedGraph.VertexRemoved += new VertexAction<TVertex>(VisitedGraph_VertexRemoved);
+            this.VisitedGraph.EdgeAdded += VisitedGraph_EdgeAdded;
+            this.VisitedGraph.EdgeRemoved += VisitedGraph_EdgeRemoved;
+            this.VisitedGraph.VertexAdded += VisitedGraph_VertexAdded;
+            this.VisitedGraph.VertexRemoved += VisitedGraph_VertexRemoved;
         }
 
         public int ComponentCount

diff --git a/tests/QuickGraph.Tests/Algorithms/Search/ParallelBreadthFirstSearchAlgirthmTest.cs b/tests/QuickGraph.Tests/Algorithms/Search/ParallelBreadthFirstSearchAlgirthmTest.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace QuickGraph.Algorithms.Search
 {
@@ -122,12 +123,12 @@ private void RunBfs()
             algo = new ParallelBreadthFirstSearchAlgorithm<int, Edge<int>, int>(g);
             try
             {
-                algo.InitializeVertex += new VertexEventHandler<int>(this.InitializeVertex);
-                algo.DiscoverVertex += new ParallelVertexEventHandler<int,int>(this.DiscoverVertex);
-                algo.ExamineVertex += new ParallelVertexEventHandler<int, int>(this.ExamineVertex);
-                algo.TreeEdge += new ParallelEdgeAction<int, Edge<int>, int>(this.TreeEdge);
-                algo.NextLevel += new EventHandler(algo_NextLevel);
-                algo.FinishVertex += new ParallelVertexEventHandler<int,int>(this.FinishVertex);
+                algo.InitializeVertex += this.InitializeVertex;
+                algo.DiscoverVertex += this.DiscoverVertex;
+                algo.ExamineVertex += this.ExamineVertex;
+                algo.TreeEdge += this.TreeEdge;
+                algo.NextLevel += this.algo_NextLevel;
+                algo.FinishVertex += this.FinishVertex;
 
                 parents.Clear();
                 distances.Clear();
@@ -145,11 +146,12 @@ private void RunBfs()
             }
             finally
             {
-                algo.InitializeVertex -= new VertexEventHandler<int>(this.InitializeVertex);
-                algo.DiscoverVertex -= new ParallelVertexEventHandler<int,int>(this.DiscoverVertex);
-                algo.ExamineVertex -= new ParallelVertexEventHandler<int,int>(this.ExamineVertex);
-                algo.TreeEdge -= new ParallelEdgeAction<int, Edge<int>,int>(this.TreeEdge);
-                algo.FinishVertex -= new ParallelVertexEventHandler<int,int>(this.FinishVertex);
+                algo.InitializeVertex -= this.InitializeVertex;
+                algo.DiscoverVertex -= this.DiscoverVertex;
+                algo.ExamineVertex -= this.ExamineVertex;
+                algo.TreeEdge -= this.TreeEdge;
+                algo.NextLevel -= this.algo_NextLevel;
+                algo.FinishVertex -= this.FinishVertex;
             }
         }