Changeset 13789 for branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/RunCollectionVariableInteractionNetworkView.cs

Timestamp:

04/24/16 20:37:12 (8 years ago)

Author:

bburlacu

Message:

#2288:

• Refactor RunCollectionVariableInteractionNetworkView improving functionality, modularity and code organisation.
• Small tweaks to the DirectedGraphChart and DirectedGraphChartMode

File:

• branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/RunCollectionVariableInteractionNetworkView.cs (modified) (5 diffs)

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

@@ -233 +233 @@
           IVertex junctionNode;
           if (!nodes.TryGetValue(junctionLabel, out junctionNode)) {
-            junctionNode = new JunctionNetworkNode { Label = string.Empty, Data = CreateEnsembleSolution(targetRuns) };
+            var solutionsEnsemble = CreateEnsembleSolution(targetRuns);
+            junctionNode = new JunctionNetworkNode { Label = string.Empty, Data = solutionsEnsemble };
             vn.AddVertex(junctionNode);
             nodes[junctionLabel] = junctionNode;
+            junctionNode.Label = string.Format("Target quality: {0:0.000}", solutionsEnsemble.TrainingRSquared);
           }
           IArc arc;
@@ -245 +247 @@
               nodes[v] = variableNode;
             }
-            arc = new Arc(variableNode, junctionNode) { Weight = impact };
+            arc = new Arc(variableNode, junctionNode) { Weight = impact, Label = string.Format("Impact: {0:0.000}", impact) };
             vn.AddArc(arc);
           }
-          arc = new Arc(junctionNode, targetNode) { Weight = junctionNode.InArcs.Sum(x => x.Weight) };
+          var trainingR2 = ((IRegressionSolution)((JunctionNetworkNode)junctionNode).Data).TrainingRSquared;
+          arc = new Arc(junctionNode, targetNode) { Weight = junctionNode.InArcs.Sum(x => x.Weight), Label = string.Format("Quality: {0:0.000}", trainingR2) };
           vn.AddArc(arc);
         } else {
@@ -258 +261 @@
               nodes[v] = variableNode;
             }
-            var arc = new Arc(variableNode, targetNode) { Weight = impact };
+            var arc = new Arc(variableNode, targetNode) { Weight = impact, Label = string.Format("Impact: {0:0.000}", impact) };
             vn.AddArc(arc);
           }
@@ -380 +383 @@
       var filteredNetwork = new VariableInteractionNetwork();
       var cloner = new Cloner();
-      var vertices = arcs.SelectMany(x => new[] { x.Source, x.Target }).Select(cloner.Clone); // arcs are not cloned
+      var vertices = arcs.SelectMany(x => new[] { x.Source, x.Target }).Select(cloner.Clone).Distinct(); // arcs are not cloned
       filteredNetwork.AddVertices(vertices);
-      foreach (var arc in arcs) {
-        var source = cloner.Clone(arc.Source);
-        var target = cloner.Clone(arc.Target);
-        filteredNetwork.AddArc(source, target);
-      }
+      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);
@@ -443 +443 @@
         button.Enabled = false;
         var impacts = CalculateVariableImpactsOnline(Content, false);
-        var network = CreateNetwork(impacts);
+        variableInteractionNetwork = CreateNetwork(impacts);
         var threshold = double.Parse(impactThresholdTextBox.Text);
-        graphChart.Graph = ApplyThreshold(network, threshold);
+        graphChart.Graph = ApplyThreshold(variableInteractionNetwork, threshold);
       };
       worker.RunWorkerCompleted += (o, e) => button.Enabled = true;