Changeset 11234

Timestamp:

07/30/14 02:01:41 (9 years ago)

Author:

bburlacu

Message:

#2215: Updated tests project. Fixed a couple of bugs when adding arcs to a vertex. Removed useless events from the directed graph. Worked around invalid operation exception when removing arcs.

Location:

branches/HeuristicLab.BottomUpTreeDistance

Files:

• HeuristicLab.BottomUpTreeDistance.sln (modified) (2 diffs)
• HeuristicLab.BottomUpTreeDistance.v12.suo (modified) (previous)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/DirectedGraph.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Vertex.cs (modified) (2 diffs)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (1 diff)

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.BottomUpTreeDistance.sln

@@ -5 +5 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Symbolic-3.4", "HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj", "{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{296A2ED3-637A-4E1E-8C06-170651BF1F04}"
-  ProjectSection(SolutionItems) = preProject
-    Performance1.psess = Performance1.psess
-  EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Tests", "HeuristicLab.Tests\HeuristicLab.Tests.csproj", "{07C05C8F-0769-4607-96C6-D90A219F4C85}"
@@ -47 +42 @@
     HideSolutionNode = FALSE
   EndGlobalSection
-  GlobalSection(Performance) = preSolution
-    HasPerformanceSessions = true
-  EndGlobalSection
 EndGlobal

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/DirectedGraph.cs

@@ -94 +94 @@
       vertex.ArcAdded += OnArcAdded;
       vertex.ArcRemoved += OnArcRemoved;
-      OnVertexAdded(this, EventArgs.Empty);
     }
 
@@ -100 +99 @@
       vertices.Remove(vertex);
       // remove connections to/from the removed vertex
-      foreach (var arc in vertex.InArcs.Concat(vertex.OutArcs))
+      var arcList = vertex.InArcs.Concat(vertex.OutArcs).ToList();
+      foreach (var arc in arcList)
         RemoveArc(arc);
       // deregister event handlers
@@ -106 +106 @@
       vertex.ArcRemoved -= OnArcRemoved;
       vertex.Changed -= OnVertexChanged;
-      OnVertexRemoved(this, EventArgs.Empty);
     }
 
@@ -131 +130 @@
     }
 
-    public event EventHandler VertexAdded;
-    protected virtual void OnVertexAdded(object sender, EventArgs args) {
-      var added = VertexAdded;
-      if (added != null)
-        added(sender, args);
-    }
-
-    public event EventHandler VertexChanged;
-    protected virtual void OnVertexChanged(object sender, EventArgs args) {
-      var changed = VertexChanged;
-      if (changed != null)
-        changed(sender, args);
-    }
-
-    public event EventHandler VertexRemoved;
-    protected virtual void OnVertexRemoved(object sender, EventArgs args) {
-      var removed = VertexRemoved;
-      if (removed != null)
-        removed(sender, args);
-    }
+    protected virtual void OnVertexChanged(object sender, EventArgs args) { }
 
     protected virtual void OnArcAdded(object sender, EventArgs<IArc> args) {

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Vertex.cs

@@ -126 +126 @@
         if (outArcs == null)
           outArcs = new List<IArc>();
-        else if (outArcs.Contains(arc) || outArcs.Any(a => a.Target == arc.Target && a.Source == arc.Source))
+        else if (outArcs.Contains(arc) || outArcs.Any(a => a.Target == arc.Target))
           throw new InvalidOperationException("Arc already added.");
         outArcs.Add(arc);
@@ -132 +132 @@
         if (inArcs == null)
           inArcs = new List<IArc>();
-        else if (inArcs.Contains(arc) || inArcs.Any(a => a.Target == arc.Target && a.Source == arc.Source))
+        else if (inArcs.Contains(arc) || inArcs.Any(a => a.Source == arc.Source))
           throw new InvalidOperationException("Arc already added.");
         inArcs.Add(arc);

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -97 +97 @@
   </Choose>
   <ItemGroup>
+    <Compile Include="MaxCommonSubtreeSimilarityCalculatorTest.cs" />
     <Compile Include="BottomUpSimilarityCalculatorTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />