Changeset 13039

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:

• Interpreter/SymbolicDataAnalysisExpressionCompiledTreeInterpreter.cs (modified) (1 diff)
• Symbols/FunctionSymbol.cs (modified) (2 diffs)

branches/HeuristicLab.LinqExpressionTreeInterpreter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionCompiledTreeInterpreter.cs

@@ -148 +148 @@
         case OpCodes.UserDefinedFunction:
           {
-            var binarySymbol = (FunctionSymbol)node.Symbol;
-            return Expression.Call(binarySymbol.MethodInfo, node.Subtrees.Select(x => MakeExpr(x, variableIndices, row, columns)));
+            var functionSymbol = (FunctionSymbol)node.Symbol;
+            return Expression.Call(functionSymbol.MethodInfo, node.Subtrees.Select(x => MakeExpr(x, variableIndices, row, columns)));
           }
         case OpCodes.Constant:

branches/HeuristicLab.LinqExpressionTreeInterpreter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/FunctionSymbol.cs

@@ -26 +26 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableClass]
-  [Item("FunctionSymbol", "Symbol that wraps a user-defined binary operation.")]
+  [Item("FunctionSymbol", "Symbol that wraps a user-defined function.")]
   public sealed class FunctionSymbol : Symbol {
-    private int minimumArity = 2;
-    private int maximumArity = 2;
+    private readonly int minimumArity;
+    private readonly int maximumArity;
 
     public override int MinimumArity {
@@ -57 +58 @@
     }
 
-    public FunctionSymbol(string name, Func<double, double> f) : base(name, "Symbol that wraps a user-defined unary operation.") {
+    public FunctionSymbol(string name, Func<double, double> f) : base(name, "Symbol that wraps a user-defined unary function.") {
       MethodInfo = f.GetMethodInfo();
       minimumArity = maximumArity = 1;
     }
 
-    public FunctionSymbol(string name, Func<double, double, double> f) : base(name, "Symbol that wraps a user-defined binary operation.") {
+    public FunctionSymbol(string name, Func<double, double, double> f) : base(name, "Symbol that wraps a user-defined binary function.") {
       MethodInfo = f.GetMethodInfo();
       minimumArity = maximumArity = 2;
     }
 
-    public FunctionSymbol(string name, Func<double, double, double, double> f) : base(name, "Symbol that wraps a user-defined tertiary operation.") {
+    public FunctionSymbol(string name, Func<double, double, double, double> f) : base(name, "Symbol that wraps a user-defined tertiary function.") {
       MethodInfo = f.GetMethodInfo();
       minimumArity = maximumArity = 3;
     }
 
-    public FunctionSymbol(string name, Func<double, double, double, double, double> f) : base(name, "Symbol that wraps a user-defined quaternary operation.") {
+    public FunctionSymbol(string name, Func<double, double, double, double, double> f) : base(name, "Symbol that wraps a user-defined quaternary function.") {
       MethodInfo = f.GetMethodInfo();
       minimumArity = maximumArity = 4;