Changeset 18205

Timestamp:

01/21/22 11:51:56 (3 years ago)

Author:

dpiringe

Message:

#3136

• changed visibility of string constants in TypeCoherentExpressionGrammar from private to public
• changed default grammar for SubFunction

Location:

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

Files:

• Grammars/TypeCoherentExpressionGrammar.cs (modified) (1 diff)
• StructureTemplate/SubFunction.cs (modified) (2 diffs)

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentExpressionGrammar.cs

@@ -30 +30 @@
   [Item("TypeCoherentExpressionGrammar", "Represents a grammar for functional expressions in which special syntactic constraints are enforced so that boolean and real-valued expressions are not mixed.")]
   public class TypeCoherentExpressionGrammar : DataAnalysisGrammar, ISymbolicDataAnalysisGrammar {
-    private const string ArithmeticFunctionsName = "Arithmetic Functions";
-    private const string TrigonometricFunctionsName = "Trigonometric Functions";
-    private const string ExponentialFunctionsName = "Exponential and Logarithmic Functions";
-    private const string RealValuedSymbolsName = "Real Valued Symbols";
-    private const string TerminalsName = "Terminals";
-    private const string PowerFunctionsName = "Power Functions";
-    private const string ConditionsName = "Conditions";
-    private const string ComparisonsName = "Comparisons";
-    private const string BooleanOperatorsName = "Boolean Operators";
-    private const string ConditionalSymbolsName = "ConditionalSymbols";
-    private const string SpecialFunctionsName = "Special Functions";
-    private const string TimeSeriesSymbolsName = "Time Series Symbols";
+    public const string ArithmeticFunctionsName = "Arithmetic Functions";
+    public const string TrigonometricFunctionsName = "Trigonometric Functions";
+    public const string ExponentialFunctionsName = "Exponential and Logarithmic Functions";
+    public const string RealValuedSymbolsName = "Real Valued Symbols";
+    public const string TerminalsName = "Terminals";
+    public const string PowerFunctionsName = "Power Functions";
+    public const string ConditionsName = "Conditions";
+    public const string ComparisonsName = "Comparisons";
+    public const string BooleanOperatorsName = "Boolean Operators";
+    public const string ConditionalSymbolsName = "ConditionalSymbols";
+    public const string SpecialFunctionsName = "Special Functions";
+    public const string TimeSeriesSymbolsName = "Time Series Symbols";
 
     [StorableConstructor]

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

@@ -49 +49 @@
     #region Constructors
     public SubFunction() {
-      Parameters.Add(new ValueParameter<ISymbolicDataAnalysisGrammar>(GrammarParameterName, new ArithmeticExpressionGrammar()));
+      var grammar = new TypeCoherentExpressionGrammar();
+      grammar.ConfigureAsDefaultRegressionGrammar();
+      grammar.Symbols.First(s => s.Name == TypeCoherentExpressionGrammar.ExponentialFunctionsName).Enabled = false;
+      Parameters.Add(new ValueParameter<ISymbolicDataAnalysisGrammar>(GrammarParameterName, grammar));
       Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeDepthParameterName, new IntValue(8)));
       Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeLengthParameterName, new IntValue(20)));
@@ -71 +74 @@
     }
     #endregion
-
 
     #region Event Handling