Changeset 16313 for branches/2956_apriori_knowledge/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

Timestamp:

11/21/18 10:27:55 (5 years ago)

Author:

chaider

Message:

#2956:

• Updated value visualization of simplifier tooltip
• Added VariableRanges field to dataset
• Added overloads for GetSymbolicExressionTreeIntervals

File:

• branches/2956_apriori_knowledge/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (modified) (5 diffs)

branches/2956_apriori_knowledge/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

@@ -34 +34 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
+using System.Globalization;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
@@ -193 +194 @@
       var interpreter = new SymbolicDataAnalysisIntervalArithmeticInterpreter();
 
-      //var intervalParam = ((IRegressionProblemData)Content.ProblemData).IntervalVariable;
+      //Get the Variable Ranges and add it to the dictionary 
+      var intervalParameters = ((IRegressionProblemData)Content.ProblemData).VariableRanges;
       var customIntervals = new Dictionary<String, Interval>();
-      var parser = new FormulationParser();
-      //foreach (var ci in intervalParam) {
-      //var inter = parser.Parse(ci.Formulation.GetValue());
-      //customIntervals.Add(ci.Variable.GetValue(), new Interval(0, 1));
-      //}
-      var resultInterval = interpreter.GetSymbolicExressionTreeIntervals(tree, Content.ProblemData.Dataset, Content.ProblemData.TrainingIndices, out intervals);
+      for (int x = 0; x < intervalParameters.Rows; ++x) {
+        customIntervals.Add(intervalParameters.RowNames.ElementAt(x),
+                            new Interval(intervalParameters.GetRow(x).ElementAt(0),
+                                         intervalParameters.GetRow(x).ElementAt(1)));
+      }
+
+      var resultInterval = interpreter.GetSymbolicExressionTreeIntervals(tree, Content.ProblemData.Dataset, Content.ProblemData.TrainingIndices, customIntervals, out intervals);
       await Task.Delay(500); // wait for progressbar to finish animation
       var replacementValues = impactAndReplacementValues.ToDictionary(x => x.Key, x => x.Value.Item2);
@@ -206 +209 @@
         foldedNodes[pair.Key] = MakeConstantTreeNode(pair.Value);
       }
-      //Instruction currentInstr = instructions.NextInstruction();
-      //while (instructions.HasNextInstruction()) {
-      //  //intervals[currentInstr.dynamicNode] = (Interval)currentInstr.data;
-      //  intervals.Add(Tuple.Create(currentInstr.dynamicNode, (Interval)currentInstr.data));
-      //  currentInstr = instructions.NextInstruction();
-      //}
-      
-      
-
-      //intervals.Add(Tuple.Create(currentInstr.dynamicNode, (Interval)currentInstr.data));
+
       nodeImpacts = impactAndReplacementValues.ToDictionary(x => x.Key, x => x.Value.Item1);
       progress.Finish();
       PaintIntervals();
-      //PaintNodeImpacts();
     }
 
@@ -291 +284 @@
         if (visualTree != null) { 
           visualTree.ToolTip = visualTree.Content.ToString();
-          //visualTree.ToolTip += String.Format($"{Environment.NewLine}Intervals: [{intervals[node].Item2.LowerBound:E4} ... {intervals[node].Item2.UpperBound:E4}]{Environment.NewLine}");
-          visualTree.ToolTip += String.Format($"{Environment.NewLine}Intervals: [{intervals[treeNode].LowerBound:E4} ... {intervals[treeNode].UpperBound:E4}]{Environment.NewLine}]");
+          visualTree.ToolTip += String.Format($"{Environment.NewLine}Intervals: [{intervals[treeNode].LowerBound:G5} ... {intervals[treeNode].UpperBound:G5}]{Environment.NewLine}");
           node++;
           
@@ -309 +301 @@
               visualTree.FillColor = Color.FromArgb((int)(impact / max * 255), Color.Green);
             }
-            visualTree.ToolTip += String.Format($"{Environment.NewLine} Node impact: {impact:E4}");
+            visualTree.ToolTip += String.Format($"Node impact: {impact:G5}");
             var constantReplacementNode = foldedNodes[treeNode] as ConstantTreeNode;
             if (constantReplacementNode != null) {
-              visualTree.ToolTip += String.Format($"{Environment.NewLine} Replacement value: {constantReplacementNode.Value:E4}");
+              visualTree.ToolTip += String.Format($"{Environment.NewLine}Replacement value: {constantReplacementNode.Value:G5}");
             }
           }