Changeset 16927

Timestamp:

05/08/19 15:55:01 (6 years ago)

Author:

chaider

Message:

#2971 use methodes to operate on IntervalCollection dictionary

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionConstraintAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolution.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalCollectionView.cs (modified) (3 diffs)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionConstraintAnalyzer.cs

@@ -72 +72 @@
       var results = ResultCollectionParameter.ActualValue;
       var constraints = problemData.IntervalConstraints.Constraints.Where(x => x.Enabled);
-      var variableRanges = problemData.VariableRanges.getIntervals();
+      var variableRanges = problemData.VariableRanges.GetIntervals();
 
       if (!results.ContainsKey(ConstraintViolationsResultName)) {

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolution.cs

@@ -1 @@
-#region License Information
+#region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -179 +179 @@
       var problemData = solution.ProblemData;
       var model = solution.Model;
-      var variableRanges = problemData.VariableRanges.getIntervals();
+      var variableRanges = problemData.VariableRanges.GetIntervals();
 
-      intervalEvaluation.VariableIntervals.Add($"Target {problemData.TargetVariable}", new Interval(variableRanges[problemData.TargetVariable].LowerBound, variableRanges[problemData.TargetVariable].UpperBound));
-      intervalEvaluation.VariableIntervals.Add("Model Interval", interpreter.GetSymbolicExpressionTreeInterval(model.SymbolicExpressionTree, variableRanges));
-
+      intervalEvaluation.AddInterval($"Target {problemData.TargetVariable}", new Interval(variableRanges[problemData.TargetVariable].LowerBound, variableRanges[problemData.TargetVariable].UpperBound));
+      intervalEvaluation.AddInterval("Model Interval", interpreter.GetSymbolicExpressionTreeInterval(model.SymbolicExpressionTree, variableRanges));
       foreach (var inputVariable in model.VariablesUsedForPrediction.OrderBy(v => v, new NaturalStringComparer())) {
         var derivedModel = DerivativeCalculator.Derive(model.SymbolicExpressionTree, inputVariable);
         var derivedResultInterval = interpreter.GetSymbolicExpressionTreeInterval(derivedModel, variableRanges);
 
-        intervalEvaluation.VariableIntervals.Add(" \u2202f/\u2202" + inputVariable,
+        intervalEvaluation.AddInterval(" ∂f/∂" + inputVariable,
           new Interval(derivedResultInterval.LowerBound, derivedResultInterval.UpperBound));
       }

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

@@ -213 +213 @@
       if (regressionProblemData != null) {
         var interpreter = new IntervalInterpreter();
-        var variableRanges = regressionProblemData.VariableRanges.getIntervals();
+        var variableRanges = regressionProblemData.VariableRanges.GetIntervals();
         IDictionary<ISymbolicExpressionTreeNode, Interval> intervals;
         interpreter.GetSymbolicExpressionTreeIntervals(tree, variableRanges, out intervals);

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalCollectionView.cs

@@ -69 +69 @@
 
 
-      var variablesCount = Content.getIntervals().Count;
+      var variablesCount = Content.GetIntervals().Count;
 
       DataGridViewRow[] rows = new DataGridViewRow[variablesCount];
@@ -93 +93 @@
       for (var i = 0; i < dataGridView.RowCount; ++i) {
         var key = (string)dataGridView.Rows[i].HeaderCell.Value;
-        dataGridView.Rows[i].Cells[0].Value = Content.getInterval(key).LowerBound;
-        dataGridView.Rows[i].Cells[1].Value = Content.getInterval(key).UpperBound;
+        dataGridView.Rows[i].Cells[0].Value = Content.GetInterval(key).LowerBound;
+        dataGridView.Rows[i].Cells[1].Value = Content.GetInterval(key).UpperBound;
       }
     }
 
     private void SetRowsHeader() {
-      for (var i = 0; i < Content.getIntervals().Count; ++i) {
-        var item = Content.getIntervals().ElementAt(i);
+      for (var i = 0; i < Content.GetIntervals().Count; ++i) {
+        var item = Content.GetIntervals().ElementAt(i);
         dataGridView.Rows[i].HeaderCell.Value = item.Key;
       }
@@ -115 +115 @@
       if (e.ColumnIndex < 0 || e.RowIndex < 0) return;
 
-      var lowerBound = e.ColumnIndex == 0 ? double.Parse(dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString()) : Content.getInterval(key).LowerBound;
-      var upperBound = e.ColumnIndex == 1 ? double.Parse(dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString()) : Content.getInterval(key).UpperBound;
+      var lowerBound = e.ColumnIndex == 0 ? double.Parse(dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString()) : Content.GetInterval(key).LowerBound;
+      var upperBound = e.ColumnIndex == 1 ? double.Parse(dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString()) : Content.GetInterval(key).UpperBound;
 
       // update if there was a change
-      if (lowerBound != Content.getInterval(key).LowerBound ||
-        upperBound != Content.getInterval(key).UpperBound)
-        Content.VariableIntervals[key] = new Interval(lowerBound, upperBound);
+      if (lowerBound != Content.GetInterval(key).LowerBound ||
+        upperBound != Content.GetInterval(key).UpperBound)
+        Content.SetInterval(key, new Interval(lowerBound, upperBound));
     }