Changeset 16927 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression

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/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Files:

• SingleObjective/SymbolicRegressionConstraintAnalyzer.cs (modified) (1 diff)
• SymbolicRegressionSolution.cs (modified) (2 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));
       }