Changeset 17892 for branches

Timestamp:

03/12/21 16:42:21 (4 years ago)

Author:

gkronber

Message:

#3076: refactoring to prepare for trunk reintegration

Location:

branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj (modified) (1 diff)
• MultiObjective/SymbolicRegressionMultiObjectiveMultiSoftConstraintEvaluator.cs (modified) (8 diffs)
• SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintEvaluator.cs (modified) (6 diffs)
• SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs (modified) (2 diffs)
• SymbolicRegressionConstraintAnalyzer.cs (modified) (4 diffs)
• SymbolicRegressionSplittingAnalyzer.cs (modified) (1 diff)

branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

@@ -176 +176 @@
     <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveConstraintEvaluator.cs" />
     <Compile Include="SingleObjective\SymbolicRegressionSolutionsAnalyzer.cs" />
-    <Compile Include="SymbolicRegressionSplittingAnalyzer.cs" />
     <Compile Include="SymbolicRegressionConstraintAnalyzer.cs" />
     <Compile Include="SymbolicRegressionPhenotypicDiversityAnalyzer.cs" />

branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveMultiSoftConstraintEvaluator.cs

@@ -22 +22 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -37 +36 @@
   [StorableType("8E9D76B7-ED9C-43E7-9898-01FBD3633880")]
   public class
-    SymbolicRegressionMultiObjectiveMultiSoftConstraintEvaluator : SymbolicRegressionMultiObjectiveEvaluator
-  {
+    SymbolicRegressionMultiObjectiveMultiSoftConstraintEvaluator : SymbolicRegressionMultiObjectiveEvaluator {
     public const string DimensionsParameterName = "Dimensions";
     private const string BoundsEstimatorParameterName = "Bounds estimator";
 
     public IFixedValueParameter<IntValue> DimensionsParameter =>
-      (IFixedValueParameter<IntValue>) Parameters[DimensionsParameterName];
+      (IFixedValueParameter<IntValue>)Parameters[DimensionsParameterName];
 
     public IValueParameter<IBoundsEstimator> BoundsEstimatorParameter =>
-      (IValueParameter<IBoundsEstimator>) Parameters[BoundsEstimatorParameterName];
+      (IValueParameter<IBoundsEstimator>)Parameters[BoundsEstimatorParameterName];
+
+    public int Dimensions {
+      get => DimensionsParameter.Value.Value;
+      set => DimensionsParameter.Value.Value = value;
+    }
 
     public IBoundsEstimator BoundsEstimator {
@@ -57 +60 @@
     public SymbolicRegressionMultiObjectiveMultiSoftConstraintEvaluator() {
       Parameters.Add(new FixedValueParameter<IntValue>(DimensionsParameterName, new IntValue(2)));
-      Parameters.Add(new ValueParameter<IBoundsEstimator>(BoundsEstimatorParameterName, new IABoundsEstimator()));
+      Parameters.Add(new ValueParameter<IBoundsEstimator>(BoundsEstimatorParameterName, new IntervalArithBoundsEstimator()));
     }
 
@@ -74 +77 @@
 
       if (!Parameters.ContainsKey(BoundsEstimatorParameterName))
-        Parameters.Add(new ValueParameter<IBoundsEstimator>(BoundsEstimatorParameterName, new IABoundsEstimator()));
+        Parameters.Add(new ValueParameter<IBoundsEstimator>(BoundsEstimatorParameterName, new IntervalArithBoundsEstimator()));
     }
 
@@ -121 +124 @@
             if (node.Symbol.Name == "Offset") {
               node.RemoveSubtree(1);
-              var alphaNode = new ConstantTreeNode(new Constant()) {Value = alpha};
+              var alphaNode = new ConstantTreeNode(new Constant()) { Value = alpha };
               node.AddSubtree(alphaNode);
             } else if (node.Symbol.Name == "Scaling") {
               node.RemoveSubtree(1);
-              var betaNode = new ConstantTreeNode(new Constant()) {Value = beta};
+              var betaNode = new ConstantTreeNode(new Constant()) { Value = beta };
               node.AddSubtree(betaNode);
             }
@@ -165 +168 @@
       var estimatedValues = interpreter.GetSymbolicExpressionTreeValues(solution, problemData.Dataset, rows);
       var targetValues = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, rows);
-      var constraints = problemData.IntervalConstraints.Constraints.Where(c => c.Enabled);
+      var constraints = problemData.ShapeConstraints.Where(c => c.Enabled);
       var intervalCollection = problemData.VariableRanges;
 
@@ -177 +180 @@
         nmse = 1.0;
 
-      var objectives = new List<double> {nmse};
-      var results = IntervalUtil.IntervalConstraintsViolation(constraints, estimator, intervalCollection, solution);
-      foreach (var result in results) {
-        if (double.IsNaN(result) || double.IsInfinity(result)) {
+      var objectives = new List<double> { nmse };
+      var violations = IntervalUtil.GetConstraintViolations(constraints, estimator, intervalCollection, solution);
+      foreach (var violation in violations) {
+        if (double.IsNaN(violation) || double.IsInfinity(violation)) {
           objectives.Add(double.MaxValue);
         } else {
-          objectives.Add(result);
+          objectives.Add(violation);
         }
       }
-      
+
       return objectives.ToArray();
     }
@@ -197 +200 @@
     public override IEnumerable<bool> Maximization {
       get {
-        var objectives = new List<bool> {false}; //First NMSE ==> min
-        objectives.AddRange(Enumerable.Repeat(false, DimensionsParameter.Value.Value)); //Constraints ==> min
+        var objectives = new List<bool> { false }; // NMSE ==> min
+        var dim = Dimensions;
+        objectives.AddRange(Enumerable.Repeat(false, dim)); // Constraints ==> min
 
         return objectives;

branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintEvaluator.cs

@@ -1 +1 @@
 using System;
-using System.CodeDom;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -96 +93 @@
         "Define whether the constraints are penalized by soft or hard constraints.", new BoolValue(false)));
       Parameters.Add(new ValueParameter<IBoundsEstimator>(BoundsEstimatorParameterName,
-        "Select the Boundsestimator.", new IABoundsEstimator()));
+        "Select the Boundsestimator.", new IntervalArithBoundsEstimator()));
       Parameters.Add(new FixedValueParameter<DoubleValue>(MaximumPenaltyFactorParamterName,
         "Specify how hard constraints violations should be punished", new DoubleValue(1.5)));
