Changeset 13039


Ignore:
Timestamp:
10/19/15 18:17:34 (4 years ago)
Author:
bburlacu
Message:

#2442: Very minor changes in the naming of things. Removed readonly attributes for the min and max arity variables.

Location:
branches/HeuristicLab.LinqExpressionTreeInterpreter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.LinqExpressionTreeInterpreter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionCompiledTreeInterpreter.cs

    r12807 r13039  
    148148        case OpCodes.UserDefinedFunction:
    149149          {
    150             var binarySymbol = (FunctionSymbol)node.Symbol;
    151             return Expression.Call(binarySymbol.MethodInfo, node.Subtrees.Select(x => MakeExpr(x, variableIndices, row, columns)));
     150            var functionSymbol = (FunctionSymbol)node.Symbol;
     151            return Expression.Call(functionSymbol.MethodInfo, node.Subtrees.Select(x => MakeExpr(x, variableIndices, row, columns)));
    152152          }
    153153        case OpCodes.Constant:
  • branches/HeuristicLab.LinqExpressionTreeInterpreter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/FunctionSymbol.cs

    r12807 r13039  
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28
    2829namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2930  [StorableClass]
    30   [Item("FunctionSymbol", "Symbol that wraps a user-defined binary operation.")]
     31  [Item("FunctionSymbol", "Symbol that wraps a user-defined function.")]
    3132  public sealed class FunctionSymbol : Symbol {
    32     private int minimumArity = 2;
    33     private int maximumArity = 2;
     33    private readonly int minimumArity;
     34    private readonly int maximumArity;
    3435
    3536    public override int MinimumArity {
     
    5758    }
    5859
    59     public FunctionSymbol(string name, Func<double, double> f) : base(name, "Symbol that wraps a user-defined unary operation.") {
     60    public FunctionSymbol(string name, Func<double, double> f) : base(name, "Symbol that wraps a user-defined unary function.") {
    6061      MethodInfo = f.GetMethodInfo();
    6162      minimumArity = maximumArity = 1;
    6263    }
    6364
    64     public FunctionSymbol(string name, Func<double, double, double> f) : base(name, "Symbol that wraps a user-defined binary operation.") {
     65    public FunctionSymbol(string name, Func<double, double, double> f) : base(name, "Symbol that wraps a user-defined binary function.") {
    6566      MethodInfo = f.GetMethodInfo();
    6667      minimumArity = maximumArity = 2;
    6768    }
    6869
    69     public FunctionSymbol(string name, Func<double, double, double, double> f) : base(name, "Symbol that wraps a user-defined tertiary operation.") {
     70    public FunctionSymbol(string name, Func<double, double, double, double> f) : base(name, "Symbol that wraps a user-defined tertiary function.") {
    7071      MethodInfo = f.GetMethodInfo();
    7172      minimumArity = maximumArity = 3;
    7273    }
    7374
    74     public FunctionSymbol(string name, Func<double, double, double, double, double> f) : base(name, "Symbol that wraps a user-defined quaternary operation.") {
     75    public FunctionSymbol(string name, Func<double, double, double, double, double> f) : base(name, "Symbol that wraps a user-defined quaternary function.") {
    7576      MethodInfo = f.GetMethodInfo();
    7677      minimumArity = maximumArity = 4;
Note: See TracChangeset for help on using the changeset viewer.