Changeset 18084 for branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

11/18/21 15:55:41 (3 years ago)

Author:

dpiringe

Message:

#3136

• added a new problem data provider AsadzadehProvider and the correspondig instance Asadzadeh1
  • implements the test setup of paper Symbolic regression based hybrid semiparametric modelling of processes: An example case of a bending process
• used the Asadzadeh1 instance in StructuredSymbolicRegressionSingleObjectiveProblem for default setup
• added the SubFunctionSymbol in DerivativeCalculator and IntervalArithBoundsEstimator

Location:

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• Converters/DerivativeCalculator.cs (modified) (2 diffs)
• Interpreter/IntervalArithBoundsEstimator.cs (modified) (2 diffs)

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/DerivativeCalculator.cs

@@ -197 +197 @@
         var tanh = (ISymbolicExpressionTreeNode)branch.Clone();
         return Product(fxp, Subtract(CreateConstant(1.0), Square(tanh)));
+      }
+      if (branch.Symbol is SubFunctionSymbol) {
+        return Derive(branch.GetSubtree(0), variableName);
       }
       throw new NotSupportedException(string.Format("Symbol {0} is not supported.", branch.Symbol));
@@ -282 +285 @@
           !(n.Symbol is Cosine) &&
           !(n.Symbol is Tangent) &&
-          !(n.Symbol is StartSymbol)
+          !(n.Symbol is StartSymbol) &&
+          !(n.Symbol is SubFunctionSymbol)
         select n).Any();
       return !containsUnknownSymbol;

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalArithBoundsEstimator.cs

@@ -247 +247 @@
 
             break;
+          }
+        case OpCodes.SubFunction: {
+            result = Evaluate(instructions, ref instructionCounter, nodeIntervals, variableIntervals);
+          break;
           }
         default:
@@ -342 +346 @@
           !(n.Symbol is Power) &&
           !(n.Symbol is Absolute) &&
-          !(n.Symbol is AnalyticQuotient)
+          !(n.Symbol is AnalyticQuotient) &&
+          !(n.Symbol is SubFunctionSymbol)
         select n).Any();
       return !containsUnknownSymbols;