Changeset 17467 for branches

Timestamp:

03/03/20 12:00:52 (4 years ago)

Author:

pfleck

Message:

#3040 Added a "final aggregation" option for the vector interpreter in case the result is a vector.

File:

• branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeVectorInterpreter.cs (modified) (8 diffs)

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -29 +28 @@
 using HeuristicLab.Parameters;
 using HEAL.Attic;
-using MathNet.Numerics.LinearAlgebra;
 using MathNet.Numerics.Statistics;
 
@@ -38 +36 @@
   [Item("SymbolicDataAnalysisExpressionTreeVectorInterpreter", "Interpreter for symbolic expression trees including vector arithmetic.")]
   public class SymbolicDataAnalysisExpressionTreeVectorInterpreter : ParameterizedNamedItem, ISymbolicDataAnalysisExpressionTreeInterpreter {
+    [StorableType("2612504E-AD5F-4AE2-B60E-98A5AB59E164")]
+    public enum Aggregation {
+      Mean,
+      Median,
+      Sum,
+      NaN,
+      Exception
+    }
 
     private const string EvaluatedSolutionsParameterName = "EvaluatedSolutions";
+    private const string FinalAggregationParameterName = "FinalAggregation";
 
     public override bool CanChangeName {
@@ -52 +59 @@
     public IFixedValueParameter<IntValue> EvaluatedSolutionsParameter {
       get { return (IFixedValueParameter<IntValue>)Parameters[EvaluatedSolutionsParameterName]; }
+    }
+    public IFixedValueParameter<EnumValue<Aggregation>> FinalAggregationParameter {
+      get { return (IFixedValueParameter<EnumValue<Aggregation>>)Parameters[FinalAggregationParameterName]; }
     }
     #endregion
@@ -60 +70 @@
       set { EvaluatedSolutionsParameter.Value.Value = value; }
     }
+    public Aggregation FinalAggregation {
+      get { return FinalAggregationParameter.Value.Value; }
+      set { FinalAggregationParameter.Value.Value = value; }
+    }
     #endregion
 
@@ -73 +87 @@
 
     public SymbolicDataAnalysisExpressionTreeVectorInterpreter()
-      : base("SymbolicDataAnalysisExpressionTreeVectorInterpreter", "Interpreter for symbolic expression trees including vector arithmetic.") {
-      Parameters.Add(new FixedValueParameter<IntValue>(EvaluatedSolutionsParameterName, "A counter for the total number of solutions the interpreter has evaluated", new IntValue(0)));
+      : this("SymbolicDataAnalysisExpressionTreeVectorInterpreter", "Interpreter for symbolic expression trees including vector arithmetic.") {
     }
 
@@ -80 +93 @@
       : base(name, description) {
       Parameters.Add(new FixedValueParameter<IntValue>(EvaluatedSolutionsParameterName, "A counter for the total number of solutions the interpreter has evaluated", new IntValue(0)));
+      Parameters.Add(new FixedValueParameter<EnumValue<Aggregation>>(FinalAggregationParameterName, "If root node of the expression tree results in a Vector it is aggregated according to this parameter", new EnumValue<Aggregation>(Aggregation.Mean)));
     }
 
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-
+      if (!Parameters.ContainsKey(FinalAggregationParameterName)) {
+        Parameters.Add(new FixedValueParameter<EnumValue<Aggregation>>(FinalAggregationParameterName, "If root node of the expression tree results in a Vector it is aggregated according to this parameter", new EnumValue<Aggregation>(Aggregation.Mean)));
+      }
     }
 
@@ -107 +123 @@
         if (result.IsScalar)
           yield return result.Scalar;
-        else
+        else if (result.IsVector) {
+          if (FinalAggregation == Aggregation.Mean) yield return result.Vector.Mean();
+          else if (FinalAggregation == Aggregation.Median) yield return Statistics.Median(result.Vector);
+          else if (FinalAggregation == Aggregation.Sum) yield return result.Vector.Sum();
+          else if (FinalAggregation == Aggregation.Exception) throw new InvalidOperationException("Result of the tree is not a scalar.");
+          else yield return double.NaN;
+        } else
           yield return double.NaN;
-        //if (!result.IsScalar)
-        //  throw new InvalidOperationException("Result of the tree is not a scalar.");
-        //yield return result.Scalar;
         state.Reset();
       }