Changeset 16845 for branches/2971_named_intervals

Timestamp:

04/19/19 12:59:43 (6 years ago)

Author:

chaider

Message:

#2971 Changed nodeIntervals in InteractiveSymbolicDataAnalysisSolutionSimlifierView

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (modified) (6 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblemData.cs (modified) (1 diff)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

@@ -35 +35 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
   public abstract partial class InteractiveSymbolicDataAnalysisSolutionSimplifierView : AsynchronousContentView {
-    private Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode> foldedNodes;
-    private Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode> changedNodes;
-    private IDictionary<ISymbolicExpressionTreeNode, Interval> intervals;
-    private Dictionary<ISymbolicExpressionTreeNode, double> nodeImpacts;
+    private readonly Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode> foldedNodes = new Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode>();
+    private readonly Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode> changedNodes = new Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode>();
+    private readonly Dictionary<ISymbolicExpressionTreeNode, Interval> nodeIntervals = new Dictionary<ISymbolicExpressionTreeNode, Interval>();
+    private readonly Dictionary<ISymbolicExpressionTreeNode, double> nodeImpacts = new Dictionary<ISymbolicExpressionTreeNode, double>();
 
     private readonly ISymbolicDataAnalysisSolutionImpactValuesCalculator impactCalculator;
@@ -50 +50 @@
     protected InteractiveSymbolicDataAnalysisSolutionSimplifierView(ISymbolicDataAnalysisSolutionImpactValuesCalculator impactCalculator) {
       InitializeComponent();
-      foldedNodes = new Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode>();
-      changedNodes = new Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode>();
-      nodeImpacts = new Dictionary<ISymbolicExpressionTreeNode, double>();
       this.Caption = "Interactive Solution Simplifier";
       this.impactCalculator = impactCalculator;
@@ -173 +170 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      foldedNodes = new Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode>();
+      foldedNodes.Clear();
+      changedNodes.Clear();
+      nodeIntervals.Clear();
+      nodeImpacts.Clear();
       UpdateView();
       viewHost.Content = this.Content;
@@ -195 +195 @@
       progress.CanBeStopped = true;
       cancellationTokenSource = new CancellationTokenSource();
-      var interpreter = new IntervalInterpreter();
 
       var impactAndReplacementValues = await Task.Run(() => CalculateImpactAndReplacementValues(tree));
-      var variableRanges = (Content.ProblemData as RegressionProblemData).VariableRangesParameter.Value.VariableIntervals;
-
-      var resultIntervals = interpreter.GetSymbolicExpressionTreeIntervals(tree, variableRanges, out intervals);
+
       try {
         await Task.Delay(500, cancellationTokenSource.Token); // wait for progressbar to finish animation
@@ -208 +205 @@
         foldedNodes[pair.Key] = MakeConstantTreeNode(pair.Value);
       }
-      nodeImpacts = impactAndReplacementValues.ToDictionary(x => x.Key, x => x.Value.Item1);
+  
+      foreach (var kvp in impactAndReplacementValues) {
+        nodeImpacts[kvp.Key] = kvp.Value.Item1;
+      }
+
+      var regressionProblemData = Content.ProblemData as IRegressionProblemData;
+      if (regressionProblemData != null) {
+        var interpreter = new IntervalInterpreter();
+        var variableRanges = regressionProblemData.VariableRanges.VariableIntervals;
+        IDictionary<ISymbolicExpressionTreeNode, Interval> intervals;
+        interpreter.GetSymbolicExpressionTreeIntervals(tree, variableRanges, out intervals);
+        foreach (var kvp in intervals) {
+          nodeIntervals[kvp.Key] = kvp.Value;
+        }
+      }
+      
+
       progress.Finish();
       progress.CanBeStopped = false;
@@ -303 +316 @@
         }
         if (visualTree != null) {
-          if (intervals.ContainsKey(treeNode))
-            visualTree.ToolTip += String.Format($"{Environment.NewLine}Intervals: [{intervals[treeNode].LowerBound:G5} ... {intervals[treeNode].UpperBound:G5}]");
+          if (nodeIntervals.ContainsKey(treeNode))
+            visualTree.ToolTip += String.Format($"{Environment.NewLine}Intervals: [{nodeIntervals[treeNode].LowerBound:G5} ... {nodeIntervals[treeNode].UpperBound:G5}]");
           if (changedNodes.ContainsKey(treeNode)) {
             visualTree.LineColor = Color.DodgerBlue;

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblemData.cs

@@ -30 +30 @@
     NamedIntervals VariableRanges { get; set; }
     ParsedConstraint IntervalConstraints { get; set; }
+
     IEnumerable<double> TargetVariableValues { get; }
     IEnumerable<double> TargetVariableTrainingValues { get; }