Changeset 18129 for branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars

Timestamp:

12/15/21 11:35:23 (3 years ago)

Author:

gkronber

Message:

#3140: updated grammars again to use number instead of constant (fixing a bug I introduced earlier) and updated samples again.

Location:

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

Files:

• ArithmeticExpressionGrammar.cs (modified) (1 diff)
• FullFunctionalExpressionGrammar.cs (modified) (1 diff)
• LinearScalingGrammar.cs (modified) (1 diff)
• TypeCoherentExpressionGrammar.cs (modified) (5 diffs)

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/ArithmeticExpressionGrammar.cs

@@ -53 +53 @@
       number.MaxValue = 20;
       var constant = new Constant();
+      constant.Enabled = false;
       var variableSymbol = new HeuristicLab.Problems.DataAnalysis.Symbolic.Variable();
       var binFactorVariableSymbol = new BinaryFactorVariable();

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/FullFunctionalExpressionGrammar.cs

@@ -131 +131 @@
 
       var constant = new Constant();
+      constant.Enabled = false;
 
       var allSymbols = new List<Symbol>() { add, sub, mul, div, aq, mean, abs, sin, cos, tan, log, square, cube, pow, sqrt, cubeRoot, root, exp, tanh,

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/LinearScalingGrammar.cs

@@ -70 +70 @@
       number.MaxValue = 20;
       var constant = new Constant();
+      constant.Enabled = false;
       var variableSymbol = new Variable();
 

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentExpressionGrammar.cs

@@ -109 +109 @@
       number.MaxValue = 20;
       var constant = new Constant();
+      constant.Enabled = false;
       var variableSymbol = new Variable();
       var binFactorVariable = new BinaryFactorVariable();
@@ -195 +196 @@
       AddAllowedChildSymbol(powerSymbols, autoregressiveVariable, 0);
       AddAllowedChildSymbol(powerSymbols, number, 1);
+      AddAllowedChildSymbol(powerSymbols, constant, 1);
 
       AddAllowedChildSymbol(square, realValuedSymbols, 0);
@@ -250 +252 @@
       Symbols.First(s => s.Name == ConditionalSymbolsName).Enabled = false;
       Symbols.First(s => s.Name == TimeSeriesSymbolsName).Enabled = false;
-      Symbols.First(s => s is Number).Enabled = false;
+      Symbols.First(s => s is Constant).Enabled = false;
     }
 
@@ -264 +266 @@
       Symbols.First(s => s.Name == PowerFunctionsName).Enabled = false;
       Symbols.First(s => s.Name == TimeSeriesSymbolsName).Enabled = false;
-      Symbols.First(s => s is Number).Enabled = false;
+      Symbols.First(s => s is Constant).Enabled = false;
     }
 
@@ -281 +283 @@
       Symbols.First(s => s is Integral).Enabled = false;
       Symbols.First(s => s is TimeLag).Enabled = false;
-      Symbols.First(s => s is Number).Enabled = false;
+      Symbols.First(s => s is Constant).Enabled = false;
     }
   }