Changeset 13806 for branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3

Timestamp:

04/27/16 17:17:00 (8 years ago)

Author:

bburlacu

Message:

#2288: Remove TinySet.cs in favor of a more general method for generating k-combinations. Improve target variation experiment generation. Refactored code and avoided some corner case exceptions.

Location:

branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3

Files:

• DirectedGraphChart.cs (modified) (1 diff)
• RunCollectionVariableInteractionNetworkView.cs (modified) (2 diffs)

branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/DirectedGraphChart.cs

@@ -90 +90 @@
       get { return graph; }
       set {
-        if (value == null || graph == value) return;
+        if (value == null || graph == value || !value.Vertices.Any()) return;
         graph = value;
         Draw();

branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/RunCollectionVariableInteractionNetworkView.cs

@@ -269 +269 @@
     }
 
+    private static VariableInteractionNetwork ApplyThreshold(VariableInteractionNetwork originalNetwork, double threshold) {
+      var arcs = originalNetwork.Arcs.Where(x => x.Weight >= threshold).ToList();
+      if (!arcs.Any()) return originalNetwork;
+      var filteredNetwork = new VariableInteractionNetwork();
+      var cloner = new Cloner();
+      var vertices = arcs.SelectMany(x => new[] { x.Source, x.Target }).Select(cloner.Clone).Distinct(); // arcs are not cloned
+      filteredNetwork.AddVertices(vertices);
+      filteredNetwork.AddArcs(arcs.Select(x => (IArc)x.Clone(cloner)));
+
+      var unusedJunctions = filteredNetwork.Vertices.Where(x => x.InDegree == 0 && x is JunctionNetworkNode).ToList();
+      filteredNetwork.RemoveVertices(unusedJunctions);
+      var orphanedNodes = filteredNetwork.Vertices.Where(x => x.Degree == 0).ToList();
+      filteredNetwork.RemoveVertices(orphanedNodes);
+      return filteredNetwork.Vertices.Any() ? filteredNetwork : originalNetwork;
+    }
+
     private static double CalculateAverageQuality(RunCollection runs) {
       var pd = (IRegressionProblemData)runs.First().Parameters["ProblemData"];
@@ -374 +390 @@
       var tb = (TextBox)sender;
       errorProvider.SetError(tb, string.Empty);
-      var network = ApplyThreshold(variableInteractionNetwork, double.Parse(tb.Text));
+      double impact;
+      if (!double.TryParse(tb.Text, out impact))
+        impact = 0.1;
+      var network = ApplyThreshold(variableInteractionNetwork, impact);
       graphChart.Graph = network;
-    }
-
-    private static VariableInteractionNetwork ApplyThreshold(VariableInteractionNetwork originalNetwork, double threshold) {
-      var arcs = originalNetwork.Arcs.Where(x => x.Weight >= threshold).ToList();
-      if (!arcs.Any()) return originalNetwork;
-      var filteredNetwork = new VariableInteractionNetwork();
-      var cloner = new Cloner();
-      var vertices = arcs.SelectMany(x => new[] { x.Source, x.Target }).Select(cloner.Clone).Distinct(); // arcs are not cloned
-      filteredNetwork.AddVertices(vertices);
-      filteredNetwork.AddArcs(arcs.Select(x => (IArc)x.Clone(cloner)));
-
-      var unusedJunctions = filteredNetwork.Vertices.Where(x => x.InDegree == 0 && x is JunctionNetworkNode).ToList();
-      filteredNetwork.RemoveVertices(unusedJunctions);
-      var orphanedNodes = filteredNetwork.Vertices.Where(x => x.Degree == 0).ToList();
-      filteredNetwork.RemoveVertices(orphanedNodes);
-      return filteredNetwork;
     }