Changeset 17504

Timestamp:

04/10/20 13:13:25 (5 years ago)

Author:

mkommend

Message:

#2971: Added properts in ProblemDataConstraints for EnabledConstraints.

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintConstOptEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintPearsonRSquaredEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionConstraintAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/ProblemDataConstraint.cs (modified) (1 diff)

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -59 +58 @@
       IEnumerable<double> targetValues = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, rows);
 
-      var constraints = problemData.IntervalConstraints.Constraints.Where(x => x.Enabled);
+      var constraints = problemData.IntervalConstraints.EnabledConstraints;
       var variableRanges = problemData.VariableRanges.GetIntervals();
 

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

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -60 +58 @@
       OnlineCalculatorError errorState = OnlineCalculatorError.None;
 
-      var constraints = problemData.IntervalConstraints.Constraints.Where(x => x.Enabled);
+      var constraints = problemData.IntervalConstraints.EnabledConstraints;
       var variableRanges = problemData.VariableRanges.GetIntervals();
       var tree = solution;

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

@@ -71 +71 @@
 
       var results = ResultCollectionParameter.ActualValue;
-      var constraints = problemData.IntervalConstraints.Constraints.Where(x => x.Enabled);
+      var constraints = problemData.IntervalConstraints.EnabledConstraints;
       var variableRanges = problemData.VariableRanges.GetIntervals();
 

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/ProblemDataConstraint.cs

@@ -82 +82 @@
       }
     }
+    public IEnumerable<IntervalConstraint> EnabledConstraints {
+      get => Constraints.Where(c => c.Enabled);
+    }
+
+
     [Storable]
     public IRegressionProblemData ProblemData { get; private set; }