@@ -120 +117 @@
       if (!Parameters.ContainsKey(BoundsEstimatorParameterName))
         Parameters.Add(new ValueParameter<IBoundsEstimator>(BoundsEstimatorParameterName,
-          "Select the Boundsestimator.", new IABoundsEstimator()));
+          "Select the Boundsestimator.", new IntervalArithBoundsEstimator()));
 
       if (!Parameters.ContainsKey(MaximumPenaltyFactorParamterName)) {
@@ -197 +194 @@
       var estimatedValues = interpreter.GetSymbolicExpressionTreeValues(solution, problemData.Dataset, rows);
       var targetValues = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, rows);
-      var constraints = problemData.IntervalConstraints.EnabledConstraints;
+      var constraints = problemData.ShapeConstraints.EnabledConstraints;
       var intervalCollection = problemData.VariableRanges;
 
@@ -208 +205 @@
       }
 
-      var constraintResults = IntervalUtil.IntervalConstraintsViolation(constraints, estimator, intervalCollection, solution);
+      var constraintResults = IntervalUtil.GetConstraintViolations(constraints, estimator, intervalCollection, solution);
 
       if (constraintResults.Any(x => double.IsNaN(x) || double.IsInfinity(x))) {
@@ -217 +214 @@
       if (useSoftConstraints) {
         if (maximumPenaltyFactor < 0.0)
-          throw new ArgumentException("The parameter 'Maximum Penalty Factor' has to be greater or equal 0.0!");
+          throw new ArgumentException("The parameter has to be greater or equal 0.0!", nameof(maximumPenaltyFactor));
 
         var zip = constraints.Zip(constraintResults, (c, e) => new { Constraint = c, Error = e });

branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs

@@ -96 +96 @@
         changed = true;
       }
-
-      if (!Operators.OfType<SymbolicRegressionSplittingAnalyzer>().Any()) {
-        Operators.Add(new SymbolicRegressionSplittingAnalyzer());
-        changed = true;
-      }
       if (changed) {
         ParameterizeOperators();
@@ -124 +119 @@
       Operators.Add(new SymbolicExpressionTreePhenotypicSimilarityCalculator());
       Operators.Add(new SymbolicRegressionConstraintAnalyzer());
-      Operators.Add(new SymbolicRegressionSplittingAnalyzer());
       Operators.Add(new SymbolicRegressionPhenotypicDiversityAnalyzer(Operators.OfType<SymbolicExpressionTreePhenotypicSimilarityCalculator>()) { DiversityResultName = "Phenotypic Diversity" });
       ParameterizeOperators();

branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionConstraintAnalyzer.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Threading;
+using System.Linq;
 using HEAL.Attic;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
 
@@ -37 +31 @@
     public static int Iterations { get; set; } = 0;
 
-    public IBoundsEstimator BoundsEstimator { get; set; } = new IABoundsEstimator();
+    public IBoundsEstimator BoundsEstimator { get; set; } = new IntervalArithBoundsEstimator();
 
     [StorableConstructor]
@@ -105 +99 @@
 
       var results = ResultCollectionParameter.ActualValue;
-      var constraints = problemData.IntervalConstraints.EnabledConstraints;
+      var constraints = problemData.ShapeConstraints.EnabledConstraints;
       var variableRanges = problemData.VariableRanges.GetReadonlyDictionary();
       var intervalCollection = problemData.VariableRanges;
       var newDataTable = ConstraintViolationParameter.ActualValue;
-      var solutions = this.SymbolicExpressionTree.ToArray();
+      var solutions = SymbolicExpressionTree.ToArray();
 
       if (newDataTable.Rows.Count == 0)
         foreach (var constraint in constraints)
-          newDataTable.Rows.Add(new DataRow(constraint.Expression));
+          newDataTable.Rows.Add(new DataRow(constraint.ToString()));
 
       foreach (var constraint in constraints) {
-        var violations = trees.Count(tree => IntervalUtil.IntervalConstraintViolation(constraint, BoundsEstimator, intervalCollection, tree) > 0.0);
+        var violations = trees.Count(tree => IntervalUtil.GetConstraintViolation(constraint, BoundsEstimator, intervalCollection, tree) > 0.0);
 
-        newDataTable.Rows[constraint.Expression].Values.Add(violations);
+        newDataTable.Rows[constraint.ToString()].Values.Add(violations);
       }
 
@@ -127 +121 @@
       constraintUnsatisfiedSolutionsDataTable.Rows[ConstraintUnsatisfiedSolutionsParameterName]
         .Values
-        .Add(solutions.Count(s => IntervalUtil.IntervalConstraintsViolation(constraints, BoundsEstimator, intervalCollection, s).Any(x => x != 0.0)));
+        .Add(solutions.Count(s => IntervalUtil.GetConstraintViolations(constraints, BoundsEstimator, intervalCollection, s).Any(x => x != 0.0)));
 
       return base.Apply();

branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSplittingAnalyzer.cs

@@ -155 +155 @@
         var problemData = RegressionProblemDataParameter.ActualValue;
         var trees = SymbolicExpressionTreeParameter.ActualValue;
-        var constraints = problemData.IntervalConstraints.EnabledConstraints;
+        var constraints = problemData.ShapeConstraints.EnabledConstraints;
         var intervalCollection = problemData.VariableRanges;
-        var estimator = new IABoundsEstimator();
-        var splittingEstimator = new IABoundsEstimator {UseIntervalSplitting = true, SplittingIterations = 12};
+        var estimator = new IntervalArithBoundsEstimator();
+        var splittingEstimator = new IntervalArithBoundsEstimator {UseIntervalSplitting = true, SplittingIterations = 12};
 
         foreach (var solution in trees) {