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

Timestamp:

02/28/20 14:55:58 (4 years ago)

Author:

pfleck

Message:

#3040

• Added full functional grammar for vectors.
• Added sum and mean aggregation for vectors.

File:

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

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

@@ -118 +118 @@
         if (instr.opCode == OpCodes.Variable) {
           var variableTreeNode = (VariableTreeNode)instr.dynamicNode;
-          instr.data = dataset.GetReadOnlyDoubleValues(variableTreeNode.VariableName);
+          if (dataset.VariableHasType<double>(variableTreeNode.VariableName))
+            instr.data = dataset.GetReadOnlyDoubleValues(variableTreeNode.VariableName);
+          else if (dataset.VariableHasType<DoubleVector>(variableTreeNode.VariableName))
+            instr.data = dataset.GetReadOnlyDoubleVectorValues(variableTreeNode.VariableName);
+          else throw new NotSupportedException($"Type of variable {variableTreeNode.VariableName} is not supported.");
         } else if (instr.opCode == OpCodes.FactorVariable) {
           var factorTreeNode = instr.dynamicNode as FactorVariableTreeNode;
@@ -186 +190 @@
       throw new NotSupportedException($"Unsupported argument type ({val})");
     }
+    private static EvaluationResult AggregateApply(EvaluationResult val,
+      Func<double, double> sFunc = null,
+      Func<DoubleVector, double> vFunc = null) {
+      if (val.IsScalar && sFunc != null) return new EvaluationResult(sFunc(val.Scalar));
+      if (val.IsVector && vFunc != null) return new EvaluationResult(vFunc(val.Vector));
+      throw new NotSupportedException($"Unsupported argument type ({val})");
+    }
 
     public virtual EvaluationResult Evaluate(IDataset dataset, ref int row, InterpreterState state) {
@@ -312 +323 @@
               v => DoubleVector.Log(v));
           }
+        case OpCodes.Sum: {
+            var cur = Evaluate(dataset, ref row, state);
+            return AggregateApply(cur,
+              s => s,
+              v => v.Sum());
+          }
+        case OpCodes.Average: {
+            var cur = Evaluate(dataset, ref row, state);
+            return AggregateApply(cur,
+              s => s,
+              v => v.Mean());
+          }
         case OpCodes.Variable: {
             if (row < 0 || row >= dataset.Rows) return EvaluationResult.NaN;