Changeset 17752

Timestamp:

09/21/20 16:03:05 (4 years ago)

Author:

pfleck

Message:

#3040 Added subvector symbol to grammar

File:

• branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentVectorExpressionGrammar.cs (modified) (8 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentVectorExpressionGrammar.cs

@@ -49 +49 @@
     private const string VectorSymbolsName = "Vector Symbols";
 
+    private const string VectorManipulationSymbolsName = "Vector Manipulation Symbols";
+
     private const string RealValuedSymbolsName = "Real Valued Symbols";
 
@@ -124 +126 @@
       #endregion
 
+      #region vector manipulation symbol declaration
+      var subvector = new SubVector() { EnableWindowing = true };
+      #endregion
+
       #region group symbol declaration
       var arithmeticSymbols = new GroupSymbol(ArithmeticFunctionsName, new List<ISymbol>() { add, sub, mul, div });
@@ -142 +148 @@
       var vectorSymbols = new GroupSymbol(VectorSymbolsName, new List<ISymbol>() { vectorarithmeticSymbols, vectortrigonometricSymbols, vectorexponentialAndLogarithmicSymbols, vectorpowerSymbols, vectorterminalSymbols });
 
+      var vectorManipulationSymbols = new GroupSymbol(VectorManipulationSymbolsName, new List<ISymbol>() { subvector });
+
       //var realValuedSymbols = new GroupSymbol(RealValuedSymbolsName, new List<ISymbol> { scalarSymbols, vectorSymbols });
-
-
       #endregion
 
@@ -150 +156 @@
       AddSymbol(scalarSymbols);
       AddSymbol(vectorSymbols);
+      AddSymbol(vectorManipulationSymbols);
 
       #region subtree count configuration
@@ -177 +184 @@
       SetSubtreeCount(vectorexponentialAndLogarithmicSymbols, 1, 1);
       SetSubtreeCount(vectorterminalSymbols, 0, 0);
+
+      SetSubtreeCount(subvector, 1, 1);
       #endregion
 
@@ -189 +198 @@
       AddAllowedChildSymbol(root, constant, 1);
       AddAllowedChildSymbol(aggregationSymbols, vectorSymbols);
+      AddAllowedChildSymbol(statisticsSymbols, subvector);
 
       AddAllowedChildSymbol(vectorarithmeticSymbols, vectorSymbols);
@@ -197 +207 @@
       AddAllowedChildSymbol(vectorpower, constant, 1);
       AddAllowedChildSymbol(vectorroot, constant, 1);
+
+      AddAllowedChildSymbol(subvector, vectorSymbols);
       #endregion
 
@@ -202 +214 @@
       var disabledByDefault = new[] {
         TrigonometricFunctionsName, ExponentialFunctionsName, PowerFunctionsName,
-        VectorTrigonometricFunctionsName, VectorExponentialFunctionsName, VectorPowerFunctionsName
+        VectorTrigonometricFunctionsName, VectorExponentialFunctionsName, VectorPowerFunctionsName,
+        VectorManipulationSymbolsName
       };
       foreach (var grp in Symbols.Where(sym => disabledByDefault.Contains(sym.Name)))