Changeset 18115 for branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression

Timestamp:

12/13/21 17:49:34 (3 years ago)

Author:

gkronber

Message:

#3140: made several more changes for the constant -> number branch

Location:

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Files:

• Interfaces/IMultiObjectiveConstraintsEvaluator.cs (modified) (1 diff)
• MultiObjective/NMSEMultiObjectiveConstraintsEvaluator.cs (modified) (5 diffs)
• SingleObjective/Evaluators/NMSESingleObjectiveConstraintsEvaluator.cs (modified) (2 diffs)
• SymbolicRegressionPruningOperator.cs (modified) (1 diff)

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/Interfaces/IMultiObjectiveConstraintsEvaluator.cs

@@ -27 +27 @@
   [StorableType("F96C5253-5A78-491C-95AE-78F64BD1F3B1")]
   public interface IMultiObjectiveConstraintsEvaluator : ISymbolicRegressionMultiObjectiveEvaluator {
-
     IFixedValueParameter<IntValue> NumConstraintsParameter { get; }
   }

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/NMSEMultiObjectiveConstraintsEvaluator.cs

@@ -105 +105 @@
           var scaling = offset.GetSubtree(0);
 
-          //Check if tree contains offset and scaling nodes
+          // Check if tree contains offset and scaling nodes
           if (!(offset.Symbol is Addition) || !(scaling.Symbol is Multiplication))
             throw new ArgumentException($"{ItemName} can only be used with LinearScalingGrammar.");
@@ -115 +115 @@
           var newTree = new SymbolicExpressionTree(rootNode);
 
-          //calculate alpha and beta for scaling
+          // calculate alpha and beta for scaling
           var estimatedValues = interpreter.GetSymbolicExpressionTreeValues(newTree, problemData.Dataset, rows);
 
@@ -122 +122 @@
             out var errorState);
           if (errorState == OnlineCalculatorError.None) {
-            //Set alpha and beta to the scaling nodes from ia grammar
+            // Set alpha and beta to the scaling nodes from linear scaling grammar
             var offsetParameter = offset.GetSubtree(1) as NumberTreeNode;
             offsetParameter.Value = alpha;
@@ -162 +162 @@
       double upperEstimationLimit,
       IRegressionProblemData problemData, IEnumerable<int> rows, IBoundsEstimator estimator, int decimalPlaces) {
-      OnlineCalculatorError errorState;
       var estimatedValues = interpreter.GetSymbolicExpressionTreeValues(solution, problemData.Dataset, rows);
       var targetValues = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, rows);
@@ -174 +173 @@
 
       var boundedEstimatedValues = estimatedValues.LimitToRange(lowerEstimationLimit, upperEstimationLimit);
-      nmse = OnlineNormalizedMeanSquaredErrorCalculator.Calculate(targetValues, boundedEstimatedValues, out errorState);
+      nmse = OnlineNormalizedMeanSquaredErrorCalculator.Calculate(targetValues, boundedEstimatedValues, out OnlineCalculatorError errorState);
 
       if (errorState != OnlineCalculatorError.None) nmse = 1.0;

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/NMSESingleObjectiveConstraintsEvaluator.cs

@@ -97 +97 @@
     public NMSESingleObjectiveConstraintsEvaluator() {
       Parameters.Add(new FixedValueParameter<BoolValue>(OptimizeParametersParameterName,
-        "Define whether optimization of numeric parameters is active or not (default: false).", new BoolValue(false)));
+        "Define whether optimization of parameters is active or not (default: false).", new BoolValue(false)));
       Parameters.Add(new FixedValueParameter<IntValue>(ParameterOptimizationIterationsParameterName,
         "Define how many parameter optimization steps should be performed (default: 10).", new IntValue(10)));
@@ -109 +109 @@
 
     [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      if (!Parameters.ContainsKey(ParameterOptimizationIterationsParameterName)) {
-        if (Parameters.ContainsKey("ParameterOptimizationIterations")) {
-          Parameters.Add(new FixedValueParameter<IntValue>(ParameterOptimizationIterationsParameterName, "Define how many parameter optimization steps should be performed (default: 10).", (IntValue)Parameters["ParameterOptimizationIterations"].ActualValue));
-          Parameters.Remove("ParameterOptimizationIterations");
-        } else {
-          Parameters.Add(new FixedValueParameter<IntValue>(ParameterOptimizationIterationsParameterName, "Define how many parameter optimization steps should be performed (default: 10).", new IntValue(10)));
-        }
-      }
-
-    }
+    private void AfterDeserialization() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionPruningOperator.cs

@@ -91 +91 @@
       for (int i = 0; i < nodes.Count; ++i) {
         var node = nodes[i];
-        if (node is NumberTreeNode) continue;
+        if (node is INumericTreeNode) continue; // skip constants and numbers
 
         impactValuesCalculator.CalculateImpactAndReplacementValues(model, node, problemData, rows,