Changeset 18181

Timestamp:

01/10/22 15:17:35 (3 years ago)

Author:

dpiringe

Message:

#3138

• added the class ExtendedConstraint which represents an expression (the transformation of the found model) and the corresponding shape constraints
• added a list of ExtendedConstraint in NMSESingleObjectiveConstraintsEvaluator to make future tests/experiments (exists only temporarily in NMSESingleObjectiveConstraintsEvaluator, will be moved later)

Location:

branches/3138_Shape_Constraints_Transformations/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Files:

• ExtendedConstraint.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj (modified) (1 diff)
• SingleObjective/Evaluators/NMSESingleObjectiveConstraintsEvaluator.cs (modified) (7 diffs)

branches/3138_Shape_Constraints_Transformations/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

@@ -119 +119 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ExtendedConstraint.cs" />
     <Compile Include="Interfaces\IMultiObjectiveConstraintsEvaluator.cs" />
     <Compile Include="MultiObjective\NMSEMultiObjectiveConstraintsEvaluator.cs" />

branches/3138_Shape_Constraints_Transformations/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/NMSESingleObjectiveConstraintsEvaluator.cs

@@ -41 +41 @@
     private const string BoundsEstimatorParameterName = "BoundsEstimator";
     private const string PenaltyFactorParameterName = "PenaltyFactor";
+    private const string ExtendedConstraintsParameterName = "ExtendedConstraints";
 
 
@@ -57 +58 @@
       (IFixedValueParameter<DoubleValue>)Parameters[PenaltyFactorParameterName];
 
+    public IFixedValueParameter<IItemList<ExtendedConstraint>> ExtendedConstraintsParameter =>
+      (IFixedValueParameter<IItemList<ExtendedConstraint>>)Parameters[ExtendedConstraintsParameterName];
+
+
     public bool OptimizeParameters {
       get => OptimizerParametersParameter.Value.Value;
@@ -81 +86 @@
       set => PenaltyFactorParameter.Value.Value = value;
     }
+
+    public IEnumerable<ExtendedConstraint> ExtendedConstraints {
+      get => ExtendedConstraintsParameter.Value;
+    }
+      
 
 
@@ -106 +116 @@
       Parameters.Add(new FixedValueParameter<DoubleValue>(PenaltyFactorParameterName,
         "Punishment factor for constraint violations for soft constraint handling (fitness = NMSE + penaltyFactor * avg(violations)) (default: 1.0)", new DoubleValue(1.0)));
+      Parameters.Add(new FixedValueParameter<ItemList<ExtendedConstraint>>(ExtendedConstraintsParameterName, "", new ItemList<ExtendedConstraint>()));
     }
 
@@ -164 +175 @@
 
       var quality = Calculate(interpreter, tree, estimationLimits.Lower, estimationLimits.Upper, problemData, rows,
-        BoundsEstimator, UseSoftConstraints, PenalityFactor);
+        BoundsEstimator, UseSoftConstraints, PenalityFactor, ExtendedConstraints);
       QualityParameter.ActualValue = new DoubleValue(quality);
 
@@ -176 +187 @@
       IRegressionProblemData problemData, IEnumerable<int> rows,
       IBoundsEstimator estimator,
-      bool useSoftConstraints = false, double penaltyFactor = 1.0) {
+      bool useSoftConstraints = false, double penaltyFactor = 1.0,
+      IEnumerable<ExtendedConstraint> extendedConstraints = null) {
 
       var estimatedValues = interpreter.GetSymbolicExpressionTreeValues(tree, problemData.Dataset, rows);
@@ -225 +237 @@
       var nmse = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, tree,
         EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper,
-        problemData, rows, BoundsEstimator, UseSoftConstraints, PenalityFactor);
+        problemData, rows, BoundsEstimator, UseSoftConstraints, PenalityFactor, ExtendedConstraints);
 
       SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = null;