Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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/Symbols
Files:
2 edited
1 copied

Legend:

Unmodified
Added
Removed

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

    r17455 r17466  
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HEAL.Attic;
     26
    2627namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableType("459E521B-A921-4A0F-B63D-B298DA2CDD11")]
    28   [Item("Average", "Symbol that represents the average (arithmetic mean) function.")]
    29   public sealed class Average : Symbol {
     28  [StorableType("2AE24E16-849E-4D54-A35B-7FE64BEF8ECB")]
     29  [Item("Mean", "Symbol that represents the mean function.")]
     30  public sealed class Mean : Symbol {
    3031    private const int minimumArity = 1;
    31     private const int maximumArity = byte.MaxValue;
     32    private const int maximumArity = 1;
    3233
    3334    public override int MinimumArity {
    … …  
    3940
    4041    [StorableConstructor]
    41     private Average(StorableConstructorFlag _) : base(_) { }
    42     private Average(Average original, Cloner cloner) : base(original, cloner) { }
     42    private Mean(StorableConstructorFlag _) : base(_) { }
     43    private Mean(Mean original, Cloner cloner) : base(original, cloner) { }
    4344    public override IDeepCloneable Clone(Cloner cloner) {
    44       return new Average(this, cloner);
     45      return new Mean(this, cloner);
    4546    }
    46     public Average() : base("Average", "Symbol that represents the average (arithmetic mean) function.") { }
     47    public Mean() : base("Mean", "Symbol that represents the mean function.") { }
    4748  }
    4849}

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

    r17463 r17466  
    2929  public sealed class StandardDeviation : Symbol {
    3030    private const int minimumArity = 1;
    31     private const int maximumArity = byte.MaxValue;
     31    private const int maximumArity = 1;
    3232
    3333    public override int MinimumArity {

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

    r17460 r17466  
    2727namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2828  [StorableType("C6C245BF-C44A-4207-A268-55641483F27F")]
    29   [Item("Sum", "Symbol that represents the Sum function.")]
     29  [Item("Sum", "Symbol that represents the sum function.")]
    3030  public sealed class Sum : Symbol {
    3131    private const int minimumArity = 1;
    32     private const int maximumArity = byte.MaxValue;
     32    private const int maximumArity = 1;
    3333
    3434    public override int MinimumArity {
Note: See TracChangeset for help on using the changeset viewer.