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

Timestamp:

03/02/20 15:04:46 (4 years ago)

Author:

pfleck

Message:

#3040 Added type coherent vector grammar to enforce that the root symbol is a scalar.

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

@@ -105 +105 @@
         int row = rowEnum;
         var result = Evaluate(dataset, ref row, state);
-        if (!result.IsScalar)
-          throw new InvalidOperationException("Result of the tree is not a scalar.");
-        yield return result.Scalar;
+        if (result.IsScalar)
+          yield return result.Scalar;
+        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();
       }
@@ -148 +152 @@
 
       public DoubleVector Vector { get; }
-      public bool IsVector => !(Vector.Count == 1 && double.IsNaN(Vector[0]));
+      public bool IsVector => Vector != null;
+      //public bool IsVector => !(Vector.Count == 1 && double.IsNaN(Vector[0]));
 
       public bool IsNaN => !IsScalar && !IsVector;
@@ -154 +159 @@
       public EvaluationResult(double scalar) {
         Scalar = scalar;
-        Vector = NaNVector;
+        //Vector = NaNVector;
+        Vector = null;
       }
       public EvaluationResult(DoubleVector vector) {
+        if (vector == null) throw new ArgumentNullException(nameof(vector));
         Vector = vector;
         Scalar = double.NaN;
@@ -168 +175 @@
 
       public static readonly EvaluationResult NaN = new EvaluationResult(double.NaN);
-      private static readonly DoubleVector NaNVector = DoubleVector.Build.Dense(1, double.NaN);
+      //private static readonly DoubleVector NaNVector = DoubleVector.Build.Dense(1, double.NaN);
     }
 
@@ -180 +187 @@
       if (lhs.IsVector && rhs.IsScalar && vsFunc != null) return new EvaluationResult(vsFunc(lhs.Vector, rhs.Scalar));
       if (lhs.IsVector && rhs.IsVector && vvFunc != null) return new EvaluationResult(vvFunc(lhs.Vector, rhs.Vector));
-      throw new NotSupportedException($"Unsupported combination of argument types: ({lhs}) / ({rhs})");
+      return EvaluationResult.NaN;
+      //throw new NotSupportedException($"Unsupported combination of argument types: ({lhs}) / ({rhs})");
     }
 
@@ -188 +196 @@
       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})");
+      return EvaluationResult.NaN;
+      //throw new NotSupportedException($"Unsupported argument type ({val})");
     }
     private static EvaluationResult AggregateApply(EvaluationResult val,
@@ -195 +204 @@
       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})");
+      return EvaluationResult.NaN;
+      //throw new NotSupportedException($"Unsupported argument type ({val})");
     }
 
@@ -335 +345 @@
               v => v.Mean());
           }
+        case OpCodes.StandardDeviation: {
+            var cur = Evaluate(dataset, ref row, state);
+            return AggregateApply(cur,
+              s => 0,
+              v => v.Count > 1 ? Statistics.StandardDeviation(v) : 0);
+          }
         case OpCodes.Variable: {
             if (row < 0 || row >= dataset.Rows) return EvaluationResult.NaN;