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

Timestamp:

10/20/21 14:39:46 (3 years ago)

Author:

dpiringe

Message:

#3136

• added linear scaling logic in Evaluate and (for UI reasons) Analyze
• added logic forSubFunctionSymbol (modified OpCodes) -> the SubFunctionTreeNode is display in the tree but has no effect on evaluation (works like a flag)
  • works now with SymbolicDataAnalysisExpressionTreeInterpreter
• default grammar for SubFunction is now ArithmeticExpressionGrammar instead of LinearScalingGrammar

Location:

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

Files:

• Interpreter/OpCodes.cs (modified) (3 diffs)
• Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (1 diff)
• StructureTemplate/StructureTemplate.cs (modified) (1 diff)
• StructureTemplate/SubFunction.cs (modified) (1 diff)

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

@@ -79 +79 @@
     CubeRoot = 51,
     Tanh = 52,
+    SubFunction = 53
   };
   public static class OpCodes {
@@ -134 +135 @@
     public const byte CubeRoot = (byte)OpCode.CubeRoot;
     public const byte Tanh = (byte)OpCode.Tanh;
-
+    public const byte SubFunction = (byte)OpCode.SubFunction;
 
     private static Dictionary<Type, byte> symbolToOpcode = new Dictionary<Type, byte>() {
-       { typeof(Addition), OpCodes.Add },
+      { typeof(Addition), OpCodes.Add },
       { typeof(Subtraction), OpCodes.Sub },
       { typeof(Multiplication), OpCodes.Mul },
@@ -189 +190 @@
       { typeof(AnalyticQuotient), OpCodes.AnalyticQuotient },
       { typeof(Cube), OpCodes.Cube },
-      { typeof(CubeRoot), OpCodes.CubeRoot }
+      { typeof(CubeRoot), OpCodes.CubeRoot },
+      { typeof(SubFunctionSymbol), OpCodes.SubFunction }
     };
 

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

@@ -528 +528 @@
             }
           }
+        case OpCodes.SubFunction: {
+            return Evaluate(dataset, ref row, state);
+          }
         default:
           throw new NotSupportedException();

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

@@ -46 +46 @@
       set {
         applyLinearScaling = value;
-        //subFunctions = GetSubFunctions();
         OnChanged();
       }

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate/SubFunction.cs

@@ -52 +52 @@
     #region Constructors
     public SubFunction() {
-      Parameters.Add(new ValueParameter<ISymbolicDataAnalysisGrammar>(GrammarParameterName, new LinearScalingGrammar()));
-      Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeDepthParameterName, new IntValue(10)));
-      Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeLengthParameterName, new IntValue(30)));
+      Parameters.Add(new ValueParameter<ISymbolicDataAnalysisGrammar>(GrammarParameterName, new ArithmeticExpressionGrammar()));
+      Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeDepthParameterName, new IntValue(8)));
+      Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeLengthParameterName, new IntValue(20)));
 
-      // TODO: separate events for each parameter
       GrammarParameter.ValueChanged += OnParameterValueChanged;
       MaximumSymbolicExpressionTreeDepthParameter.Value.ValueChanged += OnParameterValueChanged;