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

Timestamp:

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

Author:

gkronber

Message:

#3076: refactoring to prepare for trunk reintegration

File:

• branches/3076_IA_evaluators_analyzers_reintegration/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveMultiSoftConstraintEvaluator.cs (modified) (8 diffs)

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;