Changeset 18060 for branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols

Timestamp:

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

Author:

pfleck

Message:

#3040 Added a subvector symbol with ranges as subtrees.

Location:

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols

Files:

• SubVector.cs (modified) (1 diff)
• WindowedSymbol.cs (modified) (1 diff)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/SubVector.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HEAL.Attic;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableType("4E9511C6-0FA4-496D-9610-35D9F779F899")]
-  [Item("SubVector", "Symbol that represents SubVector sum function.")]
-  public sealed class SubVector : WindowedSymbol {
-    private const int minimumArity = 1;
-    private const int maximumArity = 1;
-
-    public override int MinimumArity {
-      get { return minimumArity; }
-    }
-    public override int MaximumArity {
-      get { return maximumArity; }
-    }
+  [Item("SubVector", "Symbol that represent the SubVector function with local parameters.")]
+  public class SubVector : WindowedSymbol {
+    public override int MinimumArity => 1;
+    public override int MaximumArity => 1;
 
     [StorableConstructor]
-    private SubVector(StorableConstructorFlag _) : base(_) { }
-    private SubVector(SubVector original, Cloner cloner) : base(original, cloner) { }
+    protected SubVector(StorableConstructorFlag _) : base(_) { }
+
+    protected SubVector(SubVector original, Cloner cloner) : base(original, cloner) { }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new SubVector(this, cloner);
     }
-    public SubVector() : base("SubVector", "Symbol that represents the SubVector function.") { }
+
+    public SubVector() : base("SubVector", "Symbol that represent the SubVector function with local parameters.") {
+      EnableWindowing = true;
+    }
+  }
+
+  [StorableType("BA11A829-3236-46C3-AE83-9FA8511D8E8C")]
+  [Item("SubVectorSubtree", "Symbol that represent the SubVector function with subtrees.")]
+  public sealed class SubVectorSubtree : Symbol {
+    public override int MinimumArity => 3;
+    public override int MaximumArity => 3;
+
+    [StorableConstructor]
+    private SubVectorSubtree(StorableConstructorFlag _) : base(_) { }
+    private SubVectorSubtree(SubVectorSubtree original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) { return new SubVectorSubtree(this, cloner); }
+    public SubVectorSubtree() : base("SubVectorSubtree", "Symbol that represent the SubVector function with subtrees.") { }
   }
 }

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/WindowedSymbol.cs

@@ -158 +158 @@
 
       offsetMu = 0.0;
-      offsetSigma = 0.05;
+      offsetSigma = 0.2;
       lengthMu = 1.0;
-      lengthSigma = 0.05;
+      lengthSigma = 0.2;
 
       manipulatorOffsetMu = 0.0;