Changeset 16581

Timestamp:

01/29/19 12:44:09 (6 years ago)

Author:

chaider

Message:

#2971

• Check if treeNode exists for specific intervals in SimplifierView
• GridView fills space in NamedIntevalsView

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/NamedIntervalsView.Designer.cs (modified) (2 diffs)

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

@@ -203 +203 @@
         variableRanges.Add(keyValuePair.Key, keyValuePair.Value);
       }
-      var resultIntervals = await Task.Run(() => interpreter.GetSymbolicExressionTreeIntervals(tree, variableRanges, out intervals));
+      var resultIntervals =  interpreter.GetSymbolicExressionTreeIntervals(tree, variableRanges, out intervals);
       try {
         await Task.Delay(500, cancellationTokenSource.Token); // wait for progressbar to finish animation
@@ -305 +305 @@
           }
         }
-        if (visualTree != null)
-          visualTree.ToolTip += String.Format($"{Environment.NewLine}Intervals: [{intervals[treeNode].LowerBound:G5} ... {intervals[treeNode].UpperBound:G5}]");
+        if (visualTree != null) {
+          if (intervals.ContainsKey(treeNode))
+            visualTree.ToolTip += String.Format($"{Environment.NewLine}Intervals: [{intervals[treeNode].LowerBound:G5} ... {intervals[treeNode].UpperBound:G5}]");
           if (changedNodes.ContainsKey(treeNode)) {
             visualTree.LineColor = Color.DodgerBlue;
@@ -312 +313 @@
             visualTree.LineColor = Color.DarkOrange;
           }
+        }
       }
       treeChart.RepaintNodes();

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/NamedIntervalsView.Designer.cs

@@ -32 +32 @@
       // dataGridView
       // 
-      this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
       this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-      this.dataGridView.Location = new System.Drawing.Point(6, 19);
+      this.dataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.dataGridView.Location = new System.Drawing.Point(3, 16);
       this.dataGridView.Name = "dataGridView";
       this.dataGridView.RowHeadersWidth = 120;
-      this.dataGridView.Size = new System.Drawing.Size(461, 378);
+      this.dataGridView.Size = new System.Drawing.Size(476, 391);
       this.dataGridView.TabIndex = 0;
       this.dataGridView.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_CellEndEdit);
@@ -48 +46 @@
       // 
       this.groupBox1.Controls.Add(this.dataGridView);
-      this.groupBox1.Location = new System.Drawing.Point(6, 4);
+      this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.groupBox1.Location = new System.Drawing.Point(0, 0);
       this.groupBox1.Name = "groupBox1";
-      this.groupBox1.Size = new System.Drawing.Size(473, 403);
+      this.groupBox1.Size = new System.Drawing.Size(482, 410);
       this.groupBox1.TabIndex = 1;
       this.groupBox1.TabStop = false;