Changeset 17556 for branches/3040_VectorBasedGP

Timestamp:

05/25/20 16:11:46 (4 years ago)

Author:

pfleck

Message:

#3040 Some corner cases for empty or length-one vectors now return NaN.

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

@@ -373 +373 @@
             var cur = Evaluate(dataset, ref row, state);
             return AggregateApply(cur,
-              s => 0,
-              v => v.Count > 1 ? Statistics.StandardDeviation(v) : 0);
+              s => double.NaN,
+              v => Statistics.StandardDeviation(v));
           }
         case OpCodes.Length: {
           var cur = Evaluate(dataset, ref row, state);
           return AggregateApply(cur,
-            s => 0,
-            v => v.Count > 1 ? v.Count : 0);
+            s => 1,
+            v => v.Count);
         }
         case OpCodes.Min: {
           var cur = Evaluate(dataset, ref row, state);
           return AggregateApply(cur,
-            s => 0,
-            v => v.Count > 1 ? Statistics.Minimum(v) : 0);
+            s => s,
+            v => Statistics.Minimum(v));
         }
         case OpCodes.Max: {
           var cur = Evaluate(dataset, ref row, state);
           return AggregateApply(cur,
-            s => 0,
-            v => v.Count > 1 ? Statistics.Maximum(v) : 0);
+            s => s,
+            v => Statistics.Maximum(v));
         }
         case OpCodes.Variance: {
           var cur = Evaluate(dataset, ref row, state);
           return AggregateApply(cur,
-            s => 0,
-            v => v.Count > 1 ? Statistics.Variance(v) : 0);
+            s => double.NaN, 
+            v => Statistics.Variance(v));
         }
         case OpCodes.Skewness: {
           var cur = Evaluate(dataset, ref row, state);
           return AggregateApply(cur,
-            s => 0,
-            v => v.Count > 1 ? Statistics.Skewness(v) : 0);
+            s => double.NaN,
+            v => Statistics.Skewness(v));
         }
         case OpCodes.Kurtosis: {
           var cur = Evaluate(dataset, ref row, state);
           return AggregateApply(cur,
-            s => 0,
-            v => v.Count > 1 ? Statistics.Kurtosis(v) : 0);
+            s => double.NaN,
+            v => Statistics.Kurtosis(v));
         }
         case OpCodes.EuclideanDistance: {
@@ -419 +419 @@
             //(s1, v2) => Math.Sqrt((s1 - v2).PointwisePower(2).Sum()),
             //(v1, s2) => Math.Sqrt((v1 - s2).PointwisePower(2).Sum()),
-            vvFunc: (v1, v2) => Math.Sqrt((v1 - v2).PointwisePower(2).Sum())
-          );
+            vvFunc: (v1, v2) => v1.Count == v2.Count ? Math.Sqrt((v1 - v2).PointwisePower(2).Sum()) : double.NaN);
         }
         case OpCodes.Covariance: {
@@ -429 +428 @@
             //(s1, v2) => 0,
             //(v1, s2) => 0,
-            vvFunc: (v1, v2) => v1.Count > 1 && v2.Count > 1 ? Statistics.Covariance(v1, v2) : double.NaN
-          );
+            vvFunc: (v1, v2) => v1.Count == v2.Count ? Statistics.Covariance(v1, v2) : double.NaN);
         }
         case OpCodes.Variable: {