Changeset 17627 for branches

Timestamp:

06/23/20 13:22:04 (4 years ago)

Author:

chaider

Message:

#3076

• Added abstract class for splitting parameters
• Fixed formatting

Location:

branches/3076_IA_evaluators_analyzers/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)
• MultiObjective/SymbolicRegressionMultiObjectiveSplittingEvaluator.cs (added)

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

@@ -172 +172 @@
     <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveMultiHardConstraintEvaluator.cs" />
     <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveMultiSoftConstraintEvaluator.cs" />
+    <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveSplittingEvaluator.cs" />
     <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveValidationBestSolutionAnalyzer.cs" />
     <Compile Include="Plugin.cs" />

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

@@ -30 +30 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.MultiObjective {
@@ -37 +36 @@
   [StorableType("8E9D76B7-ED9C-43E7-9898-01FBD3633880")]
   public class
-    SymbolicRegressionMultiObjectiveMultiSoftConstraintEvaluator : SymbolicRegressionMultiObjectiveEvaluator {
-    private const string MinIntervalWidthParameterName      = "MinIntervalWidth";
-    private const string MaxIntervalSplitDepthParameterName = "MaxIntervalSplitDepth";
-
-    public IFixedValueParameter<DoubleValue> MinIntervalWidthParameter =>
-      (IFixedValueParameter<DoubleValue>) Parameters[MinIntervalWidthParameterName];
-
-    public IFixedValueParameter<IntValue> MaxIntervalSplitDepthParameter =>
-      (IFixedValueParameter<IntValue>) Parameters[MaxIntervalSplitDepthParameterName];
-
-    public double MinIntervalWidth => MinIntervalWidthParameter.Value.Value;
-
-    public int MaxIntervalSplitDepth => MaxIntervalSplitDepthParameter.Value.Value;
-
+    SymbolicRegressionMultiObjectiveMultiSoftConstraintEvaluator : SymbolicRegressionMultiObjectiveSplittingEvaluator {
     #region Constructors
 
-    public SymbolicRegressionMultiObjectiveMultiSoftConstraintEvaluator() {
-      Parameters.Add(new FixedValueParameter<DoubleValue>(MinIntervalWidthParameterName, new DoubleValue(1.0)));
-      Parameters.Add(new FixedValueParameter<IntValue>(MaxIntervalSplitDepthParameterName, new IntValue(5)));
-    }
+    public SymbolicRegressionMultiObjectiveMultiSoftConstraintEvaluator() { }
 
     [StorableConstructor]
@@ -72 +55 @@
 
     public override IOperation InstrumentedApply() {
-      var rows             = GenerateRowsToEvaluate();
-      var solution         = SymbolicExpressionTreeParameter.ActualValue;
-      var problemData      = ProblemDataParameter.ActualValue;
-      var interpreter      = SymbolicDataAnalysisTreeInterpreterParameter.ActualValue;
-      var estimationLimits = EstimationLimitsParameter.ActualValue;
-      //var applyLinearScaling = ApplyLinearScalingParameter.ActualValue.Value;
+      var rows                  = GenerateRowsToEvaluate();
+      var solution              = SymbolicExpressionTreeParameter.ActualValue;
+      var problemData           = ProblemDataParameter.ActualValue;
+      var interpreter           = SymbolicDataAnalysisTreeInterpreterParameter.ActualValue;
+      var estimationLimits      = EstimationLimitsParameter.ActualValue;
+      var minIntervalWidth      = MinSplittingWidth;
+      var maxIntervalSplitDepth = MaxSplittingDepth;
+      //var applyLinearScaling  = ApplyLinearScalingParameter.ActualValue.Value;
       var applyLinearScaling = false;
 
       if (UseConstantOptimization)
         SymbolicRegressionConstantOptimizationEvaluator.OptimizeConstants(interpreter, solution, problemData, rows,
-                                                                          applyLinearScaling,
-                                                                          ConstantOptimizationIterations,
-                                                                          ConstantOptimizationUpdateVariableWeights,
-                                                                          estimationLimits.Lower,
-                                                                          estimationLimits.Upper);
+          applyLinearScaling,
+          ConstantOptimizationIterations,
+          ConstantOptimizationUpdateVariableWeights,
+          estimationLimits.Lower,
+          estimationLimits.Upper);
 
       var qualities = Calculate(interpreter, solution, estimationLimits.Lower, estimationLimits.Upper, problemData,
-                                rows, applyLinearScaling, DecimalPlaces, MinIntervalWidth, MaxIntervalSplitDepth);
+        rows, applyLinearScaling, DecimalPlaces, minIntervalWidth, maxIntervalSplitDepth);
       QualitiesParameter.ActualValue = new DoubleArray(qualities);
       return base.InstrumentedApply();
@@ -102 +87 @@
 
       var quality = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, tree,
-                              EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper,
-                              problemData, rows,
-                              ApplyLinearScalingParameter.ActualValue.Value, DecimalPlaces, MinIntervalWidth,
-                              MaxIntervalSplitDepth);
+        EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper,
+        problemData, rows,
+        ApplyLinearScalingParameter.ActualValue.Value, DecimalPlaces, MinSplittingWidth,
+        MaxSplittingDepth);
 
       SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = null;
@@ -119 +104 @@
                                      double upperEstimationLimit,
                                      IRegressionProblemData problemData, IEnumerable<int> rows, bool applyLinearScaling,
-                                     int decimalPlaces, double minIntervalSplitWidth, int maxIntervalSplitDetph) {
+                                     int decimalPlaces, double minIntervalSplitWidth, int maxIntervalSplitDepth) {
       OnlineCalculatorError errorState;
       var estimatedValues =
@@ -144 +129 @@
       foreach (var c in constraints) {
         var penalty = ConstraintExceeded(c, intervalInterpreter, variableRanges,
-                                         solution /*, problemData.IntervalSplitting*/);
+          solution /*, problemData.IntervalSplitting*/);
         var maxP = 0.1;
 
@@ -163 +148 @@
       if (constraint.Variable != null && !variableRanges.ContainsKey(constraint.Variable))
         throw new ArgumentException(
-                                    $"The given variable {constraint.Variable} in the constraint does not exists in the model.",
-                                    nameof(IntervalConstraintsParser));
+          $"The given variable {constraint.Variable} in the constraint does not exists in the model.",
+          nameof(IntervalConstraintsParser));
       Interval resultInterval;
       if (!constraint.IsDerivative) {
@@ -207 +192 @@
     public override IEnumerable<bool> Maximization {
       get {
-        var objectives = new List<bool> {false}; //First NMSE ==> min
+        var objectives = new List<bool> {false};          //First NMSE ==> min
         objectives.AddRange(Enumerable.Repeat(false, 3)); //Constraints ==> min