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

Timestamp:

05/08/19 13:57:25 (6 years ago)

Author:

chaider

Message:

#2971

• Changed getInterval method to return Interval instead of KeyValuePair
• Calling getMethods from IntervalsCollection

Location:

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

Files:

• SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintConstOptEvaluator.cs (modified) (1 diff)
• SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintPearsonRSquaredEvaluator.cs (modified) (1 diff)
• SingleObjective/SymbolicRegressionConstraintAnalyzer.cs (modified) (1 diff)
• SymbolicRegressionSolution.cs (modified) (1 diff)

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

@@ -60 +60 @@
 
       var constraints = problemData.IntervalConstraints.Constraints.Where(x => x.Enabled);
-      var variableRanges = problemData.VariableRanges.VariableIntervals;
+      var variableRanges = problemData.VariableRanges.getIntervals();
 
       var r2 = SymbolicRegressionConstantOptimizationEvaluator.OptimizeConstants(interpreter, tree, problemData, problemData.TrainingIndices, applyLinearScaling, 10);

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

@@ -61 +61 @@
 
       var constraints = problemData.IntervalConstraints.Constraints.Where(x => x.Enabled);
-      var variableRanges = problemData.VariableRanges.VariableIntervals;
+      var variableRanges = problemData.VariableRanges.getIntervals();
       var tree = solution;
 

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.VariableIntervals;
+      var variableRanges = problemData.VariableRanges.getIntervals();
 
       if (!results.ContainsKey(ConstraintViolationsResultName)) {

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

@@ -179 +179 @@
       var problemData = solution.ProblemData;
       var model = solution.Model;
-      var variableRanges = problemData.VariableRanges.VariableIntervals;
+      var variableRanges = problemData.VariableRanges.getIntervals();
 
       intervalEvaluation.VariableIntervals.Add($"Target {problemData.TargetVariable}", new Interval(variableRanges[problemData.TargetVariable].LowerBound, variableRanges[problemData.TargetVariable].UpperBound));