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

Timestamp:

09/28/21 13:37:43 (3 years ago)

Author:

pfleck

Message:

#3040 Added a subvector symbol with ranges as subtrees.

File:

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

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

@@ -50 +50 @@
 
     private const string VectorManipulationSymbolsName = "Vector Manipulation Symbols";
+    private const string VectorSubVectorSymbolsName = "Vector SubVector Symbols";
 
     private const string RealValuedSymbolsName = "Real Valued Symbols";
@@ -127 +128 @@
 
       #region vector manipulation symbol declaration
-      var subvector = new SubVector() { EnableWindowing = true };
+      var subvectorLocal = new SubVector();
+      var subvectorSubtree = new SubVectorSubtree();
       #endregion
 
@@ -148 +150 @@
       var vectorSymbols = new GroupSymbol(VectorSymbolsName, new List<ISymbol>() { vectorarithmeticSymbols, vectortrigonometricSymbols, vectorexponentialAndLogarithmicSymbols, vectorpowerSymbols, vectorterminalSymbols });
 
-      var vectorManipulationSymbols = new GroupSymbol(VectorManipulationSymbolsName, new List<ISymbol>() { subvector });
+      var vectorSubVectorSymbols = new GroupSymbol(VectorSubVectorSymbolsName, new List<ISymbol>() { subvectorLocal, subvectorSubtree });
+      var vectorManipulationSymbols = new GroupSymbol(VectorManipulationSymbolsName, new List<ISymbol>() { vectorSubVectorSymbols });
+      
 
       //var realValuedSymbols = new GroupSymbol(RealValuedSymbolsName, new List<ISymbol> { scalarSymbols, vectorSymbols });
@@ -185 +189 @@
       SetSubtreeCount(vectorterminalSymbols, 0, 0);
 
-      SetSubtreeCount(subvector, 1, 1);
+      SetSubtreeCount(subvectorLocal, 1, 1);
+      SetSubtreeCount(subvectorSubtree, 3, 3);
       #endregion
 
@@ -198 +203 @@
       AddAllowedChildSymbol(root, constant, 1);
       AddAllowedChildSymbol(aggregationSymbols, vectorSymbols);
-      AddAllowedChildSymbol(statisticsSymbols, subvector);
+      AddAllowedChildSymbol(statisticsSymbols, vectorSubVectorSymbols);
 
       AddAllowedChildSymbol(vectorarithmeticSymbols, vectorSymbols);
@@ -208 +213 @@
       AddAllowedChildSymbol(vectorroot, constant, 1);
 
-      AddAllowedChildSymbol(subvector, vectorSymbols);
+      AddAllowedChildSymbol(subvectorLocal, vectorSymbols);
+      AddAllowedChildSymbol(subvectorSubtree, vectorSymbols, 0);
+      AddAllowedChildSymbol(subvectorSubtree, scalarSymbols, 1);
+      AddAllowedChildSymbol(subvectorSubtree, scalarSymbols, 2);
       #endregion