Changeset 17466

Timestamp:

03/03/20 08:32:10 (5 years ago)

Author:

pfleck

Message:

#3040 Added separate mean symbol instead of reusing the average symbol.

Location:

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

Files:

• Grammars/TypeCoherentVectorExpressionGrammar.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
• Interpreter/OpCodes.cs (modified) (3 diffs)
• Interpreter/SymbolicDataAnalysisExpressionTreeVectorInterpreter.cs (modified) (1 diff)
• Symbols/Mean.cs (copied) (copied from branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Average.cs) (2 diffs)
• Symbols/StandardDeviation.cs (modified) (1 diff)
• Symbols/Sum.cs (modified) (1 diff)

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

@@ -86 +86 @@
       var factorVariable = new FactorVariable();
 
+      var mean = new Mean();
+      var sd = new StandardDeviation();
       var sum = new Sum();
-      var mean = new Average { Name = "Mean" };
-      var sd = new StandardDeviation();
       #endregion
 
@@ -120 +120 @@
       var powerSymbols = new GroupSymbol(PowerFunctionsName, new List<ISymbol> { square, sqrt, cube, cubeRoot, power, root });
       var terminalSymbols = new GroupSymbol(TerminalsName, new List<ISymbol> { constant, variable, binFactorVariable, factorVariable });
-      var aggregationSymbols = new GroupSymbol(VectorAggregationName, new List<ISymbol> { sum, mean, sd });
+      var aggregationSymbols = new GroupSymbol(VectorAggregationName, new List<ISymbol> { mean, sd, sum });
       var scalarSymbols = new GroupSymbol(ScalarSymbolsName, new List<ISymbol>() { arithmeticSymbols, trigonometricSymbols, exponentialAndLogarithmicSymbols, powerSymbols, terminalSymbols, aggregationSymbols });
 

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -231 +231 @@
     <Compile Include="Symbols\And.cs" />
     <Compile Include="Symbols\AutoregressiveVariable.cs" />
+    <Compile Include="Symbols\Mean.cs" />
     <Compile Include="Symbols\StandardDeviation.cs" />
     <Compile Include="Symbols\Sum.cs" />

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/OpCodes.cs

@@ -78 +78 @@
     CubeRoot = 51,
     Tanh = 52,
-    Sum = 53,
-    Sd = 54
-  };
+    Mean = 53,
+    StandardDeviation = 54,
+    Sum = 55
+  }
   public static class OpCodes {
     // constants for API compatibility only
@@ -135 +136 @@
     public const byte CubeRoot = (byte)OpCode.CubeRoot;
     public const byte Tanh = (byte)OpCode.Tanh;
+    public const byte Mean = (byte)OpCode.Mean;
+    public const byte StandardDeviation = (byte)OpCode.StandardDeviation;
     public const byte Sum = (byte)OpCode.Sum;
-    public const byte StandardDeviation = (byte)OpCode.Sd;
+
 
     private static Dictionary<Type, byte> symbolToOpcode = new Dictionary<Type, byte>() {
@@ -192 +195 @@
       { typeof(Cube), OpCodes.Cube },
       { typeof(CubeRoot), OpCodes.CubeRoot },
-      { typeof(Sum), OpCodes.Sum },
-      { typeof(StandardDeviation), OpCodes.StandardDeviation }
+      { typeof(Mean), OpCodes.Mean },
+      { typeof(StandardDeviation), OpCodes.StandardDeviation },
+      { typeof(Sum), OpCodes.Sum }
+
     };
 

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeVectorInterpreter.cs

@@ -334 +334 @@
               v => v.Sum());
           }
-        case OpCodes.Average: {
+        case OpCodes.Mean: {
             var cur = Evaluate(dataset, ref row, state);
             return AggregateApply(cur,

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

@@ -24 +24 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HEAL.Attic;
+
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
-  [StorableType("459E521B-A921-4A0F-B63D-B298DA2CDD11")]
-  [Item("Average", "Symbol that represents the average (arithmetic mean) function.")]
-  public sealed class Average : Symbol {
+  [StorableType("2AE24E16-849E-4D54-A35B-7FE64BEF8ECB")]
+  [Item("Mean", "Symbol that represents the mean function.")]
+  public sealed class Mean : Symbol {
     private const int minimumArity = 1;
-    private const int maximumArity = byte.MaxValue;
+    private const int maximumArity = 1;
 
     public override int MinimumArity {
@@ -39 +40 @@
 
     [StorableConstructor]
-    private Average(StorableConstructorFlag _) : base(_) { }
-    private Average(Average original, Cloner cloner) : base(original, cloner) { }
+    private Mean(StorableConstructorFlag _) : base(_) { }
+    private Mean(Mean original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new Average(this, cloner);
+      return new Mean(this, cloner);
     }
-    public Average() : base("Average", "Symbol that represents the average (arithmetic mean) function.") { }
+    public Mean() : base("Mean", "Symbol that represents the mean function.") { }
   }
 }

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

@@ -29 +29 @@
   public sealed class StandardDeviation : Symbol {
     private const int minimumArity = 1;
-    private const int maximumArity = byte.MaxValue;
+    private const int maximumArity = 1;
 
     public override int MinimumArity {

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

@@ -27 +27 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableType("C6C245BF-C44A-4207-A268-55641483F27F")]
-  [Item("Sum", "Symbol that represents the Sum function.")]
+  [Item("Sum", "Symbol that represents the sum function.")]
   public sealed class Sum : Symbol {
     private const int minimumArity = 1;
-    private const int maximumArity = byte.MaxValue;
+    private const int maximumArity = 1;
 
     public override int MinimumArity